From f4a355640272f851abc6d4cc5d27bff030c2ea74 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 31 Oct 2017 09:39:02 +0100
Subject: Resolves SWAMIDOPS-227

---
 swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml            | 15 ++++++---------
 swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml |  4 ++--
 swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml      | 11 +++++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
index 7a0d7e99..a61e1a29 100644
--- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -6,19 +6,16 @@
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
       </saml:Attribute>
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
       <shibmd:Scope regexp="false">kth.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (ny)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology (new)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för KTH (ny)</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for KTH (new)</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
         <mdui:Logo height="225" width="225">https://saml-5.sys.kth.se/idp/images/logo.png</mdui:Logo>
@@ -138,8 +135,8 @@ jmufPg==
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (ny)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (new)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.kth.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml b/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
index d02e4ecc..6306fe2b 100644
--- a/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
@@ -43,8 +43,8 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://siths-idp.sunet.se/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SITHS Login (via SUNET)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SITHS Login (via SUNET)</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">SITHS Login (SUNET)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SITHS Login (SUNET)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
index d4ac81b2..5c809c51 100644
--- a/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
@@ -6,14 +6,17 @@
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
       </saml:Attribute>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
       <shibmd:Scope regexp="false">kth.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (old)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology (old)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
@@ -134,8 +137,8 @@ f0LwMg==
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (old)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (old)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.kth.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
-- 
cgit v1.2.3