From e44e91700f2766bd990d386a9681d822dbaf0f3c Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Wed, 29 Jun 2022 08:52:39 +0200
Subject: SWAMID-1118 SWAMID-1119 SWAMID-1120 Updated
 artisan-idp-proxy.sunet.se zoom-saas-idp-proxy.sunet.se
 drive-idp-proxy.sunet.se

---
 swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml   | 88 +++++++++++++------------
 swamid-2.0/drive-idp-proxy.sunet.se-sp.xml     | 90 +++++++++++++-------------
 swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml | 90 +++++++++++++++-----------
 3 files changed, 146 insertions(+), 122 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml b/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml
index c38b86b1..1468128b 100644
--- a/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml
@@ -6,15 +6,13 @@
     </mdrpi:RegistrationInfo>
     <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://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+        <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>
-      <ns2:DiscoveryResponse xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://artisan-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://artisan-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">SUNET SURVEY PROXY</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">SUNET SURVEY PROXY</mdui:DisplayName>
@@ -22,12 +20,16 @@
         <mdui:Description xml:lang="en">SUNET SURVEY PROXY</mdui:Description>
         <mdui:Logo xml:lang="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://www.sunet.se/services/samverkan/enkatverktyg</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.sunet.se/services/samverkan/enkatverktyg</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.sunet.se/services/samverkan/enkatverktyg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.sunet.se/services/samverkan/enkatverktyg</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>MIIFEzCCAvugAwIBAgIUBGH1vtek1NlSdBt0H5KzT7TQmOMwDQYJKoZIhvcNAQEL
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUBGH1vtek1NlSdBt0H5KzT7TQmOMwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjAwOTExMTA0MTIzWhcN
 MzAwOTA5MTA0MTIzWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMGrD/R6GNn0kxan4EH78Ka8wAE6K+EF
@@ -55,14 +57,14 @@ lEelRdbYl8IvJNSLwcAxwYTwKZT6fN/lXVdSFHk7ZRp134DyevJ2IjO8u1hwCyBy
 pIAKcO/5NatCLyQJvBwWy9glqABeu3Wg/YWAwR7IAmFH0Eav93pUSTbtTxdvA5Ts
 OviEv96zT8eXdIeBMUt+hAPSoJh/iy6nZheR00UfugrWd8QcEEPwS5VG1TvUFriS
 TXlRPha6EA==
-</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>MIIFEzCCAvugAwIBAgIUBGH1vtek1NlSdBt0H5KzT7TQmOMwDQYJKoZIhvcNAQEL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUBGH1vtek1NlSdBt0H5KzT7TQmOMwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjAwOTExMTA0MTIzWhcN
 MzAwOTA5MTA0MTIzWjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
 KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMGrD/R6GNn0kxan4EH78Ka8wAE6K+EF
@@ -90,25 +92,31 @@ lEelRdbYl8IvJNSLwcAxwYTwKZT6fN/lXVdSFHk7ZRp134DyevJ2IjO8u1hwCyBy
 pIAKcO/5NatCLyQJvBwWy9glqABeu3Wg/YWAwR7IAmFH0Eav93pUSTbtTxdvA5Ts
 OviEv96zT8eXdIeBMUt+hAPSoJh/iy6nZheR00UfugrWd8QcEEPwS5VG1TvUFriS
 TXlRPha6EA==
-</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://artisan-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://artisan-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">SUNET Survey</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">SUNET Survey</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</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://artisan-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SUNET</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>SUNET NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@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 contactType="administrative">
+    <md:GivenName>SUNET NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
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>
diff --git a/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml b/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml
index cd687ee2..9ded463b 100644
--- a/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml
@@ -6,20 +6,28 @@
     </mdrpi:RegistrationInfo>
     <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://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <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>
-      <ns2:DiscoveryResponse xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://zoom-saas-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFBTCCAu2gAwIBAgIJAPSHarYbYh/jMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
+  <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://zoom-saas-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">SUNET Zoom Proxy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SUNET Zoom Proxy</mdui:Description>
+        <mdui:Description xml:lang="sv">SUNET Zoom Proxy</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">SUNET Zoom Proxy</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.sunet.se/services/samarbete/emote</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.sunet.se/services/samarbete/emote</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en"> https://www.sunet.se/services/samarbete/emote</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv"> https://www.sunet.se/services/samarbete/emote</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIJAPSHarYbYh/jMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
 BAMMDnNhdG9zYV9iYWNrZW5kMB4XDTE3MDgyOTA4MTU0NFoXDTI3MDgyNzA4MTU0
 NFowGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwggIiMA0GCSqGSIb3DQEBAQUA
 A4ICDwAwggIKAoICAQCdP/NkGz/PXwB+vN9qgaEXkyKIKUXsesQFv0tx9ivrr9vW
@@ -46,14 +54,14 @@ ZHmcDHEOnUQ6oSlXbWhAOOUQw+0z+RQLYbkK5AMFmUqLEYKIgx6asdxUtvwf4PxQ
 6xHYyip9FvJ5GQcwNQpJ06xDeBi5D9wJ8/N2E6LV+7y5prqVvYWQCs5jCEJ+FSWH
 5slPKSklNu3s4Ul4D6pqU32243+LNROyRaUuy3wXDfLiZLQa17QAhlim6RWpaplq
 Mxe0+tX0hEXUAHD3qoocrc5Nn5gXeDpmZA4Ik8dtzyPj8AkGUtekHt8=
-</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>MIIFBTCCAu2gAwIBAgIJAPSHarYbYh/jMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIJAPSHarYbYh/jMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
 BAMMDnNhdG9zYV9iYWNrZW5kMB4XDTE3MDgyOTA4MTU0NFoXDTI3MDgyNzA4MTU0
 NFowGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwggIiMA0GCSqGSIb3DQEBAQUA
 A4ICDwAwggIKAoICAQCdP/NkGz/PXwB+vN9qgaEXkyKIKUXsesQFv0tx9ivrr9vW
@@ -80,24 +88,30 @@ ZHmcDHEOnUQ6oSlXbWhAOOUQw+0z+RQLYbkK5AMFmUqLEYKIgx6asdxUtvwf4PxQ
 6xHYyip9FvJ5GQcwNQpJ06xDeBi5D9wJ8/N2E6LV+7y5prqVvYWQCs5jCEJ+FSWH
 5slPKSklNu3s4Ul4D6pqU32243+LNROyRaUuy3wXDfLiZLQa17QAhlim6RWpaplq
 Mxe0+tX0hEXUAHD3qoocrc5Nn5gXeDpmZA4Ik8dtzyPj8AkGUtekHt8=
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zoom-saas-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zoom-saas-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">SUNET Zoom</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">SUNET Zoom</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zoom-saas-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SUNET</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>Technical</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SUNET</md:GivenName>
+    <md:EmailAddress>mailto:info@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3