Merge branch 'master' of git.swamid.se:swamid-metadatamd-2023-12-05-v01

6 files changed, 107 insertions, 265 deletions

diff --git a/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml b/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml
index a1870c65..372bfbe5 100644
--- a/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml
+++ b/metadata/swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml
@@ -3,9 +3,16 @@
   <md:Extensions>
     <mdattr:EntityAttributes>
       <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/loa/1.0/uncertified-loa3</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
       </samla:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://id.swedenconnect.se/contract/Sunet/BankID-idp</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/sprop/1.0/mobile-auth</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/ec/1.0/loa3-name</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/general-ec/1.0/secure-authenticator-binding</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/loa3-pnr</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-11-30T14:45:07Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
diff --git a/metadata/swamid-testing/idp.test.antagning.se-aws-idp.xml b/metadata/swamid-2.0/idp.test.antagning.se-aws-idp.xml
index 7ef1bd45..b97ff133 100644
--- a/metadata/swamid-testing/idp.test.antagning.se-aws-idp.xml
+++ b/metadata/swamid-2.0/idp.test.antagning.se-aws-idp.xml
@@ -50,22 +50,6 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.test.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.antagning.se/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 regexp="false">antagning.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEDCCAvigAwIBAgIJAINH1nM/OMFgMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTAeFw0yMjA2MDgwOTQ5MzRaFw0zMjA2MDUwOTQ5MzRaMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMb11JbuqNZCVhpKMQf8LlGKEtiJuAU9+RNzkAvuQuwTb2XCgGeRvYcVhQM2NwOU2ogkf6FepUN+1nqyzMKWo5v81QR58f1NGTwLNMxo0C3GjzpvCHy1fYdpLP7PfR/QwDA7T7CdSe1L/91ru2OIHJRSyMrwEUvLvr5bloDTTq+ov1ZcUJ/4rv+vxefRviNGcEToRXBigY56SVK0ybjiMYsbw0O6i7IQp2D3TaQICe4cGsPGE18hBTNc2oFDIrwB6iIiT4uvamH/g6rc62Kcu8c/6lBqoda+nTLIDZw/l+hE2V/YHiq/OPRQOUh1HvSl1eSp49EVaG6SRnOTugcLF29Fg14NPjDVTGZHcPPtSdjNSV6aRrIvDyBQxcx7zICv1KTFv+uvVdJotW9Wyl7EQvObPI6yi1E1BGOeANQG7QJR7zqljfPGKs2og2729pXKTXyo+4+oldErh1vNPGPT4fxCyLUd9ZRGwingrAcRY0OB6vMCILyhaoKDCYJ5ovaiza69hQj1quhTT2GiuQL3jEmeQhHRuFjy4QUF8np/Q6f/DIHqwi+ZE/DLNCb40bpnh0NdgJkDm+PAU0yE+R+EQA4l7pMYtYqDg3KZYYA6zLy4+zvaa6bxwD3iK0WNEfUdqeXVzeoljP/2VeGICR4Y5z+/FpMm/tRJyCXyM+22+sNzAgMBAAGjTTBLMB0GA1UdDgQWBBS10u7lvxpbq8QoN8qeIZFcGWWPpTAfBgNVHSMEGDAWgBS10u7lvxpbq8QoN8qeIZFcGWWPpTAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQAMVuQoX1mJFKGZNRJhS+ssQxd4N4m3dF1GE+JBx4Rs+n6C51YjyfCiI33bsqRAP3AP6Ntu0MctW0l3NDbcIHSBXFayxGPLrv5AnLNAUzJkthVF3m2svam1XxS1xiVEElkkzZhoP4ZU/vtsOucNzq8R0zVVfv7imc191GFKbPuxjRdckUHJlMQW+n6PCFCzLLIt/3qLn1kHTbfQ9fi50mGau7kBdgxmvl9NCscdHJEK4Uncu1IZe87suIYzaXavBLxr6cnm11vRPMnSsX6T6nP/Hu2eMNt0lccjIGlknCWIvoWcyLviaaKy/gEQH5V5uDHt6Oj7HznfnWY1Nvm0coz26Ne0uSTnV10o7rX0brn2nqd+mYAiFAevoM0GguIlX8YkiWRYOE1rSv2TLZIainjZnMQdniv0dZFtU+VHj6Fo+MjxigyWdgngiN95tl2rXxW/bPGyiQaOCahRcSixP/OMC53PpdJyYeyFxlyLTBB6xyZK5MSHqwOBPB1+5Oj+G3XgOt0Vrp+AlA5XieuJNrGpL98HbIrSMJpNLjGzsCS9m3Uhqw0r5/c04y4AB4gD2kCUNjZctXCbm0d4L5dTAEpYGCW6igYlGcaSzwPHHMGEXQWnt6JpepNLpqA5ICnkt7j+ZGqYEcR+XOqFV47+79TuxM1V8Y3jJRxbORpw1VKQ1w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.antagning.se: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="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
diff --git a/metadata/swamid-2.0/idpproxy.dev.eduid.se-sp.xml b/metadata/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
deleted file mode 100644
index 085a74b1..00000000
--- a/metadata/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idpproxy.dev.eduid.se/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-03-20T21:04:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <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:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idpproxy.dev.eduid.se/Saml2SP/disco" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Digitala nationella prov</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Digitala nationella prov</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Digitala nationella prov</mdui:Description>
-        <mdui:Description xml:lang="en">Digitala nationella prov</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.skolverket.se/om-oss/var-verksamhet/skolverkets-prioriterade-omraden/digitalisering/digitala-nationella-prov/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.skolverket.se/om-oss/var-verksamhet/skolverkets-prioriterade-omraden/digitalisering/digitala-nationella-prov/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="29" width="159">https://fidustest.skolverket.se/assets/skolverket-logotype.svg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="29" width="159">https://fidustest.skolverket.se/assets/skolverket-logotype.svg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://eduid.se/faq.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://eduid.se/faq.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUKEpu1hDfOfFWEi8nMq18Vma5tlIwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjAwMzE4MTUwNDA1WhcN
-MzAwMzE2MTUwNDA1WjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMM5n/Mk2/c1VK9n40FIH1NipHPRIbcX
-ESDdE3DaHvZMrMiPa058sVN+uFZMekM4ItMS36WkLMXurAgvMNG99LEYzQcLt34t
-Q1D7gghiRNVdzHT3zNn8mTvHDPzaOYs3/at+9oJrIhqr05lSO46IpiiVCv8o7rKL
-CNQLgSlBpy6YegPYWjkTLdVbNKw/2LPZ8kY909+ONcsfHM+Y9eQPsLitiJlYDUNz
-VuhU0swpXXoJeXGrD5sBx56bZymJgGT9g9R3+lg2Jnw/eFOJxdBa3fPEaYwVpZIQ
-qFmKwN4qi9tp3MpZMG2DrStHRgTFhQVB/DJZKQFSovxdS9SNYVciO0cf+naEmYlS
-r+BxYLUTzPkscWwKQU7xOu0koZ56eB0I4IwGCZMhCbpNvr5yaMCF90MG54lnv5xC
-NL/mi06ZyGhbgv52HEMH4tWe41jCTsQDYeAMuAHtMkIM2sasGoMxX+AKGVKUOdya
-kZHewf4hvLtskfplHNJXDIHgc6F3aXHl8jDzl3bJDdaSH+p0hM9joewRyB01BQTA
-hPx8nbfTqQjOBx2gyFqNbe2MjAR/alJDq9jTmWOY5xKaxiRBTXiaG+Npct058ihY
-fXnyBUCzVy9JPmYCf9AuihPWChg8DhHLbopMsaHH1B1qBys5j6qSwdbA9bbcWxUZ
-JiBeF4riyjZRAgMBAAGjUzBRMB0GA1UdDgQWBBRcbf5bjvGL+PGn+hIAMt9qI3m2
-vTAfBgNVHSMEGDAWgBRcbf5bjvGL+PGn+hIAMt9qI3m2vTAPBgNVHRMBAf8EBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQCPoWDYv+l8CG3Aux+i9kWoDbSLphX/fVQK
-nMlziHADmYJATv+fH9REyUsg9ow9MeP0tuA4fWckT5kU5PF9/uuCpMICsoSeImPA
-LYKv1JWPSPp5eBiBoMkX3b9y84NVGb2ISsN+6iPgn0VdVPjbbzSASsyyp+0LHd/K
-gSdBN9pCGUaCvroqcaLeGrl2p/Qc8KUbDad3qhXs7dX6jQj4d3E/LcB2mJZR2SxL
-UQKTRyFv9n8mvAi8r83qFfVrdJp+dPiksTe9S44j/Pz3bnbVpgk6WB9GqedlW5jZ
-giOp8x4m0s9GehRmeSfxQfFskhnoVoQ4LWWi1rfOQRHNwivx9b1DNvEvL5OXx5xf
-wP1QE4vpUIO8tijMUim97teHNRpx2tXyE+2Do96FoiMaZt2QdYBtyUhc+DNULE5P
-ADkjKjM+xlV5/LQVnuWI9UZ0jgyADplBP/tPoZAl5TVgmpiqHOuQCp8L9FyKch1Z
-aFuAEpFqkvRJwQT9fGUZYwzhbpYRe+pWqvB+gxCAI/0Wj/dw1nHl1bv+uCLIask5
-78BB+0w4ReixPa7kqRImfA2hyywig9o05Ujr22mq+R8eyzWXpXeJz1KuuqmEK9UP
-rZkPdbEo7RWd1WEorEEtb9EOKsnhiuj5ZwQmFMt3NX76nWdFDwhNAi3X0r7M/CnE
-8R/2hYQAIg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUKEpu1hDfOfFWEi8nMq18Vma5tlIwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjAwMzE4MTUwNDA1WhcN
-MzAwMzE2MTUwNDA1WjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMM5n/Mk2/c1VK9n40FIH1NipHPRIbcX
-ESDdE3DaHvZMrMiPa058sVN+uFZMekM4ItMS36WkLMXurAgvMNG99LEYzQcLt34t
-Q1D7gghiRNVdzHT3zNn8mTvHDPzaOYs3/at+9oJrIhqr05lSO46IpiiVCv8o7rKL
-CNQLgSlBpy6YegPYWjkTLdVbNKw/2LPZ8kY909+ONcsfHM+Y9eQPsLitiJlYDUNz
-VuhU0swpXXoJeXGrD5sBx56bZymJgGT9g9R3+lg2Jnw/eFOJxdBa3fPEaYwVpZIQ
-qFmKwN4qi9tp3MpZMG2DrStHRgTFhQVB/DJZKQFSovxdS9SNYVciO0cf+naEmYlS
-r+BxYLUTzPkscWwKQU7xOu0koZ56eB0I4IwGCZMhCbpNvr5yaMCF90MG54lnv5xC
-NL/mi06ZyGhbgv52HEMH4tWe41jCTsQDYeAMuAHtMkIM2sasGoMxX+AKGVKUOdya
-kZHewf4hvLtskfplHNJXDIHgc6F3aXHl8jDzl3bJDdaSH+p0hM9joewRyB01BQTA
-hPx8nbfTqQjOBx2gyFqNbe2MjAR/alJDq9jTmWOY5xKaxiRBTXiaG+Npct058ihY
-fXnyBUCzVy9JPmYCf9AuihPWChg8DhHLbopMsaHH1B1qBys5j6qSwdbA9bbcWxUZ
-JiBeF4riyjZRAgMBAAGjUzBRMB0GA1UdDgQWBBRcbf5bjvGL+PGn+hIAMt9qI3m2
-vTAfBgNVHSMEGDAWgBRcbf5bjvGL+PGn+hIAMt9qI3m2vTAPBgNVHRMBAf8EBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQCPoWDYv+l8CG3Aux+i9kWoDbSLphX/fVQK
-nMlziHADmYJATv+fH9REyUsg9ow9MeP0tuA4fWckT5kU5PF9/uuCpMICsoSeImPA
-LYKv1JWPSPp5eBiBoMkX3b9y84NVGb2ISsN+6iPgn0VdVPjbbzSASsyyp+0LHd/K
-gSdBN9pCGUaCvroqcaLeGrl2p/Qc8KUbDad3qhXs7dX6jQj4d3E/LcB2mJZR2SxL
-UQKTRyFv9n8mvAi8r83qFfVrdJp+dPiksTe9S44j/Pz3bnbVpgk6WB9GqedlW5jZ
-giOp8x4m0s9GehRmeSfxQfFskhnoVoQ4LWWi1rfOQRHNwivx9b1DNvEvL5OXx5xf
-wP1QE4vpUIO8tijMUim97teHNRpx2tXyE+2Do96FoiMaZt2QdYBtyUhc+DNULE5P
-ADkjKjM+xlV5/LQVnuWI9UZ0jgyADplBP/tPoZAl5TVgmpiqHOuQCp8L9FyKch1Z
-aFuAEpFqkvRJwQT9fGUZYwzhbpYRe+pWqvB+gxCAI/0Wj/dw1nHl1bv+uCLIask5
-78BB+0w4ReixPa7kqRImfA2hyywig9o05Ujr22mq+R8eyzWXpXeJz1KuuqmEK9UP
-rZkPdbEo7RWd1WEorEEtb9EOKsnhiuj5ZwQmFMt3NX76nWdFDwhNAi3X0r7M/CnE
-8R/2hYQAIg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpproxy.dev.eduid.se/Saml2SP/acs/post" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Digitala nationella prov</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Statens Skolverk</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Statens Skolverk</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Skolverket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Skolverket</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.skolverket.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.skolverket.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Administrative</md:GivenName>
-    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:feedback@eduid.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>Sunet CERT</md:GivenName>
-    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/kb-se.zoom.us.xml b/metadata/swamid-2.0/kb-se.zoom.us.xml
index 9e5983c5..e88e6c0b 100644
--- a/metadata/swamid-2.0/kb-se.zoom.us.xml
+++ b/metadata/swamid-2.0/kb-se.zoom.us.xml
@@ -26,6 +26,80 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
+          <ds:X509Certificate>MIIG2TCCBcGgAwIBAgIQCclVIRdK/C35ZHiJ1nkyvzANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypEaWdpQ2VydCBHbG9iYWwgRzIg
+VExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjMxMjAxMDAwMDAwWhcNMjQxMjMxMjM1OTU5WjBx
+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIU2FuIEpvc2UxKDAm
+BgNVBAoTH1pvb20gVmlkZW8gQ29tbXVuaWNhdGlvbnMsIEluYy4xEDAOBgNVBAMTB3pvb20udXMw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7LrEtEBo3nruX9bS/bcx2w5gfVbAIdi/7
+cHEqbx8Nq68LR3glFRY4ImX5ZdZFDrKaNEMzHLo0qYGJhuvpaNnyPLkFFX0o3l1+6cvh7um4OlOY
+kZUobCoUpQvwgi9u1vXlbnKW8S2oAxeUKR6QYnJ9lFpCg7MvD6LgMQeVDsc6uRShGEumdm/6P+62
+LaK38Uk9MLt67c00ZqMG3plm/mw3Xqz8COg7I9b3e4kq4+QiHAlIE6lAK44UM3aJjARH2/9FE6r0
+Vm5cFndc0nTCPeB6qAVapcY9nwNmdV/1kUBh5nj9YDubFkVSzho58vfXbh9Rk6laozYFNZqoxZjR
+jQKBAgMBAAGjggODMIIDfzAfBgNVHSMEGDAWgBR0hYDAZsffN97PvSk3qgMdvu3NFzAdBgNVHQ4E
+FgQUChR+rkVSirenP0jfaWLSIMiLAMQwEgYDVR0RBAswCYIHem9vbS51czA+BgNVHSAENzA1MDMG
+BmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwDgYDVR0P
+AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBnwYDVR0fBIGXMIGUMEig
+RqBEhkJodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRHbG9iYWxHMlRMU1JTQVNIQTI1
+NjIwMjBDQTEtMS5jcmwwSKBGoESGQmh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEds
+b2JhbEcyVExTUlNBU0hBMjU2MjAyMENBMS0xLmNybDCBhwYIKwYBBQUHAQEEezB5MCQGCCsGAQUF
+BzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wUQYIKwYBBQUHMAKGRWh0dHA6Ly9jYWNlcnRz
+LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbEcyVExTUlNBU0hBMjU2MjAyMENBMS0xLmNydDAM
+BgNVHRMBAf8EAjAAMIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdwDuzdBk1dsazsVct520zROi
+ModGfLzs3sNRSFlGcR+1mwAAAYwnHVfRAAAEAwBIMEYCIQDRMfWIpMJjvSxMfBq5gjh4UVm9StSg
+rb0e5rsAKRQj8gIhAJ1nch/ry0R/5kxXrbCaOwbNlwdUCncqL+h+Qs9QuPGlAHUA2ra/az+1tiKf
+m8K7XGvocJFxbLtRhIU0vaQ9MEjX+6sAAAGMJx1XRwAABAMARjBEAiBoGV7gedwjhZvO16ZJVNm6
+4cM6fr97Yxdhyg0jWSfi5QIgXsgee3f0dNf7ULr+SPruuYPiqX4fFOJ9TqK2uxfmjR8AdgA/F0tP
+1yJHWJQdZRyEvg0S7ZA3fx+FauvBvyiF7PhkbgAAAYwnHVd8AAAEAwBHMEUCIQDxUfQaKOMhClwa
+OHoJ5Y1Frielt3dFfbrDBvmZItBGCgIgTPeCtxtZ49tU8ZMlRkEjRP5D7o528Lujt88gCuVfVqgw
+DQYJKoZIhvcNAQELBQADggEBAGAVq+3/vBXXw6QvDE7OlqtJziSW2pu5NY+LSitcNKsMJrjCkvNP
+CbCmmIGxwZcWDSVVLfbox37f5z66Tz3p4R8ejTpNi6Kf5G93Mx1X4eZbLTnijBzj22q1K2sn0KQe
+s8oCaCb/EUWTg074lGdDq9wj9opkduWaZu2n3tmk5h1JLy2wRmQ0/URw81kBQiG+mRVn4+XGX60D
+mr9WtMhpEJ1Z+M2sRDUqWwmw2E1p2BkwxMNXDLlHN6jHSfwzzaB64oXZp3/ItwDaT4mlxVVXtqCd
+MIUL9QGKjl/wJiK/G6u5yPtsRtn5UIeY6qrodhhGc7pHuTFAmvTnP13CaCRR5y8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIG2TCCBcGgAwIBAgIQCclVIRdK/C35ZHiJ1nkyvzANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypEaWdpQ2VydCBHbG9iYWwgRzIg
+VExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjMxMjAxMDAwMDAwWhcNMjQxMjMxMjM1OTU5WjBx
+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIU2FuIEpvc2UxKDAm
+BgNVBAoTH1pvb20gVmlkZW8gQ29tbXVuaWNhdGlvbnMsIEluYy4xEDAOBgNVBAMTB3pvb20udXMw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7LrEtEBo3nruX9bS/bcx2w5gfVbAIdi/7
+cHEqbx8Nq68LR3glFRY4ImX5ZdZFDrKaNEMzHLo0qYGJhuvpaNnyPLkFFX0o3l1+6cvh7um4OlOY
+kZUobCoUpQvwgi9u1vXlbnKW8S2oAxeUKR6QYnJ9lFpCg7MvD6LgMQeVDsc6uRShGEumdm/6P+62
+LaK38Uk9MLt67c00ZqMG3plm/mw3Xqz8COg7I9b3e4kq4+QiHAlIE6lAK44UM3aJjARH2/9FE6r0
+Vm5cFndc0nTCPeB6qAVapcY9nwNmdV/1kUBh5nj9YDubFkVSzho58vfXbh9Rk6laozYFNZqoxZjR
+jQKBAgMBAAGjggODMIIDfzAfBgNVHSMEGDAWgBR0hYDAZsffN97PvSk3qgMdvu3NFzAdBgNVHQ4E
+FgQUChR+rkVSirenP0jfaWLSIMiLAMQwEgYDVR0RBAswCYIHem9vbS51czA+BgNVHSAENzA1MDMG
+BmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwDgYDVR0P
+AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBnwYDVR0fBIGXMIGUMEig
+RqBEhkJodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRHbG9iYWxHMlRMU1JTQVNIQTI1
+NjIwMjBDQTEtMS5jcmwwSKBGoESGQmh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEds
+b2JhbEcyVExTUlNBU0hBMjU2MjAyMENBMS0xLmNybDCBhwYIKwYBBQUHAQEEezB5MCQGCCsGAQUF
+BzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wUQYIKwYBBQUHMAKGRWh0dHA6Ly9jYWNlcnRz
+LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbEcyVExTUlNBU0hBMjU2MjAyMENBMS0xLmNydDAM
+BgNVHRMBAf8EAjAAMIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdwDuzdBk1dsazsVct520zROi
+ModGfLzs3sNRSFlGcR+1mwAAAYwnHVfRAAAEAwBIMEYCIQDRMfWIpMJjvSxMfBq5gjh4UVm9StSg
+rb0e5rsAKRQj8gIhAJ1nch/ry0R/5kxXrbCaOwbNlwdUCncqL+h+Qs9QuPGlAHUA2ra/az+1tiKf
+m8K7XGvocJFxbLtRhIU0vaQ9MEjX+6sAAAGMJx1XRwAABAMARjBEAiBoGV7gedwjhZvO16ZJVNm6
+4cM6fr97Yxdhyg0jWSfi5QIgXsgee3f0dNf7ULr+SPruuYPiqX4fFOJ9TqK2uxfmjR8AdgA/F0tP
+1yJHWJQdZRyEvg0S7ZA3fx+FauvBvyiF7PhkbgAAAYwnHVd8AAAEAwBHMEUCIQDxUfQaKOMhClwa
+OHoJ5Y1Frielt3dFfbrDBvmZItBGCgIgTPeCtxtZ49tU8ZMlRkEjRP5D7o528Lujt88gCuVfVqgw
+DQYJKoZIhvcNAQELBQADggEBAGAVq+3/vBXXw6QvDE7OlqtJziSW2pu5NY+LSitcNKsMJrjCkvNP
+CbCmmIGxwZcWDSVVLfbox37f5z66Tz3p4R8ejTpNi6Kf5G93Mx1X4eZbLTnijBzj22q1K2sn0KQe
+s8oCaCb/EUWTg074lGdDq9wj9opkduWaZu2n3tmk5h1JLy2wRmQ0/URw81kBQiG+mRVn4+XGX60D
+mr9WtMhpEJ1Z+M2sRDUqWwmw2E1p2BkwxMNXDLlHN6jHSfwzzaB64oXZp3/ItwDaT4mlxVVXtqCd
+MIUL9QGKjl/wJiK/G6u5yPtsRtn5UIeY6qrodhhGc7pHuTFAmvTnP13CaCRR5y8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
           <ds:X509Certificate>MIIGtDCCBZygAwIBAgIQD6Z17ItDWQu0yyxAtAnrYjANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
 EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBEaWdpQ2VydCBUTFMgUlNBIFNI
 QTI1NiAyMDIwIENBMTAeFw0yMjEyMDIwMDAwMDBaFw0yNDAxMDIyMzU5NTlaMHExCzAJBgNVBAYT
@@ -115,24 +189,31 @@ xFEIAakZ2fyywt4v69l48K9/2kWs8PBshSPhTExTT1Da3oEr/EkAoiPWnOrUZlqWd2otiND6r7+q
     <md:OrganizationURL xml:lang="sv">http://www.kb.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
+    <md:Company>National Library of Sweden</md:Company>
     <md:GivenName>Daniel</md:GivenName>
     <md:SurName>Jakobsson</md:SurName>
     <md:EmailAddress>mailto:daniel.jakobsson@kb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46700073517</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Karl</md:GivenName>
-    <md:SurName>Birkenfjäll</md:SurName>
-    <md:EmailAddress>mailto:karl.birkenfjall@kb.se</md:EmailAddress>
+    <md:Company>National Library of Sweden</md:Company>
+    <md:GivenName>Fredrik</md:GivenName>
+    <md:SurName>Karlstedt</md:SurName>
+    <md:EmailAddress>mailto:Fredrik.Karlstedt@kb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46700073830</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
+    <md:Company>National Library of Sweden</md:Company>
     <md:GivenName>IT</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:ITsupport@kb.se</md:EmailAddress>
     <md:TelephoneNumber>+46107093550</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Mattias</md:GivenName>
-    <md:SurName>Olsson</md:SurName>
-    <md:EmailAddress>mailto:mattias.olsson@kb.se</md:EmailAddress>
+    <md:Company>National Library of Sweden</md:Company>
+    <md:GivenName>Karl</md:GivenName>
+    <md:SurName>Birkenfjäll</md:SurName>
+    <md:EmailAddress>mailto:Karl.Birkenfjall@kb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46700073542</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/konto.kau.se-shibboleth.xml b/metadata/swamid-2.0/konto.kau.se-shibboleth.xml
index 3140bffc..8d839d8f 100644
--- a/metadata/swamid-2.0/konto.kau.se-shibboleth.xml
+++ b/metadata/swamid-2.0/konto.kau.se-shibboleth.xml
@@ -31,10 +31,10 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto2.kau.se/Shibboleth.sso/Login"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto2.kau.se/Shibboleth.sso/Login/antagning.se"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto2.kau.se/Shibboleth.sso/Login/eduID-AL2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto2.kau.se/Shibboleth.sso/Login/kau.se-force"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto.kau.se/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto.kau.se/Shibboleth.sso/Login/antagning.se"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto.kau.se/Shibboleth.sso/Login/eduID-AL2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto.kau.se/Shibboleth.sso/Login/kau.se-force"/>
       <mdui:UIInfo>
         <mdui:Description xml:lang="en">Manage your KauID - your digital identity at Karlstad University</mdui:Description>
         <mdui:Description xml:lang="sv">Hantera ditt KauID - din digitala identitet hos Karlstads universitet</mdui:Description>
