From 02468ca561ec678fe7337c207e950337298eda1a Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Thu, 28 Apr 2016 14:46:48 +0200
Subject: Partial resolve SWAMIDOPS-8161

---
 swamid-2.0/dev.play.sunet.se.xml                  | 6 +++---
 swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml | 9 ---------
 swamid-2.0/idp.suni.se-adfs-services-trust.xml    | 9 +++++++++
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/dev.play.sunet.se.xml b/swamid-2.0/dev.play.sunet.se.xml
index fdba3dcb..2c3651ed 100644
--- a/swamid-2.0/dev.play.sunet.se.xml
+++ b/swamid-2.0/dev.play.sunet.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://dev.play.sunet.se">
   <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -10,14 +10,14 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDCzCCAfOgAwIBAgIJAM6cAbenLwkNMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMMEXBsYXktZGV2LnN1bmV0LnNlMB4XDTE2MDQyMjE0NTEwN1oXDTE2MDUyMjE0NTEwN1owHDEaMBgGA1UEAwwRcGxheS1kZXYuc3VuZXQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjYsiB4A6wGU1HU8KbpdUcrUo8SA8M5R4SSUTQ3vMzSLOZdQTRACvPCYyLI+oOdK92wvHao+qE9QRUB6XmIodJAcfVglEMsn5no0k7rpsU1I/Hn+v0yUmd9M8W7Q1x0/O5kCjpzNGmdjscJKbgwm7RIKsA5yW+2pVcIabQ4wlvEyswcpPlUJ92lkyb98Ktnu/0aNvqGyiwQfVy8rJobyQjstNc2/OClBhs47ysnLl3SkrLMw6X7yKHuzVVVzb7k5QR/f5QTj1oTC7FN523qNzAMdS9GxETbMWIVB9qKSt7tOO/gYsbMagicDU5wJVOdc9vLB9amQiTazKkV4b3kvilAgMBAAGjUDBOMB0GA1UdDgQWBBQJlJjqCHSa6FwbUm6u65YxPP9P1zAfBgNVHSMEGDAWgBQJlJjqCHSa6FwbUm6u65YxPP9P1zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBamlrOqIAiDIqbHrca17Kp3J6m+3+LbPs6h4aD5yjtrx76bOfCgI+HpP/dYrD4PWGxzMnPB1mt+0JBBWkbfKvZchMsMo2OXsQtEUt0X1iAFwbi55uxaaFVg91IEfDz1ZZkNLBOmxZHAJ3z+LCaTCdvjCH/E+HW2tK1PGZKVGOw3bqv9ViYRkbCf2aEkxqhvrxP8Hp+IPQ1QAju5NkB1BStwzdxxn6wPBLi8vRldahUTD2WorTVs9+5C9nnHDl5BpCTimujjHteojJnIkY+Icydje8T9OoFGFV0SEfsyQHEALgruEGGLEXUoEHEiZNovDQguJGjg4OAA8xSlNUp8g2U</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDCzCCAfOgAwIBAgIJAM6cAbenLwkNMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMMEXBsYXktZGV2LnN1bmV0LnNlMB4XDTE2MDQyMjE0NTEwN1oXDTE2MDUyMjE0NTEwN1owHDEaMBgGA1UEAwwRcGxheS1kZXYuc3VuZXQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjYsiB4A6wGU1HU8KbpdUcrUo8SA8M5R4SSUTQ3vMzSLOZdQTRACvPCYyLI+oOdK92wvHao+qE9QRUB6XmIodJAcfVglEMsn5no0k7rpsU1I/Hn+v0yUmd9M8W7Q1x0/O5kCjpzNGmdjscJKbgwm7RIKsA5yW+2pVcIabQ4wlvEyswcpPlUJ92lkyb98Ktnu/0aNvqGyiwQfVy8rJobyQjstNc2/OClBhs47ysnLl3SkrLMw6X7yKHuzVVVzb7k5QR/f5QTj1oTC7FN523qNzAMdS9GxETbMWIVB9qKSt7tOO/gYsbMagicDU5wJVOdc9vLB9amQiTazKkV4b3kvilAgMBAAGjUDBOMB0GA1UdDgQWBBQJlJjqCHSa6FwbUm6u65YxPP9P1zAfBgNVHSMEGDAWgBQJlJjqCHSa6FwbUm6u65YxPP9P1zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBamlrOqIAiDIqbHrca17Kp3J6m+3+LbPs6h4aD5yjtrx76bOfCgI+HpP/dYrD4PWGxzMnPB1mt+0JBBWkbfKvZchMsMo2OXsQtEUt0X1iAFwbi55uxaaFVg91IEfDz1ZZkNLBOmxZHAJ3z+LCaTCdvjCH/E+HW2tK1PGZKVGOw3bqv9ViYRkbCf2aEkxqhvrxP8Hp+IPQ1QAju5NkB1BStwzdxxn6wPBLi8vRldahUTD2WorTVs9+5C9nnHDl5BpCTimujjHteojJnIkY+Icydje8T9OoFGFV0SEfsyQHEALgruEGGLEXUoEHEiZNovDQguJGjg4OAA8xSlNUp8g2U</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
index 19873aae..fdec7017 100644
--- a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
@@ -629,15 +629,6 @@
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns="" regexp="false">suni.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Södertörns högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Södertörn University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Södertörns högskola.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Södertörn University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sh.se/p3/ext/content.nsf/aget?openagent&amp;key=startsideportal_engelsk_1308725461229</mdui:InformationURL>
-        <mdui:Logo height="100" width="100">https://www.sh.se/p3/ext/res.nsf/vRes/global_1448973984543_sh_ny_logo_eng_png/$File/sh-ny-logo-eng.png</mdui:Logo>
-      </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/idp.suni.se-adfs-services-trust.xml b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
index bbb025b1..12d50c60 100644
--- a/swamid-2.0/idp.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
@@ -6,6 +6,15 @@
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">suni.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Södertörns högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Södertörn University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Södertörns högskola.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Södertörn University.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.sh.se/p3/ext/content.nsf/aget?openagent&amp;key=startsideportal_engelsk_1308725461229</mdui:InformationURL>
+        <mdui:Logo height="100" width="100">https://www.sh.se/p3/ext/res.nsf/vRes/global_1448973984543_sh_ny_logo_eng_png/$File/sh-ny-logo-eng.png</mdui:Logo>
+      </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-- 
cgit v1.2.3