From 8980ef6cdf7524e65c0fab34e15dc8c8694588cf Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 23 Sep 2013 12:30:59 +0200
Subject: resolves SWAMIDOPS-7030

---
 swamid-2.0/xenosmilus2.umdc.umu.se-8085-sp.xml | 132 ++++++++++++-------------
 1 file changed, 61 insertions(+), 71 deletions(-)

diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8085-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8085-sp.xml
index 5cd74287..8ffa9fb0 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8085-sp.xml
+++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8085-sp.xml
@@ -1,71 +1,61 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ns0:EntityDescriptor entityID="https://xenosmilus2.umdc.umu.se:8085/sp.xml"
-                      xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"
-                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-        <ns0:Extensions>
-            <ns1:DiscoveryResponse
-                    Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                    Location="https://xenosmilus2.umdc.umu.se:8085/disco"
-                    index="1"
-                    xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"/>
-        </ns0:Extensions>
-        <ns0:KeyDescriptor use="encryption">
-            <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-                <ns1:X509Data>
-                    <ns1:X509Certificate>
-                        MIICKzCCAZQCCQCZVwtv8r7oXjANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJT
-                        RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVU1VMQwwCgYDVQQLDANJVFMxIDAe
-                        BgNVBAMMF3hlbm9zbWlsdXMyLnVtZGMudW11LnNlMB4XDTEzMDkxMzA3MjExMloX
-                        DTE0MDkxMzA3MjExMlowWjELMAkGA1UEBhMCU0UxDTALBgNVBAcMBFVtZWExDDAK
-                        BgNVBAoMA1VNVTEMMAoGA1UECwwDSVRTMSAwHgYDVQQDDBd4ZW5vc21pbHVzMi51
-                        bWRjLnVtdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoymYoeJkOlWw
-                        Y1rXmo/P8VKOezpXntP+2rSdixZ4F/JcGOgZxBc1gsbJLyUu+A/Y6lCusH4TmxOh
-                        WJCpgiwKX4nods89vGUqtwKP03KC/lUsUMwUvFonp0CcpfSdJZ3M+Z/DlzcyP2Qo
-                        TGYD/r8x1BGlRCKyRAp3PtZ/73adKpkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBP
-                        RL2roJBDFHmZgeYcfytDwzd9qtPAxXa6L+6LAOneHVkpGHXk9n7a6OK4asZgiGpY
-                        PeWEQeDnxOFlTar3EYfiHXpViioEY54Yd5IYLbRExKQ1quXwIwuXcOv33qDkF4Uw
-                        FAfJRgDIpaqa7gS4cxa92oRqvoP3odwxc2tAad4B1A==
-                    </ns1:X509Certificate>
-                </ns1:X509Data>
-            </ns1:KeyInfo>
-        </ns0:KeyDescriptor>
-        <ns0:KeyDescriptor use="signing">
-            <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-                <ns1:X509Data>
-                    <ns1:X509Certificate>
-                        MIICKzCCAZQCCQCZVwtv8r7oXjANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJT
-                        RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVU1VMQwwCgYDVQQLDANJVFMxIDAe
-                        BgNVBAMMF3hlbm9zbWlsdXMyLnVtZGMudW11LnNlMB4XDTEzMDkxMzA3MjExMloX
-                        DTE0MDkxMzA3MjExMlowWjELMAkGA1UEBhMCU0UxDTALBgNVBAcMBFVtZWExDDAK
-                        BgNVBAoMA1VNVTEMMAoGA1UECwwDSVRTMSAwHgYDVQQDDBd4ZW5vc21pbHVzMi51
-                        bWRjLnVtdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoymYoeJkOlWw
-                        Y1rXmo/P8VKOezpXntP+2rSdixZ4F/JcGOgZxBc1gsbJLyUu+A/Y6lCusH4TmxOh
-                        WJCpgiwKX4nods89vGUqtwKP03KC/lUsUMwUvFonp0CcpfSdJZ3M+Z/DlzcyP2Qo
-                        TGYD/r8x1BGlRCKyRAp3PtZ/73adKpkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBP
-                        RL2roJBDFHmZgeYcfytDwzd9qtPAxXa6L+6LAOneHVkpGHXk9n7a6OK4asZgiGpY
-                        PeWEQeDnxOFlTar3EYfiHXpViioEY54Yd5IYLbRExKQ1quXwIwuXcOv33qDkF4Uw
-                        FAfJRgDIpaqa7gS4cxa92oRqvoP3odwxc2tAad4B1A==
-                    </ns1:X509Certificate>
-                </ns1:X509Data>
-            </ns1:KeyInfo>
-        </ns0:KeyDescriptor>
-        <ns0:SingleLogoutService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-                Location="https://xenosmilus2.umdc.umu.se:8085/slo"/>
-        <ns0:AssertionConsumerService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                Location="https://xenosmilus2.umdc.umu.se:8085" index="1"/>
-    </ns0:SPSSODescriptor>
-    <ns0:Organization>
-        <ns0:OrganizationName xml:lang="en">ITS, Umea University</ns0:OrganizationName>
-        <ns0:OrganizationDisplayName xml:lang="se">ITS@UMU</ns0:OrganizationDisplayName>
-        <ns0:OrganizationDisplayName xml:lang="en">ITS@UMU</ns0:OrganizationDisplayName>
-        <ns0:OrganizationURL xml:lang="en">http://www.its.umu.se/roland</ns0:OrganizationURL>
-    </ns0:Organization>
-    <ns0:ContactPerson contactType="technical">
-        <ns0:GivenName>Roland</ns0:GivenName>
-        <ns0:SurName>Hedberg</ns0:SurName>
-        <ns0:EmailAddress>roland.hedberg@umu.se</ns0:EmailAddress>
-    </ns0:ContactPerson>
-</ns0:EntityDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://xenosmilus2.umdc.umu.se:8085/sp.xml">
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8085/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
+        <ns1:X509Data>
+          <ns1:X509Certificate>
+                        MIICKzCCAZQCCQCZVwtv8r7oXjANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJT
+                        RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVU1VMQwwCgYDVQQLDANJVFMxIDAe
+                        BgNVBAMMF3hlbm9zbWlsdXMyLnVtZGMudW11LnNlMB4XDTEzMDkxMzA3MjExMloX
+                        DTE0MDkxMzA3MjExMlowWjELMAkGA1UEBhMCU0UxDTALBgNVBAcMBFVtZWExDDAK
+                        BgNVBAoMA1VNVTEMMAoGA1UECwwDSVRTMSAwHgYDVQQDDBd4ZW5vc21pbHVzMi51
+                        bWRjLnVtdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoymYoeJkOlWw
+                        Y1rXmo/P8VKOezpXntP+2rSdixZ4F/JcGOgZxBc1gsbJLyUu+A/Y6lCusH4TmxOh
+                        WJCpgiwKX4nods89vGUqtwKP03KC/lUsUMwUvFonp0CcpfSdJZ3M+Z/DlzcyP2Qo
+                        TGYD/r8x1BGlRCKyRAp3PtZ/73adKpkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBP
+                        RL2roJBDFHmZgeYcfytDwzd9qtPAxXa6L+6LAOneHVkpGHXk9n7a6OK4asZgiGpY
+                        PeWEQeDnxOFlTar3EYfiHXpViioEY54Yd5IYLbRExKQ1quXwIwuXcOv33qDkF4Uw
+                        FAfJRgDIpaqa7gS4cxa92oRqvoP3odwxc2tAad4B1A==
+                    </ns1:X509Certificate>
+        </ns1:X509Data>
+      </ns1:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
+        <ns1:X509Data>
+          <ns1:X509Certificate>
+                        MIICKzCCAZQCCQCZVwtv8r7oXjANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJT
+                        RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVU1VMQwwCgYDVQQLDANJVFMxIDAe
+                        BgNVBAMMF3hlbm9zbWlsdXMyLnVtZGMudW11LnNlMB4XDTEzMDkxMzA3MjExMloX
+                        DTE0MDkxMzA3MjExMlowWjELMAkGA1UEBhMCU0UxDTALBgNVBAcMBFVtZWExDDAK
+                        BgNVBAoMA1VNVTEMMAoGA1UECwwDSVRTMSAwHgYDVQQDDBd4ZW5vc21pbHVzMi51
+                        bWRjLnVtdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoymYoeJkOlWw
+                        Y1rXmo/P8VKOezpXntP+2rSdixZ4F/JcGOgZxBc1gsbJLyUu+A/Y6lCusH4TmxOh
+                        WJCpgiwKX4nods89vGUqtwKP03KC/lUsUMwUvFonp0CcpfSdJZ3M+Z/DlzcyP2Qo
+                        TGYD/r8x1BGlRCKyRAp3PtZ/73adKpkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBP
+                        RL2roJBDFHmZgeYcfytDwzd9qtPAxXa6L+6LAOneHVkpGHXk9n7a6OK4asZgiGpY
+                        PeWEQeDnxOFlTar3EYfiHXpViioEY54Yd5IYLbRExKQ1quXwIwuXcOv33qDkF4Uw
+                        FAfJRgDIpaqa7gS4cxa92oRqvoP3odwxc2tAad4B1A==
+                    </ns1:X509Certificate>
+        </ns1:X509Data>
+      </ns1:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8085/slo"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8085" index="1"/>
+  </ns0:SPSSODescriptor>
+  <ns0:Organization>
+    <ns0:OrganizationName xml:lang="en">ITS, Umea University</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="se">ITS@UMU</ns0:OrganizationDisplayName>
+    <ns0:OrganizationDisplayName xml:lang="en">ITS@UMU</ns0:OrganizationDisplayName>
+    <ns0:OrganizationURL xml:lang="en">http://www.its.umu.se/roland</ns0:OrganizationURL>
+  </ns0:Organization>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:GivenName>Roland</ns0:GivenName>
+    <ns0:SurName>Hedberg</ns0:SurName>
+    <ns0:EmailAddress>roland.hedberg@umu.se</ns0:EmailAddress>
+  </ns0:ContactPerson>
+</ns0:EntityDescriptor>
-- 
cgit v1.2.3