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/health.balliol.ox.ac.uk-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml deleted file mode 100644 index 8716ed8f..00000000 --- a/swamid-interfederations-2.0/health.balliol.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://health.balliol.ox.ac.uk/shibboleth"> - <!-- - This is a "Balliol College Health Monitoring" 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-06-19T17:10:03Z"/> - </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://health.balliol.ox.ac.uk/Shibboleth.sso/Login"/> - </Extensions> - <KeyDescriptor> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDDDCCAfSgAwIBAgIJAISjz39anYvxMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV - BAMTF2hlYWx0aC5iYWxsaW9sLm94LmFjLnVrMB4XDTEzMDYxNDE1NDcxMVoXDTIz - MDYxMjE1NDcxMVowIjEgMB4GA1UEAxMXaGVhbHRoLmJhbGxpb2wub3guYWMudWsw - ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEM4MhQGL1WH/wnDLogYmE - 22fAMVtR3DdC2JCgUbjFNDij2iEGwo+uq6sqOPxgFI8LHJd6DG0RTpn6TdPC8q6o - q2vtpa6ncJcFIKjger8UPcOaCBf74+x2O+UF1W7BQw6MVt1dJaM05s7kk2lg+ezX - LdMOpbzy0JLY2c6x5PEMuHqkK8slABuKBBEqxZQwrLgo4SYgxP9I2Et7OEyQHw4G - EO5ADb7ZVpwY6JaSmcvHYbrXU9AsInhAhKa8AL4oSMFmbgvkgc3Y76+h+N3GPYOD - y3XEEY38hWvPHSOP0cA/97PeD8G0MaGx2MfY1JizaPuFWv7l/0gGMK4qyW/wtiQR - AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2hlYWx0aC5iYWxsaW9sLm94LmFjLnVrMB0G - A1UdDgQWBBRHj9z9ifwaUesGamTczMNhu52ttzANBgkqhkiG9w0BAQUFAAOCAQEA - K7y6McC/jFSF5NSFePI1TYzPvgm7b5aJ5ZYyjbYvib4zqzICoEr+ehFG0lK/Q2Go - BJa4gr7dVZLR09n15Z/OaLxpJPXfcSPCYFtMi3ZUUXbFmLjp/U2G0rB1Lciv6leY - NCxxd7afv6NbvsRDXLCadPbRULjQepz6R0A0ewyrlw2kl1k5GB52HsjbPpXpWKTd - xFFtqC450OBmGvKCxrBmXmKRgKSqBMCZuayejedIlTc3CsXfL3Yt89oqbINUAlHk - jH6XT7Moapdct22P+qnwRCS/apvjf+xLuRWz7qEm/HK+dnMG1ZLEYTMAMY2tvPsr - AKnWzztuE6aBJIRLC1YhqQ== - </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://health.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://health.balliol.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 Balliol College Health Monitoring</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Ian</GivenName> - <SurName>Plummer</SurName> - <EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Ian</GivenName> - <SurName>Plummer</SurName> - <EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |