1 files changed, 30 insertions, 78 deletions
diff --git a/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml b/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
index d143423e..687f8b6c 100644
--- a/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
@@ -18,82 +18,44 @@
         <mdui:InformationURL xml:lang="en">http://www.kunst-und-funktion.de/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>sds.geschkult.fu-berlin.de</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=sds.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsTCCBJmgAwIBAgIHE7TkxI/mSTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
+          <ds:X509Certificate>MIIGHzCCBQegAwIBAgIHGPldZLrBDjANBgkqhkiG9w0BAQsFADCBtTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
 ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
 A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTQyOTA4WhcN
-MTcwNDIyMTQyOTA4WjCBszELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xIzAhBgNVBAMTGnNkcy5nZXNjaGt1bHQuZnUtYmVybGlu
+HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTUwMjEwMTAzOTE2WhcN
+MTkwNzA5MjM1OTAwWjCBszELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJlcmxpbjEP
+MA0GA1UEBwwGQmVybGluMSIwIAYDVQQKDBlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
+bGluMTkwNwYDVQQLDDBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
+d2lzc2Vuc2NoYWZ0ZW4xIzAhBgNVBAMMGnNkcy5nZXNjaGt1bHQuZnUtYmVybGlu
 LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxQiC2Eb0zNzFtrlQ
 FMqNF4v5tTD2G4MRUDCu6j2q44u6KIq8MmUj0kmEEEwPp+SM2KgBjvWGFbi6JRxo
 KVPgqo7lSMSOxWzvPtdpMet5FNWl1fMCRff35GsWHb9eM7eE6QZDc4zNyyOCWHYk
 f/fwzWk4a5asHg00+92I1WI9+6Qud5IR4jrvoMG7Jbt3vZQLJeCxiwdiNaK+5QxO
 p/H4zXwqrUZsGCovnpgTYXJ70blUzgScyeDc0mceFActrimEfWgSM0jCIsqSALDF
 PSeQLDrLYmFsp/qWN/UeTU2KvO05CQc88f4OcwwTyZ9Bz8M2XElXT9g47eZQDImh
-PFl+PwIDAQABo4IBxDCCAcAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIw
-CQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMB0GA1UdDgQWBBS+8dPy2YsDwhLcALXLrUDmTPk7oTAfBgNVHSMEGDAW
-gBQG4T30b/Qwt3o7V7AxBYl7DVhabDAfBgNVHREEGDAWgRRqLnBvc2VsQGZ1LWJl
-cmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCB
-gDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQAfB2BcEnVLU64XzvGRlQsoBDONqU0V47hoYMp+fazwwrFpnd4abnN9afd9
-6WTw+w8iPtouHwDBk2ug+y/O9qKWQ/xcnpHxY/8kTFFfL/l4kqTez1+YlPdcSBOc
-xvUVpkOhTzz/NHnOugGURzx0yr5Ed+qjizYuRXY+b5rCpQuvL+XqeHlCE68sPvpK
-T25BX08SdKK4f0oRnXWWh2QCYQ/4NIWv08ONldVPdtAxk8PBmDuoCG/YIlx9dYiN
-XWJJd+8bBwrHOLmMkpGeRTPkylm/xxzaiar+bcLgovnoDgYHtdwLsFqfz6udseTN
-hxwSl97R2/aZr5SYew488kLknAEp
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sds.geschkult.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sds.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsTCCBJmgAwIBAgIHE7TkxI/mSTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTQyOTA4WhcN
-MTcwNDIyMTQyOTA4WjCBszELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xIzAhBgNVBAMTGnNkcy5nZXNjaGt1bHQuZnUtYmVybGlu
-LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxQiC2Eb0zNzFtrlQ
-FMqNF4v5tTD2G4MRUDCu6j2q44u6KIq8MmUj0kmEEEwPp+SM2KgBjvWGFbi6JRxo
-KVPgqo7lSMSOxWzvPtdpMet5FNWl1fMCRff35GsWHb9eM7eE6QZDc4zNyyOCWHYk
-f/fwzWk4a5asHg00+92I1WI9+6Qud5IR4jrvoMG7Jbt3vZQLJeCxiwdiNaK+5QxO
-p/H4zXwqrUZsGCovnpgTYXJ70blUzgScyeDc0mceFActrimEfWgSM0jCIsqSALDF
-PSeQLDrLYmFsp/qWN/UeTU2KvO05CQc88f4OcwwTyZ9Bz8M2XElXT9g47eZQDImh
-PFl+PwIDAQABo4IBxDCCAcAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIw
-CQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMB0GA1UdDgQWBBS+8dPy2YsDwhLcALXLrUDmTPk7oTAfBgNVHSMEGDAW
-gBQG4T30b/Qwt3o7V7AxBYl7DVhabDAfBgNVHREEGDAWgRRqLnBvc2VsQGZ1LWJl
-cmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCB
-gDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQAfB2BcEnVLU64XzvGRlQsoBDONqU0V47hoYMp+fazwwrFpnd4abnN9afd9
-6WTw+w8iPtouHwDBk2ug+y/O9qKWQ/xcnpHxY/8kTFFfL/l4kqTez1+YlPdcSBOc
-xvUVpkOhTzz/NHnOugGURzx0yr5Ed+qjizYuRXY+b5rCpQuvL+XqeHlCE68sPvpK
-T25BX08SdKK4f0oRnXWWh2QCYQ/4NIWv08ONldVPdtAxk8PBmDuoCG/YIlx9dYiN
-XWJJd+8bBwrHOLmMkpGeRTPkylm/xxzaiar+bcLgovnoDgYHtdwLsFqfz6udseTN
-hxwSl97R2/aZr5SYew488kLknAEp
+PFl+PwIDAQABo4ICMjCCAi4wTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwMw
+EQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGC
+LB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
+CCsGAQUFBwMBMB0GA1UdDgQWBBS+8dPy2YsDwhLcALXLrUDmTPk7oTAfBgNVHSME
+GDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDAlBgNVHREEHjAcghpzZHMuZ2VzY2hr
+dWx0LmZ1LWJlcmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHFBggrBgEF
+BQcBAQSBuDCBtTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9P
+Q1NQLVNlcnZlci9PQ1NQMD4GCCsGAQUFBzAChjJodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL2Z1LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA+BggrBgEFBQcwAoYyaHR0
+cDovL2NkcDIucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQELBQADggEBABvBL8LrCEwVzArAZ4PVyQSg20buTtyqg/O8rs45
+BUyFP3s10JQH2VMIIkZdSOwy6uBpHdvPN+QIVBz/6j6/awFAPnrDwux/1vH5OgCP
+UDG3QmeebcWtz+uhQR/LXKK5mqD46TLan1WHj1fnDCK678pIaqNefn71IO9wGuLZ
+tM3XDmc1x9DkR22n8kKDNVQvH74LoeMXkT73W6qESha0+K9l+UzJ6/xmsOdWU2m/
+pq5Smjy+M9orfvsuXQYOzxfnYBUIEoyD9eVc2OjiwKy5VA9tISMBiS9Oyx2n42Pe
+TJpLI0EqYx0IYLCS+WkpctBenwMkYEuIOu88njquyjpZqjY=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -130,23 +92,13 @@ hxwSl97R2/aZr5SYew488kLknAEp
     <md:OrganizationURL xml:lang="en">https://identity.fu-berlin.de/idp-fub/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Johannes</md:GivenName>
-    <md:SurName>Posel</md:SurName>
-    <md:EmailAddress>mailto:support@geschkult.fu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Steffen</md:GivenName>
-    <md:SurName>Hofmann</md:SurName>
-    <md:EmailAddress>mailto:fudis@zedat.fu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Johannes</md:GivenName>
-    <md:SurName>Posel</md:SurName>
-    <md:EmailAddress>mailto:support@geschkult.fu-berlin.de</md:EmailAddress>
+    <md:GivenName>Funktionsadresse</md:GivenName>
+    <md:SurName>IT des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
+    <md:EmailAddress>mailto:servermaster@geschkult.fu-berlin.de</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Johannes</md:GivenName>
-    <md:SurName>Posel</md:SurName>
+    <md:GivenName>Funktionsadresse</md:GivenName>
+    <md:SurName>IT-Support des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
     <md:EmailAddress>mailto:support@geschkult.fu-berlin.de</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>