1 files changed, 46 insertions, 44 deletions
diff --git a/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml b/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml
index d0460e6d..44409613 100644
--- a/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml
@@ -4,47 +4,49 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-01-15T12:08:37Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <ns2:DigestMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" 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>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns3:DiscoveryResponse xmlns:ns3="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://drive-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://drive-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Sunet Drive Satosa GW</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Sunet Drive Satosa GW</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Satosa GW för Sunet Drive</mdui:Description>
         <mdui:Description xml:lang="en">Satosa GW to bridge SAML authentication for Sunet Drive</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.sunet.se/swamid/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sunet.se/about-sunet/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv"> https://www.sunet.se/services/molnbaserade-tjanster/sunet-drive</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.sunet.se/services/molnbaserade-tjanster/sunet-drive</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.sunet.se/services/molnbaserade-tjanster/sunet-drive</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.sunet.se/services/molnbaserade-tjanster/sunet-drive</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFEzCCAvugAwIBAgIUfpoD91rElYtM1W4oRpuiB0FHe2UwDQYJKoZIhvcNAQEL
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUfpoD91rElYtM1W4oRpuiB0FHe2UwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjEwMTExMTQ0MDUzWhcN
 MzEwMTA5MTQ0MDUzWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL0CU4D+mQDn25wJuGY7ivDkAcAdO/JK
@@ -72,14 +74,14 @@ nFazsTrNSZlEGo3j2eQJF+jcoe/dBg/fTJkDpehuCObZ6KOCGBIiYSu6wISlbti9
 22/anTiScRCuw21MqOxtut6H0mYADVO5Wuz2FZXT0lBhzX+ncH1scfhY7Cjti0Gm
 8b11Xs4wmMWoykY6DXt1F86FyBJ0mXPcN6KoMTQR30/ZwzWg+FM0wErMgU0KtVpN
 803vVnQUPw==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFEzCCAvugAwIBAgIUfpoD91rElYtM1W4oRpuiB0FHe2UwDQYJKoZIhvcNAQEL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUfpoD91rElYtM1W4oRpuiB0FHe2UwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjEwMTExMTQ0MDUzWhcN
 MzEwMTA5MTQ0MDUzWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL0CU4D+mQDn25wJuGY7ivDkAcAdO/JK
@@ -107,13 +109,13 @@ nFazsTrNSZlEGo3j2eQJF+jcoe/dBg/fTJkDpehuCObZ6KOCGBIiYSu6wISlbti9
 22/anTiScRCuw21MqOxtut6H0mYADVO5Wuz2FZXT0lBhzX+ncH1scfhY7Cjti0Gm
 8b11Xs4wmMWoykY6DXt1F86FyBJ0mXPcN6KoMTQR30/ZwzWg+FM0wErMgU0KtVpN
 803vVnQUPw==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drive-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
-  </ns0:SPSSODescriptor>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drive-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
+  </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">SUNET</md:OrganizationName>
     <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>