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/intranet.sbs.ox.ac.uk-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml deleted file mode 100644 index 0ba1d254..00000000 --- a/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intranet.sbs.ox.ac.uk/shibboleth"> - <!-- - This is a "Said Business School Intranet" 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="2013-03-22T13:50:10Z"/> - </Extensions> - <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol"> - <Extensions> - <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/Login"/> - <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/Login"/> - </Extensions> - <KeyDescriptor> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDBjCCAe6gAwIBAgIJAIouVk51M2UYMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV - BAMTFWludHJhbmV0LnNicy5veC5hYy51azAeFw0xMzAzMjAxMTI3MTlaFw0yMzAz - MTgxMTI3MTlaMCAxHjAcBgNVBAMTFWludHJhbmV0LnNicy5veC5hYy51azCCASIw - DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJSaQFswjc93gqeaMWkdXqZIm/2A - 6WEVgInFCFHUPWLsPs/iiVhmDIOVNVPlqI85DqshRuocfPkwV7m/22J7b7tC1NnL - ArnTdE3Btb+BqDwZaQfcXP/FzG5JaTef2ktLljY1tyue6cIRPsAkSE9lqkl1tTwe - nugT9tu5hI2pio7lmN9NBx6Chxr6BDCLoYD+cRPy9lEcCpUenoIGNNg22xieE6Y2 - Nc+URn/J+sxhbyWwBxDgByrMcFsBPsMdOt5p2topnysc07+CgZdM7uiswYBz5Aj9 - qUeZF2gC+BtzaR/tOHyN8L57gzWOthH/e6hcS9l2CSE74o98gI0uEvX+GY0CAwEA - AaNDMEEwIAYDVR0RBBkwF4IVaW50cmFuZXQuc2JzLm94LmFjLnVrMB0GA1UdDgQW - BBS6ncz+YNbGJqBNWLnmu8GRL482ljANBgkqhkiG9w0BAQUFAAOCAQEAK/wwGRID - V3WbBMsPSYWm9iH47V35BxxjTA45d6/lfbkFb4s5DD2FwD+wPubcri2s8cz289Kh - h9j9yj0Y4msbvYOzioA2xvayntydLgwNjky1EqpnIn6Fv/Atpuq+rt8+CLYZQPHD - vsmmQuZ7aORWFNPFIM1Ga51RurF2i83sKH5e6wYIWWx52d64DQfwa4rD9jrfurbW - sS3dlTasQa1eAmqc8L/WbrFA7NAV8W0lvldrz/n/iljP9P/C1E4isf14+nQaBUlb - PSLOQrLs+FvAmj0LpfNiX0FaipT5pKGuXV1Vmb7SKrEv9ecuOjMhpfcwfOoU2jWA - EknFc192G29Now== - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/> - </SPSSODescriptor> - <Organization> - <OrganizationName xml:lang="en">University of Oxford</OrganizationName> - <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.sbs.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>Aaron</GivenName> - <SurName>Wilson</SurName> - <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |