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/www.ox.ac.uk-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml deleted file mode 100644 index 140acad8..00000000 --- a/swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ox.ac.uk/shibboleth"> - <!-- - This is a Shibboleth SP for the University of Oxford. - --> - <Extensions> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-31T11:24:50Z"> - <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy> - </mdrpi:RegistrationInfo> - </Extensions> - <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol"> - <KeyDescriptor> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIC6zCCAdOgAwIBAgIJAPx/LwmeUGTyMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV - BAMTDHd3dy5veC5hYy51azAeFw0xNDA3MjkwODExNTNaFw0yNDA3MjYwODExNTNa - MBcxFTATBgNVBAMTDHd3dy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP - ADCCAQoCggEBAOc2rOr/XaHUNhfWxfolloVnnDDY3BvIP/AWugahGYXEelclRaNX - 95rh21w+Pw6qcMwkaCoc8LBNE2O7ReUp2zUWsB1t87w8v8XDUPEpPAQ9XVTHFGAt - 4A93oYO8UuZPC6CoPu2guuXJT+gS5jiswk/R3729CUlphY/Ov9+QO1jfuoNu8mGY - FllFALRsDKc8PH83UuEhF4R9rtz1LYoD/vs6NjR+n1dovkRMqxRZBxuEgcEX1tft - WciPXI4Nk4DbbgOPgmcl0dPUK+IMTLLQF/So/qO02cxDZKp9DA+rws79J0qPOOUQ - AaYqFjB8qRjKfs9xUrCviXNHzgWmLKbEUkUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM - d3d3Lm94LmFjLnVrMB0GA1UdDgQWBBRdot3++gHpLRLS+MGj/T9eobiBrjANBgkq - hkiG9w0BAQUFAAOCAQEALUNCD99LKk+88GfsmMNIczRzOEQynKD1i5X6247/5zs+ - w81ezac3VrDk09O9PFhkeh4D32KupXWQ4+bY7ijlBj/BVDhrrgKZZeD5mu+J8Ru+ - Ypz4r7bV+t8dUukfNy6xLMqePEmrmhLgWql0EtOpRrsZC/GNdpkl+kJG3EoPt8cZ - umV/wHnzjahIYYKQ2YyrwU6tT/jMDciNSZOEJOoVkujmhu3yK0eIwfAJQzJ90fGg - t/KiRYU/XnfJ+HdgNOth5XvmNSG3gmzVtGVLbPbfp7i4sCHMOD5FzSziYwp6m6Pn - Q9nQhuIfcxbBFG6jt794VKX50sAROXsVPFcYfT3gTg== - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/> - </SPSSODescriptor> - <Organization> - <OrganizationName xml:lang="en">University of Oxford</OrganizationName> - <OrganizationDisplayName xml:lang="en">University of Oxford</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>NSMS Team</GivenName> - <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>NSMS Team</GivenName> - <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |