1 files changed, 38 insertions, 70 deletions
diff --git a/swamid-1.0/kiidp.ki.se.xml b/swamid-1.0/kiidp.ki.se.xml
index cc5cf91c..2348f570 100644
--- a/swamid-1.0/kiidp.ki.se.xml
+++ b/swamid-1.0/kiidp.ki.se.xml
@@ -1,19 +1,13 @@
-<md:EntityDescriptor entityID="https://kiidp.ki.se/idp/shibboleth"
-                  xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <md:Extensions>
-            <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-        </md:Extensions>
-
-        <md:KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+<?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#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://kiidp.ki.se/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
 MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
@@ -33,44 +27,26 @@ y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
 uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
 
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        
-        <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
-
-        <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
-                                   
-        <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-        <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-
-        <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
-                             Location="https://kiidp.ki.se/idp/profile/Shibboleth/SSO" />
-        
-        <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://kiidp.ki.se/idp/profile/SAML2/POST/SSO" />
-
-        <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://kiidp.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-        
-        <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://kiidp.ki.se/idp/profile/SAML2/Redirect/SSO" />
-    </md:IDPSSODescriptor>
-
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <md:Extensions>
-            <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-        </md:Extensions>
-
-        <md:KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://kiidp.ki.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kiidp.ki.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kiidp.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kiidp.ki.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
 MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
@@ -90,21 +66,14 @@ y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
 uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
 
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-
-        <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-        
-        <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
-        
-        <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-        <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-        
-    </md:AttributeAuthorityDescriptor>
-
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
@@ -114,5 +83,4 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
     <md:Company>Karolinska Institutet</md:Company>
     <md:EmailAddress>it-support@ki.se</md:EmailAddress>
   </md:ContactPerson>
-    
 </md:EntityDescriptor>