resolve conflicts and merge

1 files changed, 156 insertions, 0 deletions

diff --git a/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
new file mode 100644
index 00000000..15b5f2f1
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mh-hannover.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-26T13:58:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mh-hannover.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Medizinische Hochschule Hannover</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Hannover Medical School</mdui:DisplayName>
+        <mdui:Description xml:lang="de">MHH-IdP - Produktiv</mdui:Description>
+        <mdui:Description xml:lang="en">MHH IdP - Productive</mdui:Description>
+        <mdui:Logo height="16" width="16">https://shibboleth.mh-hannover.de/idp/images/mhh_icon.ico</mdui:Logo>
+        <mdui:Logo height="60" width="250">https://shibboleth.mh-hannover.de/idp/images/mhh_logo.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.mh-hannover.de/zimt.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mh-hannover.de/zimt.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.mh-hannover.de/zimt.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.mh-hannover.de/zimt.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.mh-hannover.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.mh-hannover.de,OU=ZIMt,O=Medizinische Hochschule Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG3zCCBcegAwIBAgIHF5kthgN4JTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJERTEpMCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIx
+DzANBgNVBAMTBk1ISCBDQTEhMB8GCSqGSIb3DQEJARYScGtpQG1oLWhhbm5vdmVy
+LmRlMB4XDTE0MDUxOTA3MTcxMVoXDTE5MDUxODA3MTcxMVowgZYxCzAJBgNVBAYT
+AkRFMRYwFAYDVQQIEw1OaWVkZXJzYWNoc2VuMREwDwYDVQQHEwhIYW5ub3ZlcjEp
+MCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIxDTALBgNV
+BAsTBFpJTXQxIjAgBgNVBAMTGXNoaWJib2xldGgubWgtaGFubm92ZXIuZGUwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+rVeMLRdkpnizrYdnx6rKFTjK
+fEZXh+1RrTvHsbTt6DLz41QLrrr2aTma8HMyLbJtr62uuKvOqOlat7ikt6x6KT4E
+njHjc4xFgW6LpyJ3hvpq/fMGV2nXRo5pvjFhd6A4bg5TfmECkkTnmu55TllIC1t1
+JzYIgMfR6STiH4qt09Oefd36R70oHWFwOfyS01d0nZ5/6AmMFv7I74Dh0ASeCiQo
+N0B+hocT+WJxXVqukjPIxDygj3EMOwBBjqVCRobLpyacQSc1Akiw71yH9AFj5LNR
+rDjhbom4Vk+Q3TuIXwLI07sl8dDF7W8f2OdI+PHZLu3d44WvxjJiGddbJ1Zlppt/
+8cuK5Alst+AtazTuLCRG78y3TkLYMU4CDdV3ravzy1YL1dUCsXyDamxNIN8digNN
+BzXjkJ7QTOah3nYAiG0yE34tpt2DNbGNZglkPQbhgbM/+lCM76DH95/AC6yyZOLF
+ZbcOgmpAkNVq7htd/Z62KaiUSSzB1KzOxs+IPq3erC6CozyDuXgiIbC/98SnS0cz
+XFKyOzgks3o6o2Mu6D1+lCOHE1kUvABL4sedrkmhERAteR9A1F4yAy+ZD379BtSY
+gA8Sc2vPIBKvx2o/+fhQR4/YNjGOaR+rUiVXzeGHr/u3Yup9ztsKpLM0ksZksYxX
+X6QUMAICu1oDUtKWjwIDAQABo4ICWTCCAlUwOQYDVR0gBDIwMDARBg8rBgEEAYGt
+IYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU+uf4
+1Hbz3g+5aTVL89lFbtU5sv4wHwYDVR0jBBgwFoAUJZuBmmj89gJMu3dfHExoM7Nu
+RmswRgYDVR0RBD8wPYIZc2hpYmJvbGV0aC5taC1oYW5ub3Zlci5kZYEgdGV0emxh
+ZmYuYmVuamFtaW5AbWgtaGFubm92ZXIuZGUwgYgGA1UdHwSBgDB+MD2gO6A5hjdo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21oLWhhbm5vdmVy
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHXBggrBgEFBQcBAQSByjCBxzAzBggrBgEF
+BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEcG
+CCsGAQUFBzAChjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBHBggrBgEFBQcwAoY7aHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9taC1oYW5ub3Zlci1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBAKXYkO2475QAfkK4IZgARuHUesp8kZZHh8YU6YAH
+Wruj5A032fwktpkVt9rhkyPjm/oZr0RdPQKM1BE0se3kCPL4v7MYQDhjvZa66xs3
+iCvJN8NtusArjA9LyjDHUuG+oVKUB+d1HjD3nT8fXGUrw+FYaKoSOPaNBceBBhzr
+DhjST4fPGDO9xwgXbhUcg/+I3E/pLfg8Hj38iFKr9hlpawsJc3A7gruNQp30RyfK
+MN0mlBaZ3pqibwbaDcibWo/Eu8PtwrpYB4XrtBvEgiqWVfA90kNsphQDNYfvaEoZ
+K18PEJr4gbSWIPjE1lQEyqGD5n0ZrU/xJiM8BlvUdStJChk=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mh-hannover.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mh-hannover.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.mh-hannover.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.mh-hannover.de,OU=ZIMt,O=Medizinische Hochschule Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG3zCCBcegAwIBAgIHF5kthgN4JTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJERTEpMCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIx
+DzANBgNVBAMTBk1ISCBDQTEhMB8GCSqGSIb3DQEJARYScGtpQG1oLWhhbm5vdmVy
+LmRlMB4XDTE0MDUxOTA3MTcxMVoXDTE5MDUxODA3MTcxMVowgZYxCzAJBgNVBAYT
+AkRFMRYwFAYDVQQIEw1OaWVkZXJzYWNoc2VuMREwDwYDVQQHEwhIYW5ub3ZlcjEp
+MCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIxDTALBgNV
+BAsTBFpJTXQxIjAgBgNVBAMTGXNoaWJib2xldGgubWgtaGFubm92ZXIuZGUwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+rVeMLRdkpnizrYdnx6rKFTjK
+fEZXh+1RrTvHsbTt6DLz41QLrrr2aTma8HMyLbJtr62uuKvOqOlat7ikt6x6KT4E
+njHjc4xFgW6LpyJ3hvpq/fMGV2nXRo5pvjFhd6A4bg5TfmECkkTnmu55TllIC1t1
+JzYIgMfR6STiH4qt09Oefd36R70oHWFwOfyS01d0nZ5/6AmMFv7I74Dh0ASeCiQo
+N0B+hocT+WJxXVqukjPIxDygj3EMOwBBjqVCRobLpyacQSc1Akiw71yH9AFj5LNR
+rDjhbom4Vk+Q3TuIXwLI07sl8dDF7W8f2OdI+PHZLu3d44WvxjJiGddbJ1Zlppt/
+8cuK5Alst+AtazTuLCRG78y3TkLYMU4CDdV3ravzy1YL1dUCsXyDamxNIN8digNN
+BzXjkJ7QTOah3nYAiG0yE34tpt2DNbGNZglkPQbhgbM/+lCM76DH95/AC6yyZOLF
+ZbcOgmpAkNVq7htd/Z62KaiUSSzB1KzOxs+IPq3erC6CozyDuXgiIbC/98SnS0cz
+XFKyOzgks3o6o2Mu6D1+lCOHE1kUvABL4sedrkmhERAteR9A1F4yAy+ZD379BtSY
+gA8Sc2vPIBKvx2o/+fhQR4/YNjGOaR+rUiVXzeGHr/u3Yup9ztsKpLM0ksZksYxX
+X6QUMAICu1oDUtKWjwIDAQABo4ICWTCCAlUwOQYDVR0gBDIwMDARBg8rBgEEAYGt
+IYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU+uf4
+1Hbz3g+5aTVL89lFbtU5sv4wHwYDVR0jBBgwFoAUJZuBmmj89gJMu3dfHExoM7Nu
+RmswRgYDVR0RBD8wPYIZc2hpYmJvbGV0aC5taC1oYW5ub3Zlci5kZYEgdGV0emxh
+ZmYuYmVuamFtaW5AbWgtaGFubm92ZXIuZGUwgYgGA1UdHwSBgDB+MD2gO6A5hjdo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21oLWhhbm5vdmVy
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHXBggrBgEFBQcBAQSByjCBxzAzBggrBgEF
+BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEcG
+CCsGAQUFBzAChjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBHBggrBgEFBQcwAoY7aHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9taC1oYW5ub3Zlci1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBAKXYkO2475QAfkK4IZgARuHUesp8kZZHh8YU6YAH
+Wruj5A032fwktpkVt9rhkyPjm/oZr0RdPQKM1BE0se3kCPL4v7MYQDhjvZa66xs3
+iCvJN8NtusArjA9LyjDHUuG+oVKUB+d1HjD3nT8fXGUrw+FYaKoSOPaNBceBBhzr
+DhjST4fPGDO9xwgXbhUcg/+I3E/pLfg8Hj38iFKr9hlpawsJc3A7gruNQp30RyfK
+MN0mlBaZ3pqibwbaDcibWo/Eu8PtwrpYB4XrtBvEgiqWVfA90kNsphQDNYfvaEoZ
+K18PEJr4gbSWIPjE1lQEyqGD5n0ZrU/xJiM8BlvUdStJChk=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e435</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e435</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Medizinischen Hochschule Hannover</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Hannover Medical School (MHH)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.mh-hannover.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.mh-hannover.de/index.php?id=2</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benjamin</md:GivenName>
+    <md:SurName>Tetzlaff</md:SurName>
+    <md:EmailAddress>mailto:Benjamin.Tetzlaff@mh-hannover.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benjamin</md:GivenName>
+    <md:SurName>Tetzlaff</md:SurName>
+    <md:EmailAddress>mailto:Benjamin.Tetzlaff@mh-hannover.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>