1 files changed, 19 insertions, 92 deletions
diff --git a/swamid-interfederations-2.0/idp.dfn.de.xml b/swamid-interfederations-2.0/idp.dfn.de.xml
index aef8cbe1..74ec79e4 100644
--- a/swamid-interfederations-2.0/idp.dfn.de.xml
+++ b/swamid-interfederations-2.0/idp.dfn.de.xml
@@ -1,62 +1,25 @@
 <?xml version="1.0"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn.de/idp/shibboleth">
-        <Extensions>
-	    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T18:20:36Z">
-	        <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>
-     </Extensions>
+    <Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-08-10T13:32:27Z">
+        <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>
+    </Extensions>
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
       <Extensions>
         <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
         <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-            <mdui:DisplayName xml:lang="de">DFN</mdui:DisplayName>
-            <mdui:DisplayName xml:lang="en">DFN</mdui:DisplayName>
-	    <mdui:Description xml:lang="de">DFN Identity Provider für DFN-MitarbeiterInnen</mdui:Description>
-	    <mdui:Description xml:lang="en">The DFN Identity Provider is used by DFN staff members.</mdui:Description>
-            <mdui:Logo height="81" width="180">https://www.aai.dfn.de/fileadmin/templates/main/images/logo.jpg</mdui:Logo>
+          <mdui:DisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="en">German National Research and Education Network</mdui:DisplayName>
+          <mdui:Description xml:lang="de">Föderations-Login für MitarbeiterInnen des DFN-Vereins</mdui:Description>
+          <mdui:Description xml:lang="en">Federation login for DFN staff members</mdui:Description>
+          <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
+          <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
+          <mdui:InformationURL xml:lang="de">http://www.dfn.de</mdui:InformationURL>
+          <mdui:InformationURL xml:lang="en">http://www.dfn.de/en/</mdui:InformationURL>
         </mdui:UIInfo>
       </Extensions>
-      <KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.dfn.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEDR/jMzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0ZWxs
-ZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0wODEwMjMxMTUz
-MDdaFw0xMzEwMjIxMTUzMDdaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4t
-VmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRMwEQYDVQQDEwppZHAu
-ZGZuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzTWL0k7ANsvg
-boiSQK6IbJXcuxb4lrcs3uKdJvQlKAH4oWu/oY+g/xqERlOqftjL3g36F979O+pF
-567VjG40X2XULfZ/BnKlk5nFPshgUUAY1d5ppc7QooyBWdISIyfxjEX9DKlFJ9P4
-TflqX6m9jWxx8nXokP5foewJrV5HpxYsv1W6t0AbxN4PB8rr60g2ip7ZH9Cu6Rh4
-EsG0kxhV59jewU8re0nRaRFl8Lgarj8EHTHq55C1N0tZyChmxnGYOsDX/bhon4KY
-6wHP94fTUN5O3z+cd4drDD+rfRBq/6sLVLfYz9rn5b0MFsglTrneaLEA46iVHt8L
-o0G5etpxAQIDAQABo4IB2zCCAdcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRQGdtpn+tg3/5k
-wx6PG/fkY367+zAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAdBgNV
-HREEFjAUgRJob3RsaW5lQGFhaS5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZl
-cmVpbi1ncy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCB
-mjBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWlu
-LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAMVD5IkagXQC9CeMLaumWt9r
-6smb/4qonPlNUACp3Dbr/QAnZvNj6haJgGKJ7YpFnijXaq6AtsMUsQ3iOLjHodDP
-IhGUv0Q+GuuSr+jmNsRST81UkrJm+wUk5R3jQMTOIWD3qdqV7g4y5xZB/7Xt1ItJ
-wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
-1PbZw1Cy1bYxzecOAzRI1rSivyDMPW0YC79qCB/8QssLbU8pjfyfBNQui28ZkIst
-3wRjq+vPHe87TOxiDI4QR9IBwMIk6zTL67iH35se5LUp+qdvAtWBLf0/iYNwVWY=
-</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </KeyDescriptor>
       <KeyDescriptor use="signing">
         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
           <ds:KeyName>idp.dfn.de</ds:KeyName>
@@ -107,42 +70,6 @@ wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
       <Extensions>
         <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
       </Extensions>
-      <KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.dfn.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEDR/jMzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0ZWxs
-ZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0wODEwMjMxMTUz
-MDdaFw0xMzEwMjIxMTUzMDdaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4t
-VmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRMwEQYDVQQDEwppZHAu
-ZGZuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzTWL0k7ANsvg
-boiSQK6IbJXcuxb4lrcs3uKdJvQlKAH4oWu/oY+g/xqERlOqftjL3g36F979O+pF
-567VjG40X2XULfZ/BnKlk5nFPshgUUAY1d5ppc7QooyBWdISIyfxjEX9DKlFJ9P4
-TflqX6m9jWxx8nXokP5foewJrV5HpxYsv1W6t0AbxN4PB8rr60g2ip7ZH9Cu6Rh4
-EsG0kxhV59jewU8re0nRaRFl8Lgarj8EHTHq55C1N0tZyChmxnGYOsDX/bhon4KY
-6wHP94fTUN5O3z+cd4drDD+rfRBq/6sLVLfYz9rn5b0MFsglTrneaLEA46iVHt8L
-o0G5etpxAQIDAQABo4IB2zCCAdcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRQGdtpn+tg3/5k
-wx6PG/fkY367+zAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAdBgNV
-HREEFjAUgRJob3RsaW5lQGFhaS5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZl
-cmVpbi1ncy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCB
-mjBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWlu
-LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAMVD5IkagXQC9CeMLaumWt9r
-6smb/4qonPlNUACp3Dbr/QAnZvNj6haJgGKJ7YpFnijXaq6AtsMUsQ3iOLjHodDP
-IhGUv0Q+GuuSr+jmNsRST81UkrJm+wUk5R3jQMTOIWD3qdqV7g4y5xZB/7Xt1ItJ
-wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
-1PbZw1Cy1bYxzecOAzRI1rSivyDMPW0YC79qCB/8QssLbU8pjfyfBNQui28ZkIst
-3wRjq+vPHe87TOxiDI4QR9IBwMIk6zTL67iH35se5LUp+qdvAtWBLf0/iYNwVWY=
-</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </KeyDescriptor>
       <KeyDescriptor use="signing">
         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
           <ds:KeyName>idp.dfn.de</ds:KeyName>
@@ -186,9 +113,9 @@ wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
       <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     </AttributeAuthorityDescriptor>
     <Organization>
-      <OrganizationName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationName>
-      <OrganizationName xml:lang="en">German National Research and Education Network, DFN</OrganizationName>
-      <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationDisplayName>
+      <OrganizationName xml:lang="de">e15</OrganizationName>
+      <OrganizationName xml:lang="en">e15</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</OrganizationDisplayName>
       <OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</OrganizationDisplayName>
       <OrganizationURL xml:lang="de">http://www.dfn.de</OrganizationURL>
       <OrganizationURL xml:lang="en">http://www.dfn.de/en/</OrganizationURL>
@@ -204,8 +131,8 @@ wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
       <EmailAddress>hotline@aai.dfn.de</EmailAddress>
     </ContactPerson>
     <ContactPerson contactType="support">
-      <GivenName>Wolfgang</GivenName>
-      <SurName>Pempe</SurName>
+      <GivenName>DFN-AAI</GivenName>
+      <SurName>Hotline</SurName>
       <EmailAddress>hotline@aai.dfn.de</EmailAddress>
     </ContactPerson>
   </EntityDescriptor>