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.wadham.ox.ac.uk-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml deleted file mode 100644 index f2eabcfd..00000000 --- a/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intranet.wadham.ox.ac.uk/shibboleth"> - <!-- - This is a "Wadham College Intranet" 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-11-22T11:59:50Z"> - <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://intranet.wadham.ox.ac.uk/Shibboleth.sso/Login"/> - </Extensions> - <KeyDescriptor> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDDzCCAfegAwIBAgIJAJUJ+mlkoDXOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV - BAMTGGludHJhbmV0LndhZGhhbS5veC5hYy51azAeFw0xMzExMTkxNjQ4MDdaFw0y - MzExMTcxNjQ4MDdaMCMxITAfBgNVBAMTGGludHJhbmV0LndhZGhhbS5veC5hYy51 - azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1hB/bg6UfaT/XuBowU - VPZMqkb8Po4FYgkF3hO52To/bqnCdsalOx/XLfZ4HA09I14q8f0D/cWCYEYtOnVr - VY2hXOFO6YaRKWzQI8F2zHnAgkl9ytbWNqqIMQ6TINe96RCNV22ZZR/uOMQAiXwg - yyxGiQNquo5+vMKhLITbnQTJ/h22K0/DzGH0YF0PvJc/nu/sZMww6FxcdwvEpfzT - cK1WkSeqs4mHmrL1pi8VJTETFFZ8WGJZ2q8ueDloMFKfCa6S2fL2QuzXWbOpRDoW - qC/GpTJDfY4Zi2sixl9dtPlzETR0eOcRtuocv9q+K3JcypWIuy7n4Kr7ZbHYSEn9 - DbkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW50cmFuZXQud2FkaGFtLm94LmFjLnVr - MB0GA1UdDgQWBBRL8H7cVFCFP5rpqrBDxU4lUQ/0LDANBgkqhkiG9w0BAQUFAAOC - AQEAOW8FQM1uFKk7chAErvTO0wiXvoVubVL0nqvA38zW1QNGFsJ9DjylIE7ijVvu - ZhvN9mSMl5j3T1UM0wOBw+ChBCNhHMmCLtyZsTwGA2fnWR+HXCcZ98A45/+7JI84 - gdxPXpQMcNcP5VTP2scCQ5k4I2R2985N7NVU0DiqeMFeLqgAuwnuouv+RDioh5HA - ZJlfdbEsApOe9P5VcHAMbIUIGMpLu369MEomRijiAf/R0VuF84TDX6UT3xzg18kx - 94ZMLY2ekb/Sv1LxRNNJ/leILLJJxXJunf2rk1wYhUMoq2lRPSkrGVMMu/H5c9fe - NCo2Q3oQaG5ZPA9VV7LCeIfm+A== - </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://intranet.wadham.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/POST"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.wadham.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, Wadham College Intranet</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.wadham.ox.ac.uk/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Lee</GivenName> - <SurName>Wootton</SurName> - <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Lee</GivenName> - <SurName>Wootton</SurName> - <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |