Merge branch 'master' of md-master.swamid.se:swamid-metadata

1 files changed, 40 insertions, 48 deletions

diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml
index ec9723a7..2e95fe13 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml
+++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml
@@ -1,62 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://xenosmilus2.umdc.umu.se:8086/re_nren/sp.xml">
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" entityID="https://xenosmilus2.umdc.umu.se:8086/re_nren/sp.xml">
   <ns0:Extensions>
-    <ns1:EntityAttributes>
-      <ns2:Attribute Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
-        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
+    <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
+      <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
   </ns0:Extensions>
   <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <ns0:Extensions>
-      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8086/disco" index="1"/>
+      <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:8086/disco" index="1"/>
     </ns0:Extensions>
     <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo>
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
-BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
-EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
-MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l
-YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw
-DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7
-bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC
-FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR
-mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW
-BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9
-o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW
-BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE
-AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO
-zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
-+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
+        <ns1:X509Data>
+          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
+RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
+BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
+NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
+CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
+c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
+vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
+R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
+VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
+Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
+FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
+aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
+</ns1:X509Certificate>
+        </ns1:X509Data>
+      </ns1:KeyInfo>
     </ns0:KeyDescriptor>
     <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo>
-        <ns5:X509Data>
-          <ns5:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
-BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
-EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
-MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l
-YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw
-DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7
-bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC
-FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR
-mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW
-BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9
-o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW
-BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE
-AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO
-zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
-+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
-</ns5:X509Certificate>
-        </ns5:X509Data>
-      </ns5:KeyInfo>
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
+        <ns1:X509Data>
+          <ns1:X509Certificate>MIICIzCCAYwCCQDFqR2p3amCSjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJT
+RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVW1VMQwwCgYDVQQLDANJVFMxHDAa
+BgNVBAMME2xpbmdvbi5sYWRvay51bXUuc2UwHhcNMTMwNjE0MTY1MjAyWhcNMTQw
+NjE0MTY1MjAyWjBWMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEMMAoGA1UE
+CgwDVW1VMQwwCgYDVQQLDANJVFMxHDAaBgNVBAMME2xpbmdvbi5sYWRvay51bXUu
+c2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8nCb97J2QNi/U+4EnR2vL/
+vGtUM44dyOrdQ4xdD/feHyu0kWoNal/8CXJTYtDVrbKMg90fakPfw6Lw5KxQTzGl
+R6qNRyuuMq7KIgRzlbZEWiAh1YKQMOn+C3qIM0HqkfjD/rnCokIpFhGFi+7886AD
+VNB5CnUQXrSTAkUJzVS7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEABfQAzyDkwIQZ
+Hu3tPi7QvJbdTDH8F3q8iSQwOT7MvxmHmCO/DZFwYu5jjYg/FtBfpbh8mQTziCy8
+FyVMuMKNSZn2rEIJF1ghgQqtHwn08zsPPhD9XW0LXeP6Exl/xIguWJElU9JzmPU6
+aZOix3ahmr0PwcIhFbWaZvsjL46MdHI=
+</ns1:X509Certificate>
+        </ns1:X509Data>
+      </ns1:KeyInfo>
     </ns0:KeyDescriptor>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re_nren/redirect" index="1"/>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8086/acs/re_nren/post" index="2"/>