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/ark.biology.ox.ac.uk-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml deleted file mode 100644 index 7a6d8c67..00000000 --- a/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ark.biology.ox.ac.uk/shibboleth"> - <!-- - This is a "Departments of Zoology and of Plant Sciences ARK" Shibboleth SP for the 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-05-03T11:24:51Z"/> - </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://ark.biology.ox.ac.uk/Shibboleth.sso/Login"/> - </Extensions> - <KeyDescriptor> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIEcjCCA1qgAwIBAgIJALXvZ+na+8FZMA0GCSqGSIb3DQEBBQUAMIG5MQswCQYD - VQQGEwJnYjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd - MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxHjAcBgNVBAsTFURlcGFydG1l - bnQgb2YgWm9vbG9neTEdMBsGA1UEAxMUYXJrLmJpb2xvZ3kub3guYWMudWsxJTAj - BgkqhkiG9w0BCQEWFndlYm1hc3RlckB6b28ub3guYWMudWswHhcNMTMwNDMwMTgx - MzMxWhcNMjMwNDI4MTgxMzMxWjCBuTELMAkGA1UEBhMCZ2IxFDASBgNVBAgTC094 - Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkg - b2YgT3hmb3JkMR4wHAYDVQQLExVEZXBhcnRtZW50IG9mIFpvb2xvZ3kxHTAbBgNV - BAMTFGFyay5iaW9sb2d5Lm94LmFjLnVrMSUwIwYJKoZIhvcNAQkBFhZ3ZWJtYXN0 - ZXJAem9vLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA - 7Gcag+bauSUOc+oeeS1vWw5TRYdBHCUejlqzl0kLmG0e4Kz/KQNj5+BthkxQKLw6 - Jmpf68Ws3nAcWIz7pDRgiHoBfkjkc5vMbyehtnnW+17JwAuZAbqXcKVyv48qNFJe - NLKJI2tJ8iJ4wlce96cw7ouBbC1jawNvxlonb9T0D7xn8+XMwRZKJ8Sgbt5cGJFQ - p1SmCrM6shou3sEcZhwBAPindHCQyyppaabkQlivY1Vka8WiNkxsWCoj5igtLsEb - VyejLlkDsfp5BYPRRaormViEPyybFKmDTopVkm+xDjLgnMSyK+COYeujtkewx95y - 29SSoiexAONJV8hqaKGrBQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB - DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUModS - 2TCZbpR0Xo3EGog6bIgUbvMwHwYDVR0jBBgwFoAUModS2TCZbpR0Xo3EGog6bIgU - bvMwDQYJKoZIhvcNAQEFBQADggEBAIucTNVYS1EKlXQKiFPO4oscBMSmq+LjwsDI - 6EKsFCVY8wMnSWx3zU5skfoWjZw69xHFYVfTk+WKMOQ9qmMOFNItuw0wLqghN7w4 - 4gD+NdZAdadAudsPJiVF1cJPsQptU8xyPWSQc1lqJRFmxUo9lKj8Vq9zABM7373M - M8WeaMj+H+9A0U2dRGEzyJUyRRP1ogYQqc+jC/Qj9nnahqxKsrxu4rnc1Z3d2RMO - qumcP0hPqD+mCOlr9DnJyLsPYcPK8M964rOfemmeqtBExT9kgX1N5shs/P1c5+Lt - OHEYDdIFb2iPO4iL4JwvF4kJLIG6C2xz6ABtgHSgR7SANWZMqOU= - </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://ark.biology.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/POST"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ark.biology.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, Departments of Zoology and of Plant Sciences ARK</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.biology.ox.ac.uk/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Department of Zoology IT Office</GivenName> - <EmailAddress>mailto:support@zoo.ox.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Department of Zoology IT Office</GivenName> - <EmailAddress>mailto:support@zoo.ox.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |