SWAMID-1643, SWAMID-1644 Updated mp.uu.se and test.mp.uu.se

2 files changed, 40 insertions, 36 deletions

diff --git a/swamid-2.0/mp.uu.se-Shibboleth.sso.xml b/swamid-2.0/mp.uu.se-Shibboleth.sso.xml
index 7260fdc5..ba58f45e 100644
--- a/swamid-2.0/mp.uu.se-Shibboleth.sso.xml
+++ b/swamid-2.0/mp.uu.se-Shibboleth.sso.xml
@@ -107,7 +107,7 @@ A2fBr5E=</ds:X509Certificate>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
+    <md:SurName>IT Support</md:SurName>
     <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
   </md:ContactPerson>
@@ -118,7 +118,7 @@ A2fBr5E=</ds:X509Certificate>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
+    <md:SurName>IT Support</md:SurName>
     <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/test.mp.uu.se-Shibboleth.sso.xml b/swamid-2.0/test.mp.uu.se-Shibboleth.sso.xml
index b9000f82..f2d4999e 100644
--- a/swamid-2.0/test.mp.uu.se-Shibboleth.sso.xml
+++ b/swamid-2.0/test.mp.uu.se-Shibboleth.sso.xml
@@ -22,8 +22,6 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
@@ -40,41 +38,42 @@
         <mdui:Description xml:lang="en">The Staff Portal (Medarbetarportalen) is an intranet for employees at Uppsala University, but it's also available for students and external users.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://test.mp.uu.se/sv/web/support/om-mp</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://test.mp.uu.se/en/web/support/om-mp</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/en/web/support/behandlingpersonuppgifter</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/sv/web/support/behandlingpersonuppgifter</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>test.mp.uu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=test.mp.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJAIl80G+yw8TEMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXRlc3QubXAudXUuc2UwHhcNMTIxMDExMTQzMjU5WhcNMjIxMDA5MTQzMjU5
-WjAYMRYwFAYDVQQDEw10ZXN0Lm1wLnV1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAwqaqXqq9CgNf5q0dxBc26da3IDJgGqkDDLfguvwBEGzNl+GZ
-RFqt0zYvgm2xESBbUHYtghGhfei7o75e73wax8gNVl92BZ8pwWuzNDobGgeh4Au/
-CBm0WuZS4C9c+H7tEnaY+gajQIrIsMnVmNUg6SYw8WRVaMJ1DFJXVdVPv84hFGQl
-hhJ3JhMVSTr5XonzlEfOERC50MmJpdFWsw18ZZYguYxAO3sr8/bNWCil/UoyGlqd
-suBvl/0TBy999sppMJi9Ruf1EYZJEMp+cwktiJ0amHNM/p9Bh3UiHTmy4ezy7iOZ
-nbsZPE0kDZBy73tImrQo+gV8MXEtZMB7oLbE4QIDAQABozswOTAYBgNVHREEETAP
-gg10ZXN0Lm1wLnV1LnNlMB0GA1UdDgQWBBQ7Ui+hkYbochetApl5wxE3yuiYvjAN
-BgkqhkiG9w0BAQUFAAOCAQEAwkO8JPsnUzHZdMYJ8hARdTtucqNs7KAxHVKzrff/
-sV6M4aaXx2ZKQJnN2OKrH/VEeuia4znvgHavnLdTPt7rXiyOpBR3eLwrc8rBNEyt
-O1jddcOwjv+rihqX5h8ab1OZ2QE7ZIZO0fi2maJjOsdzJvr9CwkTpKJjHT7WCTQV
-zfAidxqveMFn/7UsoXIsiVTgQ7eEVJPl3njBDDi/E0PDmQCNMG6Trzpof9iKHAuJ
-f91arR1JmuNzmHFNaLikuWCqw/8qr938FM2uP4W2OTcMm998DSp5z+SDOHphuhZF
-6OzPcq8bOQu+OlGG4/PkOBSezPss+Vn4cuY0pAQ8VTeGSA==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIE8DCCAtigAwIBAgIJAM5IksMD367xMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMTDXRlc3QubXAudXUuc2UwIBcNMjIxMDE0MDcwNDI4WhgPMjEyMjA5MjAwNzA0
+MjhaMBgxFjAUBgNVBAMTDXRlc3QubXAudXUuc2UwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCqYz4WJSxnNPzQHvjLUzMkwPP00F1PUJRkQdbRdLLCshTj
+0VBhXE7LR+I86WW2HRhjR+EYuEgcKCPptIAuVPutO5sfljMnfkrgUAqW3AygjA4W
+2w0L5Bc2+RV3mPnjkGFogUdPZ4TjnYn3AHlF7ocwkoLr45iRiL0o0s1vckIMTpI4
+LkZlHmdUnHmm2Ae3rNhQ0FoPmx/wov3radxCpnQazdhVaUlKkDBuvZ8xP0qcKaPw
+yul5bW6/Wut8gSHrESR9yMH3Gnh0p9StoMwEW3h0kxjik+FSwn8qN+EeIURryNxm
+XgauBZSF3kYwFrUxeR8g4tVq/Pw6h1hhCc2j9P+Cktfa+et46YC4H9RIUJpiBAPg
+ySQnpx+uGQzxC700RnN8y8pHg1rpv+CkDiuA4PIIzMpCcUBBhNeSwZJq8yKH91u0
+Mz0MwPKF6hJsQzJ3/S3o/uRsFLntska0HMpBdWt5nZvY/YVWvgEgGWU+hwtAnxRl
+Vy2KuaIf6fQTNIKux4ShdjtPTSH7H9scqxx+Xf3BNKMBJQvefavt9qftbmlzl+JX
+xl8ZqsX+LON6EYBVQfmuBUdP75Kc7tIOaJVd6q6duqZcCkz73ZpNj3IY6YKOAp7i
+HiJJiq3TfqkN/8baIh0++YlrjeYoY7/baIvP/+8zOMUK5jJwvWfks5DZClK+ywID
+AQABozswOTAYBgNVHREEETAPgg10ZXN0Lm1wLnV1LnNlMB0GA1UdDgQWBBTFQL5E
+u3ewVGP07MsTOp3cSbUHrzANBgkqhkiG9w0BAQsFAAOCAgEALnypaHbunBiyZGeI
+1wW+6nLEPjwK9lDF2Mq0kASN1dP1ZPqju9E4cXx98DBAyD5r7YuQd8JqOU6hBhMe
+Mnz6WcUjbyTzMdvk7ergG9CVjKneYuLXgdcW3PvK2YeaAviMnYiHQqi2tYMWLU+Z
+zAK5a47U0EUku2F9riQeDvcvl9YSBlFt/81c9q8A/j5f5Ece2ux6rdILeUf9tKWb
+SB24AeFBd9UJ11+XiJdnAZ2KkKeAAjznradSL034guALL6KqhvPPdGkGTA32fQjI
+ub3vsCBtOeZIXGHK4NysN0bwDiWpOHmNEfM5a2jH8/pIs5SA03Iz2KH3b/tFgUTN
+yTso2QH9eM2cHBUCLyLUpoH7cyqzbh8dFU3hklLcrveoXW2KNXc2TYQbUSRw96Pp
+BFwkmr6Czx0hQP6HFJMnymYIlHEXxsDBCzM/xJtDFEjxDP/bl9jWyFTAyPisq3ZU
+ssQ2JFLVEyQ6GtfaoRzG/1SPO8LqPNQTC9GMOO7Gr9NdwKEPz1OI4nI7QvspS/Wd
+fA/5tndXaVrbpD22WQWPiNxdKBrNh6K296dmx0nWhpkoMN1LKXqBwCCkTgbKNP+F
+EygWvHCGgDVriBh6+tcRwV0fZ+YiwfvxtKsfOP6eI/2YQMw9BfusXUOx4/4KeFuY
+xeSNu6jmKOMefPbRNSYIBOTTQFI=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.mp.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.mp.uu.se/Shibboleth.sso/SLO/SOAP"/>
@@ -108,8 +107,8 @@ f91arR1JmuNzmHFNaLikuWCqw/8qr938FM2uP4W2OTcMm998DSp5z+SDOHphuhZF
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:SurName>IT Support</md:SurName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
@@ -119,8 +118,13 @@ f91arR1JmuNzmHFNaLikuWCqw/8qr938FM2uP4W2OTcMm998DSp5z+SDOHphuhZF
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:SurName>IT Support</md:SurName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>