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.it.ox.ac.uk-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml deleted file mode 100644 index 65ba3d03..00000000 --- a/swamid-interfederations-2.0/www.it.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.it.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-09-12T12:56:05Z"> - <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> - MIIC9DCCAdygAwIBAgIJALiR16U+pefzMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV - BAMTD3d3dy5pdC5veC5hYy51azAeFw0xNDA5MDkwNjU5NTFaFw0yNDA5MDYwNjU5 - NTFaMBoxGDAWBgNVBAMTD3d3dy5pdC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB - BQADggEPADCCAQoCggEBAOABFZclDrQXCNO8wK1S1Tt8039mZWM/56weI2lVBwmN - aai/dxp6Gm+vKqGAT6kjEKJfJ3pZolQgW5mCae/3OA8MAn0R8qS9X/rD9BxI5Ojt - cGKDJnEjjbmPr52NdYqyIYj20LN3bu4CW/8fDIc7UKKN22D2er8QS/qUVzjwtgju - aMh98joueAhStymx23IJXFhFMrg/Rq8JWdavUMCZbbs/RrrBQT5fIINJHvax0/fS - gxRRCzu4tm28PoC9Sk0S52DlL0zUCgowuWyUCr60ki/ACi+aCvf0GHStDnvdWixE - CMLnab/B4XFOv35fIBfq3ZXZ1tJwVI0uAhbqeXbjK/UCAwEAAaM9MDswGgYDVR0R - BBMwEYIPd3d3Lml0Lm94LmFjLnVrMB0GA1UdDgQWBBTuCDHn6ylly7cHFIau2Gav - jZRgLjANBgkqhkiG9w0BAQUFAAOCAQEAfqLFckAdO1Q1EWGbNCs1rMRRnrQhOJgY - 5qbsoBKjfAij1z2avZJLtoqNmiSglMRJAaQymrx4lRUeZeZMWKvftE11c+9HRmq9 - EN4fOmHyWttTc7QUtq+28Xj7N5t1yCYJPK04GcCoGy3x3ZF+Z08vCzIEk2OceE0r - duOhRjYNHwG+VZjOnhBKWOs6UeYSHEci4XKr7fF4ocCkoww1/edkVuZD2pGy7Sao - P/JIEQd+URAlarYO35ZmHsYStSGbaQqm219AXhRuI3AgwhwEeyNFPqH+R5iYq5Nk - UOpxlu7UHRZ26ugA3ldH/hcFkRPpDdopu7qESNCfpanceMeXx3Re8A== - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.it.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.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dandy-live.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://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dandy-live.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 - www.it.ox.ac.uk</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>NSMS</GivenName> - <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>NSMS</GivenName> - <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |