resolve conflicts and merge

1 files changed, 0 insertions, 90 deletions

diff --git a/swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 9c05cd0c..00000000
--- a/swamid-interfederations-2.0/intranet.hmc.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://intranet.hmc.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "HMC Intranet" 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="2012-10-02T13:11:22Z"/>
-  </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.hmc.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAIU8QGcz0dW7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWludHJhbmV0LmhtYy5veC5hYy51azAeFw0xMjA5MjgxNDAxMjFaFw0yMjA5
-						MjYxNDAxMjFaMCAxHjAcBgNVBAMTFWludHJhbmV0LmhtYy5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALpxFuwu20NkTMGvbkdalfQmgkqK
-						OYWin+c2AjcyEvYwu+ltFotD3VU0dwQcIIvKzS4lWf8oFY1T096/Xya+ghriVkLO
-						/W1pS0D/a/m65zhqLL4Lxm6QQNXWrzXMqsbzCIX/PsCB289VH8U9o+veby1MwqeD
-						/IEWkOvnbMo7XdM1NYTjGCbjXj/V1MPsX5MCKCC1qpnKTpLlKCM4IMQ7uyR4gpZ9
-						uOYbisoTB6sM5IHhZ1iEPnoMRUc+XVV/2PTXKYvmHFK0nK69WgJTqhHq8JpLDReL
-						WMTu1IBX2HkkD4lusDGHbjsnXPMPk667selsm+sdKGS6VZK8rcQeVoHGGmcCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVaW50cmFuZXQuaG1jLm94LmFjLnVrMB0GA1UdDgQW
-						BBQrgF2zSfUhkXvNqRmMVewVsB8BDDANBgkqhkiG9w0BAQUFAAOCAQEANM4f7Js5
-						kWP9l88MlcZED8jKgnUU6xzk2/cucL3NWMQHRf3tX5Zx+TQNmCQPrQQuOVnZGBGy
-						t0BsjUWnm5EL8L8S2zPacTEXTPwIWZfMCGgfU6ukzf/qOvEEI4HmpwEb3Cyct+kW
-						L+md/et04WByDCOYBpI8miBmImtD0ivT52Z5mkqAcQ4kkjI4mmDKux1Z2LE6GjBl
-						pdBX86sXKhJFK+sd+W8tH5MhXx/QeQOm59E4lTEqycQzWU1bdSi2wSsfpTdn5QuP
-						MG4F8FSqKxqBRa2o7IBGKpQEM+oUTCVgDCGI+CPT56LdiS12JrjrSyPxyNJ1f+q3
-						nulyyQrBNsg/BA==
-					</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.hmc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.hmc.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.hmc.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.hmc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.hmc.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 - HMC Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hmc.ox.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Boucard</SurName>
-    <EmailAddress>mailto:it-support@hmc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Boucard</SurName>
-    <EmailAddress>mailto:it-support@hmc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>