diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
| commit | b53085c02cf81855379eb460206ee5a45abc9163 (patch) | |
| tree | 5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml')
| -rw-r--r-- | swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml deleted file mode 100644 index 49e6455d..00000000 --- a/swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ablation.oucs.ox.ac.uk/shibboleth-sp"> - <!-- - This is a "Test" Shibboleth SP for the University of Oxford. - --> - <Extensions> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/> - </Extensions> - <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol"> - <KeyDescriptor use="signing"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDNzCCAh+gAwIBAgIJAL+QQg4gKHSjMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV - BAMTFmFibGF0aW9uLm91Y3Mub3guYWMudWswHhcNMTIwMTIzMTQ0NTIwWhcNMjIw - MTIwMTQ0NTIwWjAhMR8wHQYDVQQDExZhYmxhdGlvbi5vdWNzLm94LmFjLnVrMIIB - IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnz+8H7tA8WPyMdvx5M8mvPiw - 8tsXvb9wXpMJ7ytRr4E+Mfw0x4V4Ze3Vlqpbl86GPPZ1UsaRt5BXPJc0+3CYE0iZ - Cwji3tB4j4a9mBEgIgDXfepSkhxrFIV55eV5NxiPaoZdn4r3HtcZ+UPViYeha0Sb - sQtp8qSYN1N7ro6XvGmPsRaMxciOgTHYuS1l1mATzicO2j1K1vAIPOwJY+64VCmm - aVEZIzZvbhbfs/UxjJ0QYL5OIakvh2NwPuJYxomPbPTJ7d8dkjQLKVLqeaBXZVd/ - vRUUBN4JRiWqjCe/ydJI1PyPJx797uJQGcWY+Xc014uPzP6UKumQPvSUWKmDpwID - AQABo3IwcDBPBgNVHREESDBGghZhYmxhdGlvbi5vdWNzLm94LmFjLnVrhixodHRw - czovL2FibGF0aW9uLm91Y3Mub3guYWMudWsvc2hpYmJvbGV0aC1zcDAdBgNVHQ4E - FgQUWCsKQqfiwjR0/+IitEXa1hrQ9rIwDQYJKoZIhvcNAQEFBQADggEBAAh41Pwr - gIEJw5kIsm+8WEPol3+pS/wK2XZ8aDB07uwY39hoQJiBU9pY5YEBrNkbI6JpoHj7 - SYXK/onH9mugafKVn0NX3uuHnFNIRfBP34CSJHWlfKvYU2sdWUmdZ0g7Es82O/U6 - Md4CwQK9TN999XdFTGx8b+/cEzLYquAVHPq5+jRGwqlPbqZlBLz1GCzvWGpkmVcs - 2fu4xbqDRoJCy+NB/fXg8O/0uiyIQexeGG5A76JDCGOLw988AwKkoykd1iIwrvhv - VLSRfMpjr+kLRRDFcKnLS0QzDd4ijKMiCnfKYJUzy49x8FUDH+P41uLKDxVB7Ep0 - TZGHmnZDf5qYsqk= - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ablation.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ablation.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/> - </SPSSODescriptor> - <Organization> - <OrganizationName xml:lang="en">University of Oxford</OrganizationName> - <OrganizationDisplayName xml:lang="en">University of Oxford: Test SP 1.3</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>IT Services IAM Team</GivenName> - <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>IT Services IAM Team</GivenName> - <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |