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/repo.nsms.ox.ac.uk-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml deleted file mode 100644 index 32856eae..00000000 --- a/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repo.nsms.ox.ac.uk/shibboleth"> - <!-- - This is a Shibboleth SP for University of Oxford. - --> - <Extensions> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-28T13:41:58Z"> - <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> - MIIC/TCCAeWgAwIBAgIJAL0apyznrmFdMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV - BAMTEnJlcG8ubnNtcy5veC5hYy51azAeFw0xNDA0MjUxMjU4MjNaFw0yNDA0MjIx - MjU4MjNaMB0xGzAZBgNVBAMTEnJlcG8ubnNtcy5veC5hYy51azCCASIwDQYJKoZI - hvcNAQEBBQADggEPADCCAQoCggEBALZontMMY7ZVutHk9dU2b20uFGvoDoXIGTVY - zqXI5Z3QhWz8nZ0eWPoxRd8Bk8NhVvLc1yQ3PcFXWIe9YtdATvlQCdRjrWUvRmOt - FBfB4pKU2LVt1goVRZSr7r+EO0yW3clMtK2LJxzxmMYX1Bodx2HMDeDI856v6U1l - rK+NiGWx7rbj+NtgInQkIWTeHpEWuiWbbbPTikBUNlnqVOOebZAWxW53PNekENzS - 8fvLAt9clhDvdh21raqlWXlMd3Uv3uxs3vQrvEVstT/K1Ba1zZay8Nu3kBmlWT39 - KLKvlhA4d9RZ5RZCpSgHjA3J3x23cvv4Vr2XVJfN3fvtGpY89PECAwEAAaNAMD4w - HQYDVR0RBBYwFIIScmVwby5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBRFVnTingt7 - M2lVTnK1KceB7L0uVzANBgkqhkiG9w0BAQUFAAOCAQEAblejPTxWn4YhyqGHdrhc - ZpxaDshVRatbNS1SbDCgIxyq3xxVBnnEHdpClyPOpHUkndAzcggOI1e4IBDCuOW5 - wG8kYaNHY+DMmbHzKn98lw81C+GuFdJOItu+PGModOO0YbpQOG9Nr9C/gj+zKpGn - GGAGaT7oqzWlIjvKrUB637afxa+2J5NqYIP6sC7n8HTToAjRSqsdS5UnKDiQPueJ - 2LL/tGKw+ZPMBwQTAT/8JwWuLTAMCVmSA8jYeMs9ojVopgDZfhefsrbUDQQ2BJrF - UK2XQQ615BPS2VvrQ5yDpfPpT6W4IUf2fuTG6/tGecZWZMICz8HakAZtXnKKEs2q - AQ== - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oper.nsms.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 - repo.nsms.ox.ac.uk</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.oucs.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> |