Merge branch 'master' of git.swamid.se:swamid-metadatamd-2024-04-09-v01

8 files changed, 130 insertions, 371 deletions

diff --git a/metadata/swamid-2.0/digkonto-test.ita.chalmers.se.xml b/metadata/swamid-2.0/digkonto-test.ita.chalmers.se.xml
index b52c7b01..356404bc 100644
--- a/metadata/swamid-2.0/digkonto-test.ita.chalmers.se.xml
+++ b/metadata/swamid-2.0/digkonto-test.ita.chalmers.se.xml
@@ -31,7 +31,7 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Administration av Chalmerskonto (CID)</mdui:DisplayName>
@@ -42,15 +42,48 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://digkonto-test.ita.chalmers.se/Public/PolicyStatement</mdui:PrivacyStatementURL>
         <mdui:InformationURL xml:lang="en">https://digkonto-test.ita.chalmers.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://digkonto-test.ita.chalmers.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="81" width="625">https://www.ita.chalmers.se/chalmers_black.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="81" width="625">https://www.ita.chalmers.se/chalmers_black.png</mdui:Logo>
       </mdui:UIInfo>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://digkonto-test.ita.chalmers.se/Shibboleth.sso/Login/Chalmers"/>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://digkonto-test.ita.chalmers.se/Shibboleth.sso/Login/Chalmers-test"/>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://digkonto-test.ita.chalmers.se/Shibboleth.sso/DS/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://digkonto-test.ita.chalmers.se/Shibboleth.sso/DS/Login" index="1"/>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>digkonto-test.net.chalmers.se</ds:KeyName>
+        <ds:KeyName>digkonto-test.net.chalmers.se-new</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=digkonto-test.net.chalmers.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEKTCCApGgAwIBAgIUIHH09XVX4OEP/em0Stm7TE47BMMwDQYJKoZIhvcNAQEL
+BQAwKDEmMCQGA1UEAxMdZGlna29udG8tdGVzdC5uZXQuY2hhbG1lcnMuc2UwHhcN
+MjAwNTI1MTQyMDUxWhcNMzAwNTIzMTQyMDUxWjAoMSYwJAYDVQQDEx1kaWdrb250
+by10ZXN0Lm5ldC5jaGFsbWVycy5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCC
+AYoCggGBAJqm/g0FnAN2twpEb9vKn8M4rCcnraVx0JTgl4jowTfkkbQdEKRgbLfG
+GMhKmA7rSH1ilek7Nz8cFuEAlXMVQoK3fiqoTnV8H27dR1BhOSg7l/kET1tZ9AVr
+qqkC/QLk+iHc4/5Q10wu9eYdiYYGYWxksDvY6Gu6ymf5HiHHM9S9tt436K7vvcNr
+Zq6Fu67CEOynJnBEJJzNiwZcaNWFFj+NKBOepd0CwoEJp3uqaBMz3HYgw5RDRdpN
++p9k8lXLU2uD3D9OTkjyWrps85Mvz0UfNX3UyYRZlvwyGig9RnhKVf//mqSQvOPv
+OZcgEjlo7/FL5OifbSwnRiMzWR+mltgoTdO3Ws7oj7QThkBSn/QyOsQOGwEJRpor
+unnm5/P+Adka09EeNuIg8mvmTzHU25yogT+oKOz6wnMHHKIU4W5JN1IPbBh/vGez
+inCZ3EJjdw2mQwNh8rXVCJ8WcMCdInIz3oT9lJWHst6HczNkIVRUZOCi9mKm/F4b
+7xx3yy7bawIDAQABo0swSTAoBgNVHREEITAfgh1kaWdrb250by10ZXN0Lm5ldC5j
+aGFsbWVycy5zZTAdBgNVHQ4EFgQUDeu4iCsZMCyuQaXvFrPrFhZGDbwwDQYJKoZI
+hvcNAQELBQADggGBAIjBIaZabT2CwiYzI8Z8puYMJrOSbpYfV2xch2hw7tVwO8ou
+MJcGmjaPW8BffLppGK/+DIm0Q269AzIz43kth7UW/uVpbk6wpSFGjX4vRyCeo2eT
+YJZdZm9EkCsNgBhRSIBNzwo0U6dD331vMR2VWUmf4VUNB8z5/VSgnvQHZcyYOpPJ
+JprXsiT/Gjb0RtvlJHf80bS3+t/nT+aPo6CY7qxmGYEZuKeRsSZAmDXI8dnbP2Pr
+OVHEpDbBELeScQfSs8jecY+lqv3zHFgsj6DMnatLNaAdxbUr/xFoD6l+dNQBsVQ/
+358qQoslJYQ+tr1L3BGKzUk+dDD25iuct37pv1Lb4Jw/doZO3UUp1m0PUzrGlgiM
+bTSJFQa7pKXcl2sMIrO/2pzlkbg2zbLjIBdAzpksX97fK2CimrMeJqQAT9hmS4ss
+9YuMAwfchItZ122WJsph+i+YJeZNsKPKv2asXidVBGNDam/CHBlCn07qt5igtINc
+fwsIhlKJY1rN5SMDlQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>digkonto-test.net.chalmers.se-new</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=digkonto-test.net.chalmers.se</ds:X509SubjectName>
           <ds:X509Certificate>MIIEKTCCApGgAwIBAgIUIHH09XVX4OEP/em0Stm7TE47BMMwDQYJKoZIhvcNAQEL
@@ -93,6 +126,7 @@ fwsIhlKJY1rN5SMDlQ==</ds:X509Certificate>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://digkonto-test.ita.chalmers.se/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://digkonto-test.ita.chalmers.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://digkonto-test.ita.chalmers.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://digkonto-test.ita.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Administration of your Chalmers account</md:ServiceName>
@@ -116,14 +150,14 @@ fwsIhlKJY1rN5SMDlQ==</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>System</md:GivenName>
     <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
+    <md:EmailAddress>mailto:it-support@chalmers.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
+    <md:EmailAddress>mailto:it-support@chalmers.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
-    <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
+    <md:EmailAddress>mailto:it-support@chalmers.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>Chalmers Incident Response Team</md:GivenName>
diff --git a/metadata/swamid-2.0/get.eduroam.se.xml b/metadata/swamid-2.0/get.eduroam.se.xml
deleted file mode 100644
index 213ff8d9..00000000
--- a/metadata/swamid-2.0/get.eduroam.se.xml
+++ /dev/null
@@ -1,71 +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://get.eduroam.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-03-15T07:24:58Z">
-      <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">getEduroam - Eduroam on-boarding</mdui:Description>
-        <mdui:Description xml:lang="sv">getEduroam - Eduroam konfiguration</mdui:Description>
-        <mdui:DisplayName xml:lang="en">getEduroam</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">getEduroam</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://get.eduroam.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://get.eduroam.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/eduroam/Transfer+of+personal+data+to+geteduroam+when+using+federated+login</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/eduroam/Transfer+of+personal+data+to+geteduroam+when+using+federated+login</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIUbiV0WARdQd12w2KrTWrfqkA36Q4wDQYJKoZIhvcNAQELBQAwgZMxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEOMAwGA1UECgwFU1VORVQxEDAOBgNVBAsMB0VkdXJvYW0xFzAVBgNVBAMMDmdldC5lZHVyb2FtLnNlMSEwHwYJKoZIhvcNAQkBFhJrcmlzdG9mZXJAc3VuZXQuc2UwHhcNMjEwMzEyMTE1MjI2WhcNMzEwMzEyMTE1MjI2WjCBkzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTVU5FVDEQMA4GA1UECwwHRWR1cm9hbTEXMBUGA1UEAwwOZ2V0LmVkdXJvYW0uc2UxITAfBgkqhkiG9w0BCQEWEmtyaXN0b2ZlckBzdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANGiiGceK7BcMSH2cMhvzU9RJLjNeMxM1V30Fe1R1pqr4mBPxa66Mu25nIZjTxlb/XnpD9HcXqW5/DTJmhu+kau1LFbba4sQT1cNBuR02z85QEhVL6L3nAH9LLrbNQOR/6IernSYivfPDyE2i+ekPdhcx3yNg2dwQMVgvMcrqJEruLjPqLPSdjy6I3kYji6dgR+0jGqzSfKHpXN/EkD57UL+QM/pwFCWrJSlOlAB81T+UWWjmMctIR7iLyVIVKd25JW7u1yz0bPv4bbxmfu59luJEjKNw91xsxSFaBTzO7YNyX/OV68NQzzCelTncV/OwFyzXeqcZMarojOtYXI8tGMCAwEAAaNTMFEwHQYDVR0OBBYEFBL2gDO3qBALDrg/5ibRrkzXMcuQMB8GA1UdIwQYMBaAFBL2gDO3qBALDrg/5ibRrkzXMcuQMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAF+wl69XaszNLtRriuMvme9+uHUCyofAu1H5x9mjZCxplUMGUFfp8ziszYK/F6tXoQJR2qyir2kByji5F6vOm1pfE/7lkT502ygIAA/CE+coooQ2DI0i3PKW0H63YCs2a9T7tz8YtGGpqs88Aap9H64Zl24syWOqsmxhnEaI3crSxnKKRXrHpEo2U7+ANVVUDJtSxVFPyMSmSqrJq4QMRZplRvp9HaNtXeDyIgblT+tn7TnEc/Mq5kEgNcIk7YZCmja5lcAIerLGtwRt3Uw2ryt0NqqXIyBqHJ2ssy8C+P564a+63xCUU+3JB37awwFjC9LSlwSBu9qM0v8FkSlAG/w=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIUbiV0WARdQd12w2KrTWrfqkA36Q4wDQYJKoZIhvcNAQELBQAwgZMxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEOMAwGA1UECgwFU1VORVQxEDAOBgNVBAsMB0VkdXJvYW0xFzAVBgNVBAMMDmdldC5lZHVyb2FtLnNlMSEwHwYJKoZIhvcNAQkBFhJrcmlzdG9mZXJAc3VuZXQuc2UwHhcNMjEwMzEyMTE1MjI2WhcNMzEwMzEyMTE1MjI2WjCBkzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTVU5FVDEQMA4GA1UECwwHRWR1cm9hbTEXMBUGA1UEAwwOZ2V0LmVkdXJvYW0uc2UxITAfBgkqhkiG9w0BCQEWEmtyaXN0b2ZlckBzdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANGiiGceK7BcMSH2cMhvzU9RJLjNeMxM1V30Fe1R1pqr4mBPxa66Mu25nIZjTxlb/XnpD9HcXqW5/DTJmhu+kau1LFbba4sQT1cNBuR02z85QEhVL6L3nAH9LLrbNQOR/6IernSYivfPDyE2i+ekPdhcx3yNg2dwQMVgvMcrqJEruLjPqLPSdjy6I3kYji6dgR+0jGqzSfKHpXN/EkD57UL+QM/pwFCWrJSlOlAB81T+UWWjmMctIR7iLyVIVKd25JW7u1yz0bPv4bbxmfu59luJEjKNw91xsxSFaBTzO7YNyX/OV68NQzzCelTncV/OwFyzXeqcZMarojOtYXI8tGMCAwEAAaNTMFEwHQYDVR0OBBYEFBL2gDO3qBALDrg/5ibRrkzXMcuQMB8GA1UdIwQYMBaAFBL2gDO3qBALDrg/5ibRrkzXMcuQMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAF+wl69XaszNLtRriuMvme9+uHUCyofAu1H5x9mjZCxplUMGUFfp8ziszYK/F6tXoQJR2qyir2kByji5F6vOm1pfE/7lkT502ygIAA/CE+coooQ2DI0i3PKW0H63YCs2a9T7tz8YtGGpqs88Aap9H64Zl24syWOqsmxhnEaI3crSxnKKRXrHpEo2U7+ANVVUDJtSxVFPyMSmSqrJq4QMRZplRvp9HaNtXeDyIgblT+tn7TnEc/Mq5kEgNcIk7YZCmja5lcAIerLGtwRt3Uw2ryt0NqqXIyBqHJ2ssy8C+P564a+63xCUU+3JB37awwFjC9LSlwSBu9qM0v8FkSlAG/w=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://get.eduroam.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://get.eduroam.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://get.eduroam.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://get.eduroam.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://get.eduroam.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Eduroam</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:kristofer@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kristofer Hallin</md:GivenName>
-    <md:EmailAddress>mailto:kristofer@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.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>Kristofer Hallin</md:GivenName>
-    <md:EmailAddress>mailto:kristofer@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/keystone.cloud.sunet.se-shibboleth.xml b/metadata/swamid-2.0/keystone.cloud.sunet.se-shibboleth.xml
deleted file mode 100644
index ea8f0491..00000000
--- a/metadata/swamid-2.0/keystone.cloud.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://keystone.cloud.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Safespring Cloud Services</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Safespring Cloud Services</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Safespring Cloud Services OpenStack</mdui:Description>
-        <mdui:Description xml:lang="sv">Safespring Cloud Services OpenStack</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.safespring.com/dokument/sunet/safespring-swamid-privacy-policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.safespring.com/dokument/sunet/safespring-swamid-privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-            BAMMHWtleXN0b25lLWJldGEuY2xvdWQuaXBuZXR0LnNlMB4XDTE2MDMzMDA2MTY0
-            OVoXDTI3MDMxMzA2MTY0OVowKDEmMCQGA1UEAwwda2V5c3RvbmUtYmV0YS5jbG91
-            ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbE4Dd
-            PYdXSY28N+u22x7Zpe+9tw/GA8ZqUY82loAk0tZ1m5erQNcW11USum8a8socSi0r
-            QDzHsratiV6s/+8pyp+NorwfONAx/tP5HdvDDWUhJFld6oo6fEhyxk7XIFyuz9Th
-            PkGls8CLphjPvUcvoBu86Uw0bBGC4+bmde5UiNN/8spCWB4IeAzWLNYtF81r9+wA
-            uDPqimL5u2SUH3INquU72oGg6brL+lGOkoFt162YQnBnN6fQEzVmLzvagdXGKw+m
-            /YTph+WnNEeOz2gV9Hhf5gyri3fPk1kXqGlO0w/F4UdTSIV7ypdW8NkrYCf7INbk
-            kETtWcxTjNYOEnL7AgMBAAGjUDBOMB0GA1UdDgQWBBRJBzbqYNaDlZW94WVGApLN
-            XtSrrjAfBgNVHSMEGDAWgBRJBzbqYNaDlZW94WVGApLNXtSrrjAMBgNVHRMEBTAD
-            AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAHw0OXubM7aFCCQal1ZQiNBMZnvePqzujg
-            Yn6c9IRNNMvax9w31hVOLWaE6Kpa++T6LppwI952y3wSqevDPf180dySQWtstziI
-            D7Lz/Kjll9LN8mArW1jJ4psqDU9RX4otDP8AUUVo5K9daCjBbxcj4RIMfpmlcw7a
-            MpN8pGtS0Z6VNxC4XsCmM+2mRu4cvlwhHOwu7hy4vK8OLOaj6SNiJYHSi/5ZoQv7
-            VNEtE1FJ0y6Fox7OG48x+S//SkzDkNkOgo/tRSJhb5bQQBpOMtNF6WNp8cqnkFst
-            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-            BAMMHWtleXN0b25lLWJldGEuY2xvdWQuaXBuZXR0LnNlMB4XDTE2MDMzMDA2MTY0
-            OVoXDTI3MDMxMzA2MTY0OVowKDEmMCQGA1UEAwwda2V5c3RvbmUtYmV0YS5jbG91
-            ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbE4Dd
-            PYdXSY28N+u22x7Zpe+9tw/GA8ZqUY82loAk0tZ1m5erQNcW11USum8a8socSi0r
-            QDzHsratiV6s/+8pyp+NorwfONAx/tP5HdvDDWUhJFld6oo6fEhyxk7XIFyuz9Th
-            PkGls8CLphjPvUcvoBu86Uw0bBGC4+bmde5UiNN/8spCWB4IeAzWLNYtF81r9+wA
-            uDPqimL5u2SUH3INquU72oGg6brL+lGOkoFt162YQnBnN6fQEzVmLzvagdXGKw+m
-            /YTph+WnNEeOz2gV9Hhf5gyri3fPk1kXqGlO0w/F4UdTSIV7ypdW8NkrYCf7INbk
-            kETtWcxTjNYOEnL7AgMBAAGjUDBOMB0GA1UdDgQWBBRJBzbqYNaDlZW94WVGApLN
-            XtSrrjAfBgNVHSMEGDAWgBRJBzbqYNaDlZW94WVGApLNXtSrrjAMBgNVHRMEBTAD
-            AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAHw0OXubM7aFCCQal1ZQiNBMZnvePqzujg
-            Yn6c9IRNNMvax9w31hVOLWaE6Kpa++T6LppwI952y3wSqevDPf180dySQWtstziI
-            D7Lz/Kjll9LN8mArW1jJ4psqDU9RX4otDP8AUUVo5K9daCjBbxcj4RIMfpmlcw7a
-            MpN8pGtS0Z6VNxC4XsCmM+2mRu4cvlwhHOwu7hy4vK8OLOaj6SNiJYHSi/5ZoQv7
-            VNEtE1FJ0y6Fox7OG48x+S//SkzDkNkOgo/tRSJhb5bQQBpOMtNF6WNp8cqnkFst
-            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keystone.cloud.sunet.se/Shibboleth.sso/Logout"/>
-    <md:AssertionConsumerService Location="https://keystone.cloud.sunet.se/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Safespring Cloud Services OpenStack</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Safespring Cloud Services OpenStack</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"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Safespring</md:Company>
-    <md:GivenName>Safespring Operations</md:GivenName>
-    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Safespring</md:Company>
-    <md:GivenName>Safespring Support</md:GivenName>
-    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Safespring Operations</md:SurName>
-    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/scrive.com.xml b/metadata/swamid-2.0/scrive.com.xml
new file mode 100644
index 00000000..b296a40f
--- /dev/null
+++ b/metadata/swamid-2.0/scrive.com.xml
@@ -0,0 +1,86 @@
+<?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://scrive.com">
+  <md:Extensions>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-04-04T11:25:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Scrive AB</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Scrive AB</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.scrive.com/products/esign-online/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.scrive.com/trust-center/gdpr-compliance/</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="en-US">Scrive AB</mdui:DisplayName>
+        <mdui:Description xml:lang="en-US">Scrive AB</mdui:Description>
+        <mdui:InformationURL xml:lang="en-US">https://www.scrive.com/products/esign-online</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en-US">https://www.scrive.com/resources/trust-centre/gdpr-compliance</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="sv">Scrive AB</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Scrive AB</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.scrive.com/sv/produkter/esign-online/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.scrive.com/sv/trust-center/gdpr-efterlevnad/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFiTCCA3ECFCvUuKlcp14UuN0dePlre5jRUnaWMA0GCSqGSIb3DQEBCwUAMIGAMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xEjAQBgNVBAoMCVNjcml2ZSBBQjESMBAGA1UECwwJU2NyaXZlIEFCMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QHNjcml2ZS5jb20wHhcNMjQwMzI4MTY1MzA1WhcNMjUwMzI4MTY1MzA1WjCBgDELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMRIwEAYDVQQKDAlTY3JpdmUgQUIxEjAQBgNVBAsMCVNjcml2ZSBBQjEhMB8GCSqGSIb3DQEJARYSc3VwcG9ydEBzY3JpdmUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqhFpGEcanzeUXZTjsiYwer/dgyVtDqut9RzVa1J8CMb9IbVs9WjSjMuAeJ/4H9aq6mSVIGzgsdyjIfWgjY/+6bqYIum8SBVIrLg8T6QTsfh52FFZhtotFCz0TkW0wAKERHtyIKf73wz6abocXX7leGbV9+L7PfShWgkGvTZ8hne55LNDVh2aeW5Ml0H4GijUfPzTO0TWKCcexHKAxK1twSjUMRIEP4Ny8AaDYBt6bVevU+YcnexmfDV35lpxcWP2OPW9HGmsQBuFStFie39+8jo9o/NLNfImxGd4pfg4+wnbdWnS/PgnbO/SiHiXLNitk38deH9q4GedW4aVJgjjzV/M9S6rFxdTCvoqDqSRY3mHcAZWp3ZrNHoVCzRRjKKnScDRrua+HXLeI8iX57aisJQ7H7CkBDOa6cH72r9NH7b2rcghGNWb1GQfgONR6uDZSsurXBIHKg+ol3yyv33hRwm27osgbe208ATSQUlIzPzStijzq7fzUFPJDZrmrsZJbPHEYY0UugSLwG84rY95MwHEdtHcqPPqKnhfVWdES8wEAuMWG8uu5ar2ox2+EapeJYsvL/tn/GAIsFUrU+hIzUvHGnPUKlh/HQY8qLvxvQGI/MIE+MBlFsBNcLM/ZySnHihUSDCo2qgQN5BbSZHxJI/qvgVyvy2ktRWbVo0OUgsCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAnUYutuBMPZ3QwLWb0OX5RUe8LiV/3wA9WS8iTgmtWKzXww25jTFt8a++qTpSIX8/LBO3yc9yc5yQ4eVmZeCIts/KCxhEHRqPe+SmpYz3BFJGuHg5PaCmmYlNG9PMHmEnGYboyHJ73+2il+wkrkOT4voRsHqgYMXscokOYGmAhw+GrcAI0muVfVpSceoAS86ifO70Yk9Up0nrE0eJr+W/vYyAlB4mxnSkwmUjBO+uYRME52Nmo3fG8UCdSBICzryxMSU9zbjtFeycECfWp1t8EvYmkTRovmpf+ZQgflcCRt2bwlKgMGv5EoXZnr95i9PYdkmsNJZ7bZZb7w6iUpl9TTeKmDWWFzZHi3i7h15NjsIkUj8J21DjDNSkyuhehrBQdiTwyh+qIqvxluUOBK5EROeK5WNlvhuWML8AxWzKq+dGKve8/x0FCUeHhOn1sBSxT5gaHKq6BFwaecpkiIbwA33NMd5gLhMU0yOu+RdvweYAs8pkwdXLGAHSv0QqITMPzNOOqMHfKDjtlUCI1a9Wq/nfL06J3ieGgX9mFyz2bcWEbwW2ur9LvVU9kslJH5DY/f3r4r+OrEsCKWdBeaRKn57XdIiRwffwArWF4O0f911cfRsWbYOv9ft+nV0gXAdhYomYPidIZjrsUByEsSvZ6EVbvfBSEOtxiv1zUv8OyMU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFiTCCA3ECFC+KrOvhmATUTifF5Vm66uwQ3z1rMA0GCSqGSIb3DQEBCwUAMIGAMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xEjAQBgNVBAoMCVNjcml2ZSBBQjESMBAGA1UECwwJU2NyaXZlIEFCMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QHNjcml2ZS5jb20wHhcNMjQwMzI4MTY1ODQ1WhcNMjUwMzI4MTY1ODQ1WjCBgDELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMRIwEAYDVQQKDAlTY3JpdmUgQUIxEjAQBgNVBAsMCVNjcml2ZSBBQjEhMB8GCSqGSIb3DQEJARYSc3VwcG9ydEBzY3JpdmUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtslIaWitPNx0gDo/by/MkvVzUbdLbvKRDUCY4cJ2/6sSof4Gtfv29itymtj5ffDFdSaTvzqV2mNVeSLIBqZonZD/m3mw+4QTocH/ZhyA0YiTatZsOOH4JAoiB37GEgt9BsnPHrygleKqGWhXP9qxzXnVBWbOde37BsJpEzxwH9zvfdFESRgQ2sah5qtyhNAb8WchsaSm4rD5EMP6yWXZnJ06Byvwr7RkscG4rJitrYyB2aRMCVfhKzfaLf3UW+ziIFDBERex9SmlYiIHK6hpO6iDya3rmcIRw2fkDz14LoxPw1I+vGLdgrL9gTENS5cCUnhuWfq0ggZmEErZG7hJoDrslXNmLbAqUD2NVuA/alsksWs4pW85AVVQAlnOZqD7UkchZvSphFKhSgoKhhxPLM82faOm+EoeVuJV79AQmIEuUUK4WPDrEdD6dZp/CG/4f0+pOgfMmN//6+thgSSUTlEKbzqhdfIqZJVm/Q70vmTBg7FNChuz7QU1Gyf+kGa3SbNfmc/SrrmmMHY3Q4atMG16/RJGKdY2RlyIM6uxl9mbHE4aOi3FMTWAYVJjnrJqaY17OG6dcxK28VUKRpNG0sZid2Cuj2sE8WXmdvart45O/8DyeTnjX/Mgfx6URBkBZO+uF1hURMVcJImITQrddy8r3gN4mEH5RwJY6hAPOZECAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAO/QZvBygIC2svaCmQ8cK0xGJgNWn8Rs8D14zy9uIJHe9UbaYru50mp3HFGj7k78jjyBfJgHR8TeUzIWnRODZ/8UZ+c/PyQwNoLgQHQZJu66mgNpgdruSEWm9U3D1ycgJrI53HjNp+ipXZrREOJ7XVoiG1rHaYrHd8FFKoeAA9KkCgAaylDY6kfJ0tRXhGZSBNFTTNmZWE5ikdnqYi69Mtpia6DRHKE9JfvnMdPxbKrH7GKh+lRoSXmOMdKohMDn3fBq/sUfrJF399iq2J+vQ0iIaLF2b/Px67r5w4Buc3P+XWQs2FY8ctoaHbrx9nU6cKyxzRDL6OzqAmuTXrkFBSaxwC/HPPJEfcfx/kZ9g+GZJeRdglYXDcXblhBHGgLhZoEAhFvHVNF+POBdqZf0OSJK7UCVH2iBkHPMXKkDrMa2Sv+AhZGShXK+BzRydQty1kkyAzprHOwWUhlV8LBOppFmxdoubSupS4OtuLcPhMU0RjyXOHc1CyS+8F3ZvOe6uG58GtjF+B2bhrAfnVj5D5mV0zy3FHpoTbTKQq+TCLJTOFf2XwieZge2QR/0FdgtASdGIt8KoBNYDg8f0HC6y8aFI1RxHL3xeOiKbynSaF4aScOhwezwPBLRBc9M+t/DOjVknTxKitCPOyDrWPoGBk+QVUuTe1VwXX9G0b1SWiQM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://scrive.com/sso/saml/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scrive.com/sso/saml/acs"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en-US">Scrive assertions consumer</md:ServiceName>
+      <md:ServiceName xml:lang="en">Scrive assertions consumer</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Scrive assertion konsument</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Scrive SP assertions consumer requiring an email assured by IdP</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en-US">Scrive SP assertions consumer requiring an email assured by IdP</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Scrive SP assertion konsument</md:ServiceDescription>
+      <md:RequestedAttribute isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="firstname"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scrive AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="en-US">Scrive AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Scrive AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scrive</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en-US">Scrive</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Scrive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://scrive.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en-US">https://scrive.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.scrive.com/sv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scrive support</md:GivenName>
+    <md:EmailAddress>mailto:support@scrive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Scrive support</md:GivenName>
+    <md:EmailAddress>mailto:support@scrive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Scrive support</md:GivenName>
+    <md:EmailAddress>mailto:support@scrive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Scrive support</md:GivenName>
+    <md:EmailAddress>mailto:support@scrive.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml b/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
index e57dc832..62d7b9dc 100644
--- a/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
@@ -17,6 +17,7 @@
         <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>
@@ -32,8 +33,8 @@
         <mdui:InformationURL xml:lang="en">http://www.chalmers.se/en/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.ita.chalmers.se/PrivacyPolicyIdP.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.ita.chalmers.se/PrivacyPolicyIdP.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="81" width="625">https://intranet.chalmers.se/media/1056/chalmers_black.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="81" width="625">https://intranet.chalmers.se/media/1056/chalmers_black.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="81" width="625">https://www.ita.chalmers.se/chalmers_black.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="81" width="625">https://www.ita.chalmers.se/chalmers_black.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>chalmers.se</mdui:DomainHint>
diff --git a/metadata/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml b/metadata/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml
deleted file mode 100644
index 45a948f2..00000000
--- a/metadata/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://keystone-beta.cloud.ipnett.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-30T13:14:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">IPnett Cloud Services Beta</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">IPnett Cloud Services Beta</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IPnett Cloud Services OpenStack</mdui:Description>
-        <mdui:Description xml:lang="sv">IPnett Cloud Services OpenStack</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.safespring.com/dokument/sunet/safespring-swamid-privacy-policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.safespring.com/dokument/sunet/safespring-swamid-privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-            BAMMHWtleXN0b25lLWJldGEuY2xvdWQuaXBuZXR0LnNlMB4XDTE2MDMzMDA2MTY0
-            OVoXDTI3MDMxMzA2MTY0OVowKDEmMCQGA1UEAwwda2V5c3RvbmUtYmV0YS5jbG91
-            ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbE4Dd
-            PYdXSY28N+u22x7Zpe+9tw/GA8ZqUY82loAk0tZ1m5erQNcW11USum8a8socSi0r
-            QDzHsratiV6s/+8pyp+NorwfONAx/tP5HdvDDWUhJFld6oo6fEhyxk7XIFyuz9Th
-            PkGls8CLphjPvUcvoBu86Uw0bBGC4+bmde5UiNN/8spCWB4IeAzWLNYtF81r9+wA
-            uDPqimL5u2SUH3INquU72oGg6brL+lGOkoFt162YQnBnN6fQEzVmLzvagdXGKw+m
-            /YTph+WnNEeOz2gV9Hhf5gyri3fPk1kXqGlO0w/F4UdTSIV7ypdW8NkrYCf7INbk
-            kETtWcxTjNYOEnL7AgMBAAGjUDBOMB0GA1UdDgQWBBRJBzbqYNaDlZW94WVGApLN
-            XtSrrjAfBgNVHSMEGDAWgBRJBzbqYNaDlZW94WVGApLNXtSrrjAMBgNVHRMEBTAD
-            AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAHw0OXubM7aFCCQal1ZQiNBMZnvePqzujg
-            Yn6c9IRNNMvax9w31hVOLWaE6Kpa++T6LppwI952y3wSqevDPf180dySQWtstziI
-            D7Lz/Kjll9LN8mArW1jJ4psqDU9RX4otDP8AUUVo5K9daCjBbxcj4RIMfpmlcw7a
-            MpN8pGtS0Z6VNxC4XsCmM+2mRu4cvlwhHOwu7hy4vK8OLOaj6SNiJYHSi/5ZoQv7
-            VNEtE1FJ0y6Fox7OG48x+S//SkzDkNkOgo/tRSJhb5bQQBpOMtNF6WNp8cqnkFst
-            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDIzCCAgugAwIBAgIJAPPowPSKvgZgMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-            BAMMHWtleXN0b25lLWJldGEuY2xvdWQuaXBuZXR0LnNlMB4XDTE2MDMzMDA2MTY0
-            OVoXDTI3MDMxMzA2MTY0OVowKDEmMCQGA1UEAwwda2V5c3RvbmUtYmV0YS5jbG91
-            ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbE4Dd
-            PYdXSY28N+u22x7Zpe+9tw/GA8ZqUY82loAk0tZ1m5erQNcW11USum8a8socSi0r
-            QDzHsratiV6s/+8pyp+NorwfONAx/tP5HdvDDWUhJFld6oo6fEhyxk7XIFyuz9Th
-            PkGls8CLphjPvUcvoBu86Uw0bBGC4+bmde5UiNN/8spCWB4IeAzWLNYtF81r9+wA
-            uDPqimL5u2SUH3INquU72oGg6brL+lGOkoFt162YQnBnN6fQEzVmLzvagdXGKw+m
-            /YTph+WnNEeOz2gV9Hhf5gyri3fPk1kXqGlO0w/F4UdTSIV7ypdW8NkrYCf7INbk
-            kETtWcxTjNYOEnL7AgMBAAGjUDBOMB0GA1UdDgQWBBRJBzbqYNaDlZW94WVGApLN
-            XtSrrjAfBgNVHSMEGDAWgBRJBzbqYNaDlZW94WVGApLNXtSrrjAMBgNVHRMEBTAD
-            AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAHw0OXubM7aFCCQal1ZQiNBMZnvePqzujg
-            Yn6c9IRNNMvax9w31hVOLWaE6Kpa++T6LppwI952y3wSqevDPf180dySQWtstziI
-            D7Lz/Kjll9LN8mArW1jJ4psqDU9RX4otDP8AUUVo5K9daCjBbxcj4RIMfpmlcw7a
-            MpN8pGtS0Z6VNxC4XsCmM+2mRu4cvlwhHOwu7hy4vK8OLOaj6SNiJYHSi/5ZoQv7
-            VNEtE1FJ0y6Fox7OG48x+S//SkzDkNkOgo/tRSJhb5bQQBpOMtNF6WNp8cqnkFst
-            uCNQenEiZ9DSiyNJmsiqWMsdir/9+GWp0VpsJLLq878kAxtPFQid</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keystone-beta.cloud.ipnett.se/Shibboleth.sso/Logout"/>
-    <md:AssertionConsumerService Location="https://keystone-beta.cloud.ipnett.se/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">IPnett Cloud Services OpenStack</md:ServiceName>
-      <md:ServiceName xml:lang="sv">IPnett Cloud Services OpenStack</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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Safespring</md:Company>
-    <md:GivenName>Safespring Operations</md:GivenName>
-    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Safespring Operations</md:SurName>
-    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-edugain/release-check.swamid.se-shibboleth.xml b/metadata/swamid-edugain/release-check.swamid.se-shibboleth.xml
index 3b3fadb9..7de37373 100644
--- a/metadata/swamid-edugain/release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-edugain/release-check.swamid.se-shibboleth.xml
@@ -164,6 +164,7 @@ B74Mrn0TheZeZB4=</ds:X509Certificate>
       <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mailLocalAddress" Name="urn:oid:2.16.840.1.113730.3.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="norEduPersonLegalName" Name="urn:oid:1.3.6.1.4.1.2428.90.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/metadata/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index cf9d8c1e..00000000
--- a/metadata/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,88 +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://sp.snd.gu.se/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-21T10:11:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SND Service Provider</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">SND Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SSO service for SND.</mdui:Description>
-        <mdui:Description xml:lang="sv">SSO tjänst för SND.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://snd.gu.se/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://snd.gu.se/sv</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.gu.se/en/about-the-website/processing-personal-data</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gu.se/om-webbplatsen/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAOSJkiHJyuhvMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJTRTEeMBwGA1UECAwVVsODwqRzdHJhIEfDg8K2dGFsYW5kMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzEnMCUGA1UECgweU3ZlbnNrIE5hdGlvbmVsbCBEYXRhdGrDg8KkbnN0MQwwCgYDVQQLDANTTkQxFTATBgNVBAMMDHNwLnNuZC5ndS5zZTAeFw0xNzAzMTUxMzQwMDBaFw0yNzAzMTUxMzQwMDBaMIGRMQswCQYDVQQGEwJTRTEeMBwGA1UECAwVVsODwqRzdHJhIEfDg8K2dGFsYW5kMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzEnMCUGA1UECgweU3ZlbnNrIE5hdGlvbmVsbCBEYXRhdGrDg8KkbnN0MQwwCgYDVQQLDANTTkQxFTATBgNVBAMMDHNwLnNuZC5ndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy/SFCAUMA1/kifnZ+BXyoQQko1N2gKDWJAtxkhdLjqIMSWiAJB6Hm/6y+KeVjJI/sS4/YeeU3tNhEt4jAz/pvzBfSrTnq7r19bAag/ETA0bl3v5e2reTOm10TC3vzYYdGRYeZJ7hzJc41E9nvxKFq/WPWPkEU/n2tyaAkpR+daiCdCs5wyNdTC2qNdC290fST7xNFHQ9H/SAcKBdw8bb7aPbX/UXUAdbz0HSt621P6fMCsJ2OrxZsbfuB0tt21whabnxuiWyvU0jlX+E3psl7Ckqzpgo3jjR8NwIIbDqhUhdpTq3VfmAhCNGJLsn/WFcKTeWcUVCaK8Kz4dYvKaf8CAwEAAaNQME4wHQYDVR0OBBYEFCtRfcV48A7euocX6hm3Uf3bqRLpMB8GA1UdIwQYMBaAFCtRfcV48A7euocX6hm3Uf3bqRLpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADi6MncS0X8OosEgUNIFHTm2M/nIiMf/Q5Y3tXKnAYKVrrv2FZXFvFtGYGFs6tpvmAqgRBP8wAF1BfCOPihbB8QtTqPBsDB2AklUH9BGJiZeKKJjPj7EmQyI6w1bcntvrOXA/P3dIgvyL6opoXp/103qB3aCcvGzdt6jHcsVfnWnW8OSZyCHQeoYTqAmtDTaxrzhEd+festHNEPoJtnjdQW1bLa20HxJNnABarrYbo7ELikBz3tUwztOc1u5+40+XuRky7eqioptf5mhmJuZ7kh3sapzTdJLXhU++nQ6jS3rCpK1gUWuwhzN+67w+hV+/EeviTxkRlqa5//sBr6Erus=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAOSJkiHJyuhvMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJTRTEeMBwGA1UECAwVVsODwqRzdHJhIEfDg8K2dGFsYW5kMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzEnMCUGA1UECgweU3ZlbnNrIE5hdGlvbmVsbCBEYXRhdGrDg8KkbnN0MQwwCgYDVQQLDANTTkQxFTATBgNVBAMMDHNwLnNuZC5ndS5zZTAeFw0xNzAzMTUxMzQwMDBaFw0yNzAzMTUxMzQwMDBaMIGRMQswCQYDVQQGEwJTRTEeMBwGA1UECAwVVsODwqRzdHJhIEfDg8K2dGFsYW5kMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzEnMCUGA1UECgweU3ZlbnNrIE5hdGlvbmVsbCBEYXRhdGrDg8KkbnN0MQwwCgYDVQQLDANTTkQxFTATBgNVBAMMDHNwLnNuZC5ndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy/SFCAUMA1/kifnZ+BXyoQQko1N2gKDWJAtxkhdLjqIMSWiAJB6Hm/6y+KeVjJI/sS4/YeeU3tNhEt4jAz/pvzBfSrTnq7r19bAag/ETA0bl3v5e2reTOm10TC3vzYYdGRYeZJ7hzJc41E9nvxKFq/WPWPkEU/n2tyaAkpR+daiCdCs5wyNdTC2qNdC290fST7xNFHQ9H/SAcKBdw8bb7aPbX/UXUAdbz0HSt621P6fMCsJ2OrxZsbfuB0tt21whabnxuiWyvU0jlX+E3psl7Ckqzpgo3jjR8NwIIbDqhUhdpTq3VfmAhCNGJLsn/WFcKTeWcUVCaK8Kz4dYvKaf8CAwEAAaNQME4wHQYDVR0OBBYEFCtRfcV48A7euocX6hm3Uf3bqRLpMB8GA1UdIwQYMBaAFCtRfcV48A7euocX6hm3Uf3bqRLpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADi6MncS0X8OosEgUNIFHTm2M/nIiMf/Q5Y3tXKnAYKVrrv2FZXFvFtGYGFs6tpvmAqgRBP8wAF1BfCOPihbB8QtTqPBsDB2AklUH9BGJiZeKKJjPj7EmQyI6w1bcntvrOXA/P3dIgvyL6opoXp/103qB3aCcvGzdt6jHcsVfnWnW8OSZyCHQeoYTqAmtDTaxrzhEd+festHNEPoJtnjdQW1bLa20HxJNnABarrYbo7ELikBz3tUwztOc1u5+40+XuRky7eqioptf5mhmJuZ7kh3sapzTdJLXhU++nQ6jS3rCpK1gUWuwhzN+67w+hV+/EeviTxkRlqa5//sBr6Erus=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.snd.gu.se/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.snd.gu.se/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.snd.gu.se/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Swedish National Data Service</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Svensk Nationell Datatjänst</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:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonOrcid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://snd.se/sv</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://snd.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>SND</md:Company>
-    <md:GivenName>SND</md:GivenName>
-    <md:SurName>Administrative</md:SurName>
-    <md:EmailAddress>mailto:snd@snd.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>SND</md:Company>
-    <md:GivenName>SND</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SND</md:GivenName>
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:webmaster@snd.gu.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>SND</md:Company>
-    <md:GivenName>SND</md:GivenName>
-    <md:SurName>Security</md:SurName>
-    <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>