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/masaq.oucs.ox.ac.uk-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml deleted file mode 100644 index af5b6817..00000000 --- a/swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://masaq.oucs.ox.ac.uk/shibboleth"> - <!-- - This is a Shibboleth SP for University of Oxford. - --> - <Extensions> - <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/> - <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/> - <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> - <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/> - <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> - <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/> - <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/> - <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/> - <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/> - <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/> - <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/> - <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/> - <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/> - <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/> - <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> - <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-10T10:47:49Z"> - <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 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://masaq.oucs.ox.ac.uk/Shibboleth.sso/Login"/> - </Extensions> - <KeyDescriptor> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDADCCAeigAwIBAgIJALjsZAqK6FUqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV - BAMTE21hc2FxLm91Y3Mub3guYWMudWswHhcNMTMwOTIwMTExNjU2WhcNMjMwOTE4 - MTExNjU2WjAeMRwwGgYDVQQDExNtYXNhcS5vdWNzLm94LmFjLnVrMIIBIjANBgkq - hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9ULFDudvq0bdTHSkYluO2b262utN9p1x - u7YY0T2GOemIWmw2SOngyFEh67o0VSWWcaWjnRMmzyLIXC+XK7ypriibmhZBVRHK - xAIgVhH8wbK3CEMP5+F8WQcdDwwGxnk6rhn0YmPJ8GFq6TNo+FnYwry3Ojgs/sUr - guGE27x+GdRcWmsTbQj5mlxoffaB93k/kyzAC2d9Gitq5fvypQMiakFVafCdksXn - PnYp5/jYKQGo/zcFvdO+SLUDd4u1cJvPQxIgZp8qkQzjU5p6u8eXC2+05pIQJBbg - vH/Al4iW258o4V873HyXehm5Y715gWoNR1Ewmyp/h2g6OZH7PfQnGQIDAQABo0Ew - PzAeBgNVHREEFzAVghNtYXNhcS5vdWNzLm94LmFjLnVrMB0GA1UdDgQWBBTGZXOE - j1iBntwwxtXItqm0nW1J+DANBgkqhkiG9w0BAQUFAAOCAQEAdXM8ECCvAtZp/Jr2 - zHKMycrGPZbt6y6Nk/+fMzRgAyP80WQV/Nci5jwwYan6he0TtjEVUP3zNWuElAfA - sgIvEY4VTrvJ2ARcw+bfp/BeXvzMAclzBzZSlcfHqXenXyw5N/PBtfkgyBUOORVA - /9aPp3RuJXVca95Y6JaHmGBYeZgYVFQkAWiz9PgRLKLFkcw9y7VwlMsZkylnk79F - 2BAnVXYem+hQf+NT2FvT8TrUTef/Kwav9nPgM1Nat4v06xkugbPo8pd+0g22Wkzz - LZxdIwRUrC1nm1O2BiRECpUQO5gPwpupPhMET0F9cEaFH68MT9DLJtVI1N1P1ZIO - DkSyzg== - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/> - <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/> - <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/> - <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/> - <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/> - <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/> - <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> - <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/> - <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/> - </KeyDescriptor> - <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/> - </SPSSODescriptor> - <Organization> - <OrganizationName xml:lang="en">University of Oxford</OrganizationName> - <OrganizationDisplayName xml:lang="en">University of Oxford, Test Shibboleth SP</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Systems Development and Support</GivenName> - <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Systems Development and Support</GivenName> - <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |