Merge branch 'master' of git.swamid.se:swamid-metadata

5 files changed, 129 insertions, 120 deletions

diff --git a/swamid-2.0/epc.ub.uu.se-shibboleth.xml b/swamid-2.0/epc.ub.uu.se-shibboleth.xml
index 1f879452..95812380 100644
--- a/swamid-2.0/epc.ub.uu.se-shibboleth.xml
+++ b/swamid-2.0/epc.ub.uu.se-shibboleth.xml
@@ -13,34 +13,87 @@
   <md: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">
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://epc.ub.uu.se/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Nationella System, Uppsala Universitetsbibliotek</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Nationella System utvecklar och förvaltar DiVA och Alvin</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.uu.se/om-uu/dataskyddspolicy</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://www.katalog.uu.se/orginfo/?orgId=BI:45</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="en">National Systems, Uppsala University Library</mdui:DisplayName>
+        <mdui:Description xml:lang="en">National Systems develops and administrates DiVA and Alvin</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.katalog.uu.se/organisation/?orgId=BI:45</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.uu.se/en/about-uu/data-protection-policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>epc.ub.uu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=epc.ub.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAPfL+CYfRXf3MA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGVwYy51Yi51dS5zZTAeFw0xMTA0MjgwNjI1NDdaFw0yMTA0MjUwNjI1NDda
-MBcxFTATBgNVBAMTDGVwYy51Yi51dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMUEG0sMm1hQ/cU6c91BMeTgJq5G4HqmmNOMIwkBaLKgVd6X8nyB
-lMbd6KP+X3EzMT6W/uZRG++yYlYtLAbeA0juXrB7FvB2RN2gAMxFSveNz+MO28k/
-XXJ0qTEl0GDL7QCNGUojJ7HOoZ8716mBXKZw3gmAnyfRIWR4X/tnZ8tIKH+r6Jr1
-wWGHzw1uPzEIGeS3l3kfdYhYFncObWgns0Ptic6zmFXcVShfU64rzlurME5eHC5G
-iNKT8UmbZjLGmgzpGxQfS1zhRG9zs9ALM1d/lyF+UFLHDMejFqQYfPKkrS+JU/Bw
-tLFhkhhgQ3DRv1k93j9DhE1bq1XldbCnFQUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-ZXBjLnViLnV1LnNlMB0GA1UdDgQWBBQJPhqH0Pdo2v0HzpSCFTtL3SXY8zANBgkq
-hkiG9w0BAQUFAAOCAQEAYn86jjAEVTBoIFoAMl18OgX95pMBV2J9NUIQ4uZIjp3Z
-Up7z5yfrnVH9BCs0LAbCdQCLrh+87rslBxY3FA8ozuBPMO3mMzemGlT9PNeofGY7
-vTC+5XAybhuqhiHfw5ZYpMzL4fyVNz0bC5vTTCF11RUK/IXD0ZfISvheSUgdGoP/
-iv/0CV0q978vNja0BjZ6qESVEOr3xFKLUJvsGOPrtoW32eVoaJ7idR53Rc4LdZIx
-0o7hTAzFGzSIdxc0SoBbJ32KqeZSWgmN1d6AvBiID4USZsfQXwBdrUQZSEgGYRwf
-LUklHC4ncWzgxrI1yRQeU2gF0WMmCBF4UOX5e1J5JA==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUbGRcoF6p9UQudx6aA4t1PfWQ4iQwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAxMMZXBjLnViLnV1LnNlMB4XDTIyMTIxNDA5MTAwNFoXDTMy
+MTIxMTA5MTAwNFowFzEVMBMGA1UEAxMMZXBjLnViLnV1LnNlMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEA6nkaW6yDAYKVs0iwdmtClkMnXSpU0mfAsNQ3
+YMhrVUFkYWx55UNgJ6fFcVrDmcpq2OuUd3VZC+iLunro9yflPe5keaJTwBvnGZ/R
+8z+ecVcsLxES/IxbMnHW5lwXVxq2mFT47tHugj47SAjILReyosLUwjvB1sEO1hTZ
+TCjTxWSzs8w1TLLXugyqlcpvcgMbZ4Mc1rciNQUAZn3N6iBjYSH7Hukq9MT6kCRu
+Qq5GpyTollL/rvM3Fmy5ol5r3IZa4ood0tDlnpHkbGmxHQQVO5k6sKejTfiB3l0i
+uEoD90avKjCe4cgJq3b1u2oL6mwysUIcv7hbHNA8TKTV9WNrfepIp9RXHPbAHXEf
+5m8FcIpo9uRWX5taSg6ezjiNg5PJNE+R9MDXMVR6DlnXU8POGjSRic8ZAbPY7W6i
+k243Z+OoXdQQQ+SNwV1izDLVysEhoVIHy3ELgGxt4btgcy1uVP5vx/sn7XbLYvt+
+gygHTgrWyyLZjIVz9N75j21H9mxdioF7QcMQHkFI7aee70gZYgB586b58WMvC5CC
+esPWxltnRM1wF+VFTVsoC+tBAW7pevJppZer4jWgGBmCRo2S+aFi0xJ1wTsA3sBf
+I2Axzzt2BAwkUM8xd4WaSStEMsCPkEkfi1VYZ7IVOVZlsuz/c5P4PFB4ldyU3gOa
+qrMdXN0CAwEAAaNbMFkwOAYDVR0RBDEwL4IMZXBjLnViLnV1LnNlhh9odHRwczov
+L2VwYy51Yi51dS5zZS9zaGliYm9sZXRoMB0GA1UdDgQWBBRvHRVntajpY6PaBGZv
+G59saKxLJjANBgkqhkiG9w0BAQsFAAOCAgEAUjkYJjO81lpujhzEQUBsWZ1Z9rr1
+kFsdxz5h9YO/H2y8Mj7SfWQ/sB4oL6s/nWxa8/r3KjKJfE8r8yiciQaHOsv9P1SP
+KbQlYuKd9iLIhTOMu5nhGVpPHvZlxb1x0SrBkpu4RUVFlgETEwJdOCFu2XWvkdho
+bvxNYW8nWImBoNHsfb6u6rqg4RrqV73oaVvQ1VR5STXwgDiM6Q+/TgL8sQitE7hR
+j7Hp4CmAYhfGyvJPmpIjbU00ATwX7nDgASFzBGg85tdgUt7m3axevy2tMz6WqSIH
+ZSJd6TPnH+ZalG5vxeaJRFLDVexrb0aXi+0apB7yUJvyoo7y19sJJ/oixxHh298A
+15EgX6dCRJ2+pfnSyI9ms3v+71YL0bl0rFc13I8szem0BvCMUXos+PIVbwsSjWT2
+qkjfTyqKuwE/hrLrJRDne0MycLTLBukEHAswMJN+8c7np2RJPv8V/+SsELwsfKGq
+HJpoyAT0yJfs429adKCs/l3k0RCg/49iX/O1/xGPDkzJ0FVPF29Zuz856rxYimz8
+jBTRrVhxJJPMvSG3iPaRO7xkwY4KA3G2xR9jGexIM6li9acvFHNJH12hBFwxJn7v
+esB3ZCQnFcgz3ykIsEZYp5e6KwJpcNQYt/pegrX7LBgoupElyfAeSQBwrctKkkXI
+vpZlpzewjRBvARE=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUNn/DLwBgSPalsSAb/P9mE4tD4FMwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAxMMZXBjLnViLnV1LnNlMB4XDTIyMTIxNDA5MTI0N1oXDTMy
+MTIxMTA5MTI0N1owFzEVMBMGA1UEAxMMZXBjLnViLnV1LnNlMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAptcNbF5Et/M9hN771H8IKszSo5aXxvdoGeX8
+JOUxFTUqXADBs+N6jkCpdKebTR+xmonxPTIGF9baqnGTRQy61efuYqL7EItfIDK1
+cdndaTFfup6icW+uh7vZd+jE7yPabb0dvxNHT24uuhtkXry0Z23smig9/iHAGZJx
+lT5gMJ0zHI9e6uvzNWss9MzSOzyAQbpTEiqqB5VOFjWqzNvQmEyxXMGVR/O5qr3u
+zieX+7MXyTB+Txi2IBEqe49kxaQ6bM+S2Gy5dtmYojXCn6bWL0kmsBJnbOc52g04
+KPZrn15xN7aEZA8cqL3grqzGjliyVn2Ydl/QHngj/sQGU5jo2TONjmYpBRbraPSl
+dLbORVl8wirsqm9d+2qWbDp/ol5CI8brL6rOFf/yHeMMgm+MlCOFUbkpAGl9ATcz
+ig5AOWkY20Uc0AXiBoWZQI6dF9N1brwpX9AHVMDdK02ds4rhIotSk+FDOMmyOa05
+E7lETQ+/lWoUpfdofEipA7hzwLR0JWmvH3jGIpZ1kcJehzzuRMOfqUc3fm09OYNG
+hZD7EqC/rp+C3bvvJwvT9jAz7/oD0bIKi9X4RdOQP7xFb/DYppF5MBavEwpyAdOA
+RMHtNj1KqOg4XaqQjyyfEewaTcwDYllZIbj5tMy4f7ZLFrVP/pwuv1muvuRmByf4
+Cg4ZHRcCAwEAAaNbMFkwOAYDVR0RBDEwL4IMZXBjLnViLnV1LnNlhh9odHRwczov
+L2VwYy51Yi51dS5zZS9zaGliYm9sZXRoMB0GA1UdDgQWBBQ1oQ9p9uYBcEvTchdi
+PHawcJAsZTANBgkqhkiG9w0BAQsFAAOCAgEAU9Bvjb5ylL3LzmLkG2IGLGY1etjI
+kJKXz7f0zMRbRI8XTtUU+wL2X1bQ21PQ7KkMhS4aQHoiDpk2FWXhPmwfZpWzcjNb
++WTGk3pxRJC7fJ4z6hzxFpUO0LJRQ7SXFhQ+cRgAwtrf+nRT494POWPRW89zfgAj
+mKp4Mq8EytHr8aVJKcnWqixie3nhP17qr6jtPvivpGUzngIJc2NO2kzK4WLwofeg
+suzKjblmzeWM1Hq13kRGQTpbtuCfIvYE1riGicwJGgaPOqfsNGVH1h86jdyesqy8
+tBsD5qo+MS/q5G/Ic9EQ1fREccY+rynH7ZKSHHdsvTf/9dsH+j24nhQhfkpZy7NY
+HCL2HXwEcnXbv68o0yphuZhBt7nNn+OZ4v2NQO7HMPCKX4aEGu8TCfIySAIZAwVM
+uH1P7+oHIQItQkrQKhUHq022RAtF6qi8s5otrBMWwF1dKhU6ml4lLsXX4RsYSEWc
+j4MZnL37GsBVPBDJVASIPrwhUiRz3bFuAn91WaFyxDYnTqU7n7H2dfEjS2/P9DJU
+23fomi0+BbNmHEt41wHZId5XurjK33DNphv30exOAYsHRuMq7ZsioGP9eoCcbCCu
+Yt/1+WyLuNV9Bl81sT8r9gxfnwVEi8Mua7+p9FbXCVnKgZuTxbQrlu0yRvUrK81Q
+cZJunLsAeGOJaMQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
         <ds:KeyName>epc.ub.uu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=epc.ub.uu.se</ds:X509SubjectName>
@@ -59,8 +112,7 @@ Up7z5yfrnVH9BCs0LAbCdQCLrh+87rslBxY3FA8ozuBPMO3mMzemGlT9PNeofGY7
 vTC+5XAybhuqhiHfw5ZYpMzL4fyVNz0bC5vTTCF11RUK/IXD0ZfISvheSUgdGoP/
 iv/0CV0q978vNja0BjZ6qESVEOr3xFKLUJvsGOPrtoW32eVoaJ7idR53Rc4LdZIx
 0o7hTAzFGzSIdxc0SoBbJ32KqeZSWgmN1d6AvBiID4USZsfQXwBdrUQZSEgGYRwf
-LUklHC4ncWzgxrI1yRQeU2gF0WMmCBF4UOX5e1J5JA==
-</ds:X509Certificate>
+LUklHC4ncWzgxrI1yRQeU2gF0WMmCBF4UOX5e1J5JA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -80,4 +132,32 @@ LUklHC4ncWzgxrI1yRQeU2gF0WMmCBF4UOX5e1J5JA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epc.ub.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://epc.ub.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Uppsala Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.uu.se/en/?languageId=1</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Palle</md:GivenName>
+    <md:SurName>Raabjerg</md:SurName>
+    <md:EmailAddress>mailto:palle.raabjerg@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Wadskog</md:SurName>
+    <md:EmailAddress>mailto:daniel.wadskog@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Palle</md:GivenName>
+    <md:SurName>Raabjerg</md:SurName>
+    <md:EmailAddress>mailto:palle.raabjerg@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Palle</md:GivenName>
+    <md:SurName>Raabjerg</md:SurName>
+    <md:EmailAddress>mailto:palle.raabjerg@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/fs.nrm.se-adfs-services-trust.xml b/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
index caead5c0..54310184 100644
--- a/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
@@ -21,7 +21,7 @@
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Naturhistoriska riksmuseet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Swedish Museum of Natural History</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitstjänst för anställda vid Naturhistoriska riksmuseet</mdui:Description>
+        <mdui:Description xml:lang="sv">Identitetstjänst för anställda vid Naturhistoriska riksmuseet</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for employees at Swedish Museum of Natural History</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.nrm.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.nrm.se/en/16.html</mdui:InformationURL>
@@ -76,4 +76,10 @@
     <md:SurName>System administration</md:SurName>
     <md:EmailAddress>mailto:sysadmin@nrm.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>Naturhistoriska riksmuseet</md:Company>
+    <md:GivenName>Sysadmin</md:GivenName>
+    <md:SurName>System administration</md:SurName>
+    <md:EmailAddress>mailto:sysadmin@nrm.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/kau-se.zoom.us.xml b/swamid-2.0/kau-se.zoom.us.xml
index 0da46ec8..73e96700 100644
--- a/swamid-2.0/kau-se.zoom.us.xml
+++ b/swamid-2.0/kau-se.zoom.us.xml
@@ -97,80 +97,6 @@ xFEIAakZ2fyywt4v69l48K9/2kWs8PBshSPhTExTT1Da3oEr/EkAoiPWnOrUZlqWd2otiND6r7+q
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIGtjCCBZ6gAwIBAgIQCf48SVwTzO89aW3TTSBUPTANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBEaWdpQ2VydCBUTFMgUlNBIFNI
-QTI1NiAyMDIwIENBMTAeFw0yMjAxMDUwMDAwMDBaFw0yMzAxMDQyMzU5NTlaMHExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTYW4gSm9zZTEoMCYGA1UEChMfWm9v
-bSBWaWRlbyBDb21tdW5pY2F0aW9ucywgSW5jLjEQMA4GA1UEAxMHem9vbS51czCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMojahRTgictiNEB+fQXIFnxZEqgygvhCJn0Hov4IVM6e7a+
-dMJo1VQsgExMB1PSanNvbs5CSmnH4rOSdA3QZrLqV388aXXDYTnMaWj+sgFPlVWUTRGU7cg/v3gX
-NONYAjnspYkKPSevw9hogchfNKIb22oFhKqcEW6Om8l6uWoBuA5iOV6xD0pK5kz6tCQZT+/XgAkc
-RYflPyHSJcne50ETOltttnrronSf9mRDV3GuO6jinR3vrjoPBxJRHvCIzbwtrFFtxbJtZxvDDwoj
-W+1N0zxIKuqDDbNz2xV5ljc+O50MrrpNNAhrK43MhJFCnDnpVa7mD/hnhvjXDxakUJMCAwEAAaOC
-A2owggNmMB8GA1UdIwQYMBaAFLdrouqoqoSMeeq02g+YssWVdrn0MB0GA1UdDgQWBBTOCRYgvopA
-dEFLhLr0FUufc47Z7zASBgNVHREECzAJggd6b29tLnVzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
-FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NybDMu
-ZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDBAoD6gPIY6aHR0
-cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDA+
-BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNv
-bS9DUFMwfwYIKwYBBQUHAQEEczBxMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j
-b20wSQYIKwYBBQUHMAKGPWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRMU1JT
-QVNIQTI1NjIwMjBDQTEtMS5jcnQwDAYDVR0TAQH/BAIwADCCAX4GCisGAQQB1nkCBAIEggFuBIIB
-agFoAHYA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4AAAF+KAVBygAABAMARzBFAiEA
-rtfeQ99OhmoaWWW6C+cEOoOwXwrZMDaJXhsoGdOy1jgCICAfL+l2WkJ9B1lKb6D93rWANj2voiga
-BEy6CCj+fI7/AHUANc8ZG7+xbFe/D61MbULLu7YnICZR6j/hKu+oA8M71kwAAAF+KAVCFQAABAMA
-RjBEAiBOxbNBm8bHEcz+AJiSLW6RP2pZUzxJRmUjwaJlXN44sQIgJDKdCUMn4GFo80idD135JaqJ
-LorDPfSBDvL73t+Yu6cAdwCzc3cH4YRQ+GOG1gWp3BEJSnktsWcMC4fc8AMOeTalmgAAAX4oBUI0
-AAAEAwBIMEYCIQDbkQO7Uq7yq+s2zHu++WzuhtKVEDkeVzfStZVWDBHgBgIhAMcTpkfrd/b9RI8/
-k48BrNXLnVJX1o4Qw5tTuPvAvmk2MA0GCSqGSIb3DQEBCwUAA4IBAQAog8XzmWnid9A/wtsn6abK
-yPNFFss7YhPgWY0PnBpbnvxQVeP5oCDU/3YecyaXbm0CiY4dEH22EV5nNVgSVLPcZud75W3VVYlV
-DhZtmTIEGF6FnYv1Q1tek0Okgf03XdKWwODqYSY+3FwaBa6cON6Vw7bhVRVl3KuMtuH5vSJP2rAE
-lYhdyaErrG3nwskUpqIZ9wwmjXRQW6705G5yk3Y6vRqoRefSbO7QqTxABvwGh23GDhyiW+rkibU2
-VKj5OfOwlyK5N91EbZUfLsO2U9hg//ZdOJMmxvpO6UgZBmd7TjOdYM8Nkr9CBB1Jm1+CgfqrQgeL
-mYIp+qov+EzUDeCQ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIGtjCCBZ6gAwIBAgIQCf48SVwTzO89aW3TTSBUPTANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBEaWdpQ2VydCBUTFMgUlNBIFNI
-QTI1NiAyMDIwIENBMTAeFw0yMjAxMDUwMDAwMDBaFw0yMzAxMDQyMzU5NTlaMHExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTYW4gSm9zZTEoMCYGA1UEChMfWm9v
-bSBWaWRlbyBDb21tdW5pY2F0aW9ucywgSW5jLjEQMA4GA1UEAxMHem9vbS51czCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMojahRTgictiNEB+fQXIFnxZEqgygvhCJn0Hov4IVM6e7a+
-dMJo1VQsgExMB1PSanNvbs5CSmnH4rOSdA3QZrLqV388aXXDYTnMaWj+sgFPlVWUTRGU7cg/v3gX
-NONYAjnspYkKPSevw9hogchfNKIb22oFhKqcEW6Om8l6uWoBuA5iOV6xD0pK5kz6tCQZT+/XgAkc
-RYflPyHSJcne50ETOltttnrronSf9mRDV3GuO6jinR3vrjoPBxJRHvCIzbwtrFFtxbJtZxvDDwoj
-W+1N0zxIKuqDDbNz2xV5ljc+O50MrrpNNAhrK43MhJFCnDnpVa7mD/hnhvjXDxakUJMCAwEAAaOC
-A2owggNmMB8GA1UdIwQYMBaAFLdrouqoqoSMeeq02g+YssWVdrn0MB0GA1UdDgQWBBTOCRYgvopA
-dEFLhLr0FUufc47Z7zASBgNVHREECzAJggd6b29tLnVzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
-FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NybDMu
-ZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDBAoD6gPIY6aHR0
-cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDA+
-BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNv
-bS9DUFMwfwYIKwYBBQUHAQEEczBxMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j
-b20wSQYIKwYBBQUHMAKGPWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRMU1JT
-QVNIQTI1NjIwMjBDQTEtMS5jcnQwDAYDVR0TAQH/BAIwADCCAX4GCisGAQQB1nkCBAIEggFuBIIB
-agFoAHYA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4AAAF+KAVBygAABAMARzBFAiEA
-rtfeQ99OhmoaWWW6C+cEOoOwXwrZMDaJXhsoGdOy1jgCICAfL+l2WkJ9B1lKb6D93rWANj2voiga
-BEy6CCj+fI7/AHUANc8ZG7+xbFe/D61MbULLu7YnICZR6j/hKu+oA8M71kwAAAF+KAVCFQAABAMA
-RjBEAiBOxbNBm8bHEcz+AJiSLW6RP2pZUzxJRmUjwaJlXN44sQIgJDKdCUMn4GFo80idD135JaqJ
-LorDPfSBDvL73t+Yu6cAdwCzc3cH4YRQ+GOG1gWp3BEJSnktsWcMC4fc8AMOeTalmgAAAX4oBUI0
-AAAEAwBIMEYCIQDbkQO7Uq7yq+s2zHu++WzuhtKVEDkeVzfStZVWDBHgBgIhAMcTpkfrd/b9RI8/
-k48BrNXLnVJX1o4Qw5tTuPvAvmk2MA0GCSqGSIb3DQEBCwUAA4IBAQAog8XzmWnid9A/wtsn6abK
-yPNFFss7YhPgWY0PnBpbnvxQVeP5oCDU/3YecyaXbm0CiY4dEH22EV5nNVgSVLPcZud75W3VVYlV
-DhZtmTIEGF6FnYv1Q1tek0Okgf03XdKWwODqYSY+3FwaBa6cON6Vw7bhVRVl3KuMtuH5vSJP2rAE
-lYhdyaErrG3nwskUpqIZ9wwmjXRQW6705G5yk3Y6vRqoRefSbO7QqTxABvwGh23GDhyiW+rkibU2
-VKj5OfOwlyK5N91EbZUfLsO2U9hg//ZdOJMmxvpO6UgZBmd7TjOdYM8Nkr9CBB1Jm1+CgfqrQgeL
-mYIp+qov+EzUDeCQ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
diff --git a/swamid-edugain/adfs.sp.se-adfs-services-trust.xml b/swamid-edugain/adfs.sp.se-adfs-services-trust.xml
index d5533005..000f71da 100644
--- a/swamid-edugain/adfs.sp.se-adfs-services-trust.xml
+++ b/swamid-edugain/adfs.sp.se-adfs-services-trust.xml
@@ -11,6 +11,10 @@
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-testing/login.tst.ki.se-idp-shibboleth.xml b/swamid-testing/login.tst.ki.se-idp-shibboleth.xml
index bae30484..e962e7ea 100644
--- a/swamid-testing/login.tst.ki.se-idp-shibboleth.xml
+++ b/swamid-testing/login.tst.ki.se-idp-shibboleth.xml
@@ -13,6 +13,11 @@
       <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -55,8 +60,7 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDRa
 Fw0zNTExMDQxNDI4MDRaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsH/cWaST4Ua0YvM2A1IpfWnWS4
@@ -72,16 +76,14 @@ aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAErKe5nlDdbds4rre39uKZZXvPuF
 a2qbjZ0/Si4K5V3VHWKw9n1hFxzpBVblRBQKpe3C2/AHtXo42I581Aj4RiMMvdtE
 s6I6mUGkWt+12okiFPkPYkZiKNS44MRH/MpFBRZyq2+16AvarO5TxU8czzuHIaiw
 WWUe6DVFlidT5MLwtVawka9hmB11ck88jfu1I9MuBA3kshE4P3nAZFUSxWBEJVhw
-n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=
-                        </ds:X509Certificate>
+n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTE1MTEwNDE0MjgwMloX
 DTM1MTEwNDE0MjgwMlowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqigba9iKeQgpVTxXDJdR8XY3unuY
@@ -97,16 +99,14 @@ uMqAIcKhkaVslYJGRRxnPlEKKvXZeh3QAkqj0RW7o/VFbltsfbOKpmg/h1hp110Q
 EdFRvAfpycCvKp7BnJa4mJ9RD0/PwuyeZ6IMg4hGt82gsgRbWJsCb6lYwj8i0ZIu
 N8jxHT9GPA1BezK2+iC7x/UZXuPzI+/AfRMchBzStgau9H+MsP1mXi1SIm+iqaRA
 fyNTnKTNyov83sU5fX101h10Qp9rW7Im/Ol1zZefMdOc4rsSYi8zSlaPWuIPz9nu
-MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==
-                        </ds:X509Certificate>
+MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDNa
 Fw0zNTExMDQxNDI4MDNaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJ3zTxhdfaqyeZScdvMEST9OtZ8
@@ -122,8 +122,7 @@ wRAODcgpQGaCPdb+MtyT2a7m/Z3g2bzQvqGgC7er/fv8pXMhpsGuPrgwvQNWXWUA
 l+0EyhfpVZn/KvehtJV911wrqbLh8XVCTL1f+yegjZb927m3i1ctHIRRq5i2xMoC
 xDQRJ2cT1zKmKy/1EaZpJXNvWjt7Jpis7MAa5Upl6bjnYWLfCWwTxnSZ5hVqTU9G
 U5qAm8DQOPhc4+r9NNyiwB159QMR9AcUZNb6YHjqV3vcRQqTL6+UlryQimkERyZO
-jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=
-                        </ds:X509Certificate>
+jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -142,8 +141,7 @@ jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDRa
 Fw0zNTExMDQxNDI4MDRaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsH/cWaST4Ua0YvM2A1IpfWnWS4
@@ -159,16 +157,14 @@ aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAErKe5nlDdbds4rre39uKZZXvPuF
 a2qbjZ0/Si4K5V3VHWKw9n1hFxzpBVblRBQKpe3C2/AHtXo42I581Aj4RiMMvdtE
 s6I6mUGkWt+12okiFPkPYkZiKNS44MRH/MpFBRZyq2+16AvarO5TxU8czzuHIaiw
 WWUe6DVFlidT5MLwtVawka9hmB11ck88jfu1I9MuBA3kshE4P3nAZFUSxWBEJVhw
