1 files changed, 37 insertions, 54 deletions
diff --git a/nya-1.0/nb10.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nb10.ladok.umu.se-shibboleth-idp.xml
index db52c4d8..2480663f 100644
--- a/nya-1.0/nb10.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nb10.ladok.umu.se-shibboleth-idp.xml
@@ -1,60 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="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://nb10.ladok.umu.se/shibboleth-idp">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDjCCAfagAwIBAgIJAMpOmLHAAQ5bMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0xMDAyMTExNTIyMzRaFw0yMDAyMDkxNTIyMzRaMA4xDDAKBgNVBAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOp/Esl7gtsEeVP2c6s4HRMdLiy17FiqnVUShnaHIKtjXXxvWjBFvPcyKTyQeFxT9Kg1TjTrUed4DSnxefb7xPy/KqryfbheBzHbuLnEuv9EoMsOHbLvNY/FMFUidPcZhvpQq9yydpS62UY41EHDasywndoImIfvda5frHBTAs8+DlXPvHUWKsIFGssw5WCx5KpGspWgfWTlAVLAEA5EaDKKGhjRb+PgzVyjCLK6umrsOUhCcorC7c3Fp+aFJW0pO3wNGguUoLObJ4yazpENvuWQGUpfWFpS5E1jSeHqu66VYH+iFBxiP6PZ/Ikd2u+XT0Aj+9ye7cknD+LKXoLvCYECAwEAAaNvMG0wHQYDVR0OBBYEFIW+FvQoNa3MdXkHiigNh+ZyLhajMD4GA1UdIwQ3MDWAFIW+FvQoNa3MdXkHiigNh+ZyLhajoRKkEDAOMQwwCgYDVQQDEwNpZHCCCQDKTpixwAEOWzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfKIYeeE+X7YNbIp2NKTuR2wSgPT3j3iGXzQ9RXf+ntZVes4WNZaGx3aEG1C7Ku96CgGoewngvwM4cWMECTRTX82lWCK3ef4/Ds3uoqb/nDw+pz1UZcgyhyurfPyhPbvHxkpT19X+2MQovgYvtBLMeAqzjmYI+wWoWT/+i6blv81nEOLhR/V95KXSlzxcNVCBMM5p5AjohFT/XcaGM8X7oYT+pUcFmaLX4F5UbwIIMjvDmZSK10Ms9U+sIBTWbcW43m81wFA/xDPJ5/jTo3jF5J5nS9Uncn4asFYAPZcouSXzQO3nwrMWMvBv23STOgMvnb74zI630Rc6p3QJzP3EM
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-                                   
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDjCCAfagAwIBAgIJAMpOmLHAAQ5bMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0xMDAyMTExNTIyMzRaFw0yMDAyMDkxNTIyMzRaMA4xDDAKBgNVBAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOp/Esl7gtsEeVP2c6s4HRMdLiy17FiqnVUShnaHIKtjXXxvWjBFvPcyKTyQeFxT9Kg1TjTrUed4DSnxefb7xPy/KqryfbheBzHbuLnEuv9EoMsOHbLvNY/FMFUidPcZhvpQq9yydpS62UY41EHDasywndoImIfvda5frHBTAs8+DlXPvHUWKsIFGssw5WCx5KpGspWgfWTlAVLAEA5EaDKKGhjRb+PgzVyjCLK6umrsOUhCcorC7c3Fp+aFJW0pO3wNGguUoLObJ4yazpENvuWQGUpfWFpS5E1jSeHqu66VYH+iFBxiP6PZ/Ikd2u+XT0Aj+9ye7cknD+LKXoLvCYECAwEAAaNvMG0wHQYDVR0OBBYEFIW+FvQoNa3MdXkHiigNh+ZyLhajMD4GA1UdIwQ3MDWAFIW+FvQoNa3MdXkHiigNh+ZyLhajoRKkEDAOMQwwCgYDVQQDEwNpZHCCCQDKTpixwAEOWzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfKIYeeE+X7YNbIp2NKTuR2wSgPT3j3iGXzQ9RXf+ntZVes4WNZaGx3aEG1C7Ku96CgGoewngvwM4cWMECTRTX82lWCK3ef4/Ds3uoqb/nDw+pz1UZcgyhyurfPyhPbvHxkpT19X+2MQovgYvtBLMeAqzjmYI+wWoWT/+i6blv81nEOLhR/V95KXSlzxcNVCBMM5p5AjohFT/XcaGM8X7oYT+pUcFmaLX4F5UbwIIMjvDmZSK10Ms9U+sIBTWbcW43m81wFA/xDPJ5/jTo3jF5J5nS9Uncn4asFYAPZcouSXzQO3nwrMWMvBv23STOgMvnb74zI630Rc6p3QJzP3EM
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor> 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
 </EntityDescriptor>