Merge branch 'master' of git.swamid.se:swamid-metadatamd-2024-09-26-v04

2 files changed, 8 insertions, 12 deletions

diff --git a/metadata/swamid-2.0/acc.nais.uhr.se-shibboleth.xml b/metadata/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
index 84f59909..5f36698f 100644
--- a/metadata/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
@@ -26,7 +26,7 @@
       </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 urn:oasis:names:tc:SAML:1.0:protocol">
+  <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://acc.nais.uhr.se/Shibboleth.sso/DS/ds.swamid.se"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://acc.nais.uhr.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -40,8 +40,8 @@
         <mdui:InformationURL xml:lang="en">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/nationellt-administrations--och-informationssystem-for-samordnare-nais/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://nais.uhr.se/About/PrivacyPolicy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://nais.uhr.se/About/PrivacyPolicy</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="83" width="83">https://nyaanvandarstod.uhr.se/globalassets/uhr_symbol_lila.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="83" width="83">https://nyaanvandarstod.uhr.se/globalassets/uhr_symbol_lila.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="83" width="83">https://uhrporten.se/contentassets/709bda3867484b9fbbf51064ea8363b8/uhr-logo-rgb.svg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="83" width="83">https://uhrporten.se/contentassets/709bda3867484b9fbbf51064ea8363b8/uhr-logo-rgb.svg</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -70,8 +70,7 @@ ZtQcfGqTe/ZIUM0Mw73meEhGol9+B52ZLACzYIHa166hDCbJ8uiVoQ61N8sszu6X
 ejOxH6e/oomGwI5qbP5A+y0M/sZCY6OxAYhZUd1WHJLXfFPshBItPWz8AOqti8GT
 JautiDRCRLi5YsyeWEjI5RUT0gJZLlgSiLE+dddDoOXU6535OJBQ/CqVS6muoAuQ
 SBdbsATbOt1cwjyvaD+I0+zxwit4Gg/6l7ENBqrREIFYKa0IyFGjAJbJMlAIg13k
-hqj4vsnmj5P2D3MHXocrWkPzxg==
-</ds:X509Certificate>
+hqj4vsnmj5P2D3MHXocrWkPzxg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -96,8 +95,6 @@ hqj4vsnmj5P2D3MHXocrWkPzxg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acc.nais.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acc.nais.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acc.nais.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acc.nais.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc.nais.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">NaisAcc</md:ServiceName>
       <md:ServiceName xml:lang="sv">NaisAcc</md:ServiceName>
diff --git a/metadata/swamid-2.0/www.nais.uhr.se-shibboleth.xml b/metadata/swamid-2.0/www.nais.uhr.se-shibboleth.xml
index e24d19ce..95f8a999 100644
--- a/metadata/swamid-2.0/www.nais.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/www.nais.uhr.se-shibboleth.xml
@@ -26,7 +26,7 @@
       </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 urn:oasis:names:tc:SAML:1.0:protocol">
+  <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://www.nais.uhr.se/Shibboleth.sso/StudentLogin"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.nais.uhr.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -40,8 +40,8 @@
         <mdui:InformationURL xml:lang="en">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/nationellt-administrations--och-informationssystem-for-samordnare-nais/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://nais.uhr.se/About/PrivacyPolicy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://nais.uhr.se/About/PrivacyPolicy</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="83" width="83">https://nyaanvandarstod.uhr.se/globalassets/uhr_symbol_lila.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="83" width="83">https://nyaanvandarstod.uhr.se/globalassets/uhr_symbol_lila.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="83" width="83">https://uhrporten.se/contentassets/709bda3867484b9fbbf51064ea8363b8/uhr-logo-rgb.svg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="83" width="83">https://uhrporten.se/contentassets/709bda3867484b9fbbf51064ea8363b8/uhr-logo-rgb.svg</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -65,8 +65,7 @@ yopwPtwz9KseMSJvoQgcW+UuSXJgTEQmrkD6hJJhcZZpFSqAt9cNfbrXY6m5YDHj
 WBGYLC1USzLHiC1LP73IbiATvEPi8r3jS1Vm/Sg82bkkxbSXMkN3GmxjvKpFZkZH
 Fpgh9wz7R/qlZTrKGWoBsIApiSNJB4BBMc8AaaF6v26IZy2FsFhXQjX7fHG5OpIZ
 ABP8HAePligOwIdfjCyp+kw/tvzVOE6mcGZUibXvNXBSnQoykuV8dPZe4yWzpbzg
-MViWUqDxKicGyuokDNf3hpcc9w==
-</ds:X509Certificate>
+MViWUqDxKicGyuokDNf3hpcc9w==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>