-n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=
-                        </ds:X509Certificate>
+n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTE1MTEwNDE0MjgwMloX
 DTM1MTEwNDE0MjgwMlowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqigba9iKeQgpVTxXDJdR8XY3unuY
@@ -184,16 +180,14 @@ uMqAIcKhkaVslYJGRRxnPlEKKvXZeh3QAkqj0RW7o/VFbltsfbOKpmg/h1hp110Q
 EdFRvAfpycCvKp7BnJa4mJ9RD0/PwuyeZ6IMg4hGt82gsgRbWJsCb6lYwj8i0ZIu
 N8jxHT9GPA1BezK2+iC7x/UZXuPzI+/AfRMchBzStgau9H+MsP1mXi1SIm+iqaRA
 fyNTnKTNyov83sU5fX101h10Qp9rW7Im/Ol1zZefMdOc4rsSYi8zSlaPWuIPz9nu
-MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==
-                        </ds:X509Certificate>
+MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDNa
 Fw0zNTExMDQxNDI4MDNaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJ3zTxhdfaqyeZScdvMEST9OtZ8
@@ -209,8 +203,7 @@ wRAODcgpQGaCPdb+MtyT2a7m/Z3g2bzQvqGgC7er/fv8pXMhpsGuPrgwvQNWXWUA
 l+0EyhfpVZn/KvehtJV911wrqbLh8XVCTL1f+yegjZb927m3i1ctHIRRq5i2xMoC
 xDQRJ2cT1zKmKy/1EaZpJXNvWjt7Jpis7MAa5Upl6bjnYWLfCWwTxnSZ5hVqTU9G
 U5qAm8DQOPhc4+r9NNyiwB159QMR9AcUZNb6YHjqV3vcRQqTL6+UlryQimkERyZO
-jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=
-                        </ds:X509Certificate>
+jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>