@@ -129,14 +129,14 @@ r+KHiYvDfx5LbLs34mXC6HVmSE91gi0WER89Lz+uI0VAw4a8Qye8EkKmNyBz9M6p
       <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://konto2.kau.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto2.kau.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto2.kau.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto2.kau.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto2.kau.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto2.kau.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto2.kau.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto2.kau.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto.kau.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto.kau.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto.kau.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.kau.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.kau.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.kau.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.kau.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto.kau.se/Shibboleth.sso/SAML2/ECP" index="3"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">KauID portal</md:ServiceName>
       <md:ServiceName xml:lang="sv">KauID portal</md:ServiceName>
diff --git a/metadata/swamid-edugain/adfs.kb.se-adfs-services-trust.xml b/metadata/swamid-edugain/adfs.kb.se-adfs-services-trust.xml
deleted file mode 100644
index 3c64f42f..00000000
--- a/metadata/swamid-edugain/adfs.kb.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.kb.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-09-04T13:25:09Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <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>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:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.kb.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Kungliga biblioteket - OLD</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">National Library of Sweden - OLD</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungliga biblioteket. - OLD</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the National Library of Sweden. - OLD</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.kb.se/swamid</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.kb.se/swamid</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="516" width="488">https://stilguide.kb.se/vendor/assets/kb_logo_text_black.svg</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="516" width="488">https://stilguide.kb.se/vendor/assets/kb_logo_text_black.svg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">Kungliga+biblioteket national+library+of+sweden</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Kungliga+biblioteket national+library+of+sweden</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kb.se/om-oss/hantering-av-personuppgifter.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.kb.se/om-oss/hantering-av-personuppgifter.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kb.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.249.131/32</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.33822,18.0722617</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQGx3FcymVB7hIUNFb7wH82jANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIEVuY3J5cHRpb24gLSBhZGZzLmtiLnNlMB4XDTIyMDIwMzEzNDk1N1oXDTI3MDIwNDEzNDk1N1owJzElMCMGA1UEAxMcQURGUyBFbmNyeXB0aW9uIC0gYWRmcy5rYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKql5PENjq2FyNy45XlKpggzEntcOegLtlLs/qAh3yptiAHNjGVs9OAt02HAkVJh0TjwPzvJOPVoxyRZG9m8x641BppEzziNlWAAylsg83/c/IUhvJV73Nj52/axkGDaqEckGRmmMBgAw5CnzUuUcNlwBJkMpbdT8/830uXOFgSATYeAoL3d6+ZyPv9cePP25pwzVptklkGz9DEOHQTEPu8GSfq867Jzxr5HnMts0yFSc1eZn/vLAcNog12fztXbYMjvvetbvaAAuPHI8HknQypL5xWdX/sWOwXbHSG1MXebkN2Rxt9UrwfPJ0y+s5DUPnRWF6MsJZG8FTiLX95eXoECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAToGYBYCw4m/C0UoYZh2J2n0dFSzSX1Ep8BqYGLvbOV8AZCM83OJIRPv0tG8HQPuKYJLGURX9uioNwFnUYSseOw5VjwZ3pal4870G3MrduBmrhcVDxt2/wvs3/TaGmKVzhMoa83ReEObN9Ahx+2JhgyCpNiFP2+bmDoqv/S+PJbqt+IF7lvI6uEjuO0KtCdf68CuOlZHUkJDULRvQYikRSTX0sN6cnHUG5FKB2U53347yyDbLHrSAcse1SY301f74P/YXbNgOgv6qzwTcp6N4A4cwFMo0wYI1iNLF6F/41cy3go9FdOlN68/t89ZpCTO8G+SzHRBNDLt+D5NvatNBtw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC0DCCAbigAwIBAgIQPB83Bd3CI4xLBms/e9ci2jANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDExlBREZTIFNpZ25pbmcgLSBhZGZzLmtiLnNlMB4XDTIyMDIwMzEzNTAxOVoXDTI3MDIwNDEzNTAxOVowJDEiMCAGA1UEAxMZQURGUyBTaWduaW5nIC0gYWRmcy5rYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSMC9TXbY0yypoCmYkbdXnZs3eECc2zwLjWxO/dWAKUTMHhZJ3O90pOgTakwZCSYxB9c/fQNqQI+rtVhgV7FzXmExj1g0/UtLjxaw6OQ32ihHn96LBxUbJLj30gU+SU8YtsKkPDRGtrkqt1QH43gq7E4yxVHRd5QyTR27f/xXiY8roP1oJQaIXD8dJuFonDWeOZpn+7hVFLwkd6GmSQ+sumhFqWeOW2+18UOTT5S9k9B7zWLD8/d3Y9fDsA9yoWCjEeloHrf4gNZIn2bxUHhXFG+hE74P3jV7nXhu7jnM4eAjY2/FdjxL3JM6IG9Uzdh6UO8SgnoS4nVM3bTphdchcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAO5/PEzkEQci3FwZMWBLaohL2jtkNZxsKPpRAEpX/wdVZ9Wz0oTebOO2C3iSZmbGp1H3JSqaeW0Hq66FBP9l6lNTqAyeScka/EZowQvDtoRrLY7kcJyD3nx56/L846IGD29MIljXY1jr9A4YcbrhuTftzcKt047wMTWYtMjuiQWw4jTEBYMKLz5KIXXmRyO4SETUsvw9ju+kqWOybQTrLEmpYDTaPRUajnk8YZDrcAto7qOZnC7IOC5d5LqSsN4l7ib8mTUkVL6CkbiGL0pEoli3GPcH5APjmPZxgANaL/4+k8zPufYyIz+EeEhP1RYjcYkM8ACZh88c5ZrnlFGUGFQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.kb.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.kb.se/adfs/ls/"/>
-    <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:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.kb.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.kb.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Kungliga Biblioteket</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Library of Sweden</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">KB</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.kb.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.kb.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>National Library of Sweden</md:Company>
-    <md:GivenName>Fredrik</md:GivenName>
-    <md:SurName>Karlstedt</md:SurName>
-    <md:EmailAddress>mailto:Fredrik.Karlstedt@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46700073830</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>National Library of Sweden</md:Company>
-    <md:GivenName>Daniel</md:GivenName>
-    <md:SurName>Jakobsson</md:SurName>
-    <md:EmailAddress>mailto:daniel.jakobsson@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46700073517</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:ITsupport@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46107093550</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>National Library of Sweden</md:Company>
-    <md:GivenName>Henrik</md:GivenName>
-    <md:SurName>Nieciecki</md:SurName>
-    <md:EmailAddress>mailto:Henrik.Nieciecki@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46700073056</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>