registrationAuthority added to all xml files in swamid-2.0/

xml files normalized, the same way later done during generation om
metadata streams (namespaces, cleaning etc)

1 files changed, 13 insertions, 10 deletions

diff --git a/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml b/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
index 2687b689..eef2509c 100644
--- a/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" 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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://samltest.swamid.se/re_nren_sfs/sp.xml">
-  <ns0:Extensions>
-    <ns1:EntityAttributes>
-      <ns2:Attribute Name="http://macedir.org/entity-category">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samltest.swamid.se/re_nren_sfs/sp.xml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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 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>
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
-  </ns0:Extensions>
-  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  </md:Extensions>
+  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" 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://samltest.swamid.se/disco" index="1"/>
+      <ns4:DiscoveryResponse xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/>
     </ns0:Extensions>
     <ns0:KeyDescriptor use="encryption">
-      <ns5:KeyInfo>
+      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
         <ns5:X509Data>
           <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -51,7 +54,7 @@ u3Qzm3Q=
       </ns5:KeyInfo>
     </ns0:KeyDescriptor>
     <ns0:KeyDescriptor use="signing">
-      <ns5:KeyInfo>
+      <ns5:KeyInfo xmlns:ns5="http://www.w3.org/2000/09/xmldsig#">
         <ns5:X509Data>
           <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -90,4 +93,4 @@ u3Qzm3Q=
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/re_nren_sfs/redirect" index="1"/>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/re_nren_sfs/post" index="2"/>
   </ns0:SPSSODescriptor>
-</ns0:EntityDescriptor>
+</md:EntityDescriptor>