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/some-develsp.some.ox.ac.uk-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml deleted file mode 100644 index 6bd34f99..00000000 --- a/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml +++ /dev/null @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://some-develsp.some.ox.ac.uk/shibboleth"> - <!-- - This is a "Somerville College SharePoint01" 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="2014-06-16T15:43:15Z"> - <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://some-develsp.some.ox.ac.uk/Shibboleth.sso/Login"/> - </Extensions> - <KeyDescriptor> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDRDCCAiygAwIBAgIJANXhSSqDSViiMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV - BAMTGnNvbWUtZGV2ZWxzcC5zb21lLm94LmFjLnVrMB4XDTE0MDYxMTE0MzU0NloX - DTI0MDYwODE0MzU0NlowJTEjMCEGA1UEAxMac29tZS1kZXZlbHNwLnNvbWUub3gu - YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCXH7lw13G4eqAT - prFxI+KMrjJs8IjKlnsfsHcBkHTwyPLf8hL9Ia5lJMtBhbJrTcv/fznsAnbzUo0I - nncmCF5tQFljOap2VhPCFKm79JZ69bL/Eu5o5bqiv/njw/PfdiiIR3x3cdqwPWOr - 2aNuzoNVQzlXFK0v3Mt927MXZZ4BUpbtPaP3NjxHfEktZhCH/R2duFNz16azWWul - Pch0Jw9D+4XMeF6i8CqeBEgmawZFN0cb5sgPcoacMhNmd5lMd8Ami+qfsmFlp05t - HB6fMY47pYy/O5RvYskgdftCCGuDIu89UmiWmNjHPytv6VeoPAyTAW7kehdpa85j - 9bn/cBdfAgMBAAGjdzB1MFQGA1UdEQRNMEuCGnNvbWUtZGV2ZWxzcC5zb21lLm94 - LmFjLnVrhi1odHRwczovL3NvbWUtZGV2ZWxzcC5zb21lLm94LmFjLnVrL3NoaWJi - b2xldGgwHQYDVR0OBBYEFG0CsUCHIt0y9PN0th+wQkPelh/OMA0GCSqGSIb3DQEB - BQUAA4IBAQBxVrg19YoV4XxXSNhaPYcjbWyZgZ41mB5AVrG87TOHh8mxBkbKLLAU - ZR+c3JqU4zSfle0zPFtD2IZyqbGoojswc482B5ZTltUGjLycfvNksfTT1C0/w50g - +Je9Njn4evUuw62XBPBG9m4S9pPCuKe28zmWWC/MjFQenK43TYU4Unud3OoyEMHY - sRW3pdor018DiAv0bV1q7r2KaWaEZWbgFtdqWYxU/R7VhFYKj9wWHs5DLIAnpmkc - xrs3kV6juklNJUG4pICaF88CW9Zcd4d6B4O26HeShWAD1X37iJVfdAqAgTXXLyvj - 0rrgwvOpovrO2SefkaQVmpAqclAivahc - </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://some-develsp.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://some-develsp.some.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 Somerville College SharePoint01</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Somerville College IT Support</GivenName> - <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Somerville College IT Support</GivenName> - <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |