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

Conflicts:
	swamid-1.0/shib-idp-1.oru.se.xml

1 files changed, 37 insertions, 55 deletions

diff --git a/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
index b92e8add..6d80c904 100644
--- a/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-23.ladok.umu.se-dw-idp.xml
@@ -1,61 +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://nya-23.ladok.umu.se/dw-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">dwidp.antagning.se</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">dwidp.antagning.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIBtDCCAV6gAwIBAgIJAPkNu9nfbuv+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKdyYxYzV4/VDqu1Bh2J9L0mLTK19mFoEB8weD4BkfrY9n5eWdj/Bi9Z2TClc0skklXEpDslfLSULzT0pmZBi+MCAwEAAaN/MH0wHQYDVR0OBBYEFIP+RaLMX112/GIHZF0kTGb2D5wgME4GA1UdIwRHMEWAFIP+RaLMX112/GIHZF0kTGb2D5wgoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkA+Q272d9u6/4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACjaukCBcwceeqDd72YlgLdiNMAgQRx4lLXfIV8TMGaoHmEOoA43OLhqd5xP3In+y09fVfnocnTKxsC/u3jqa/w=
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/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://nya-23.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:451/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">dwidp.antagning.se</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://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/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://nya-23.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:451/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">dwidp.antagning.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIBtDCCAV6gAwIBAgIJAPkNu9nfbuv+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM4WhcNMjEwMjI3MTYyODM4WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKdyYxYzV4/VDqu1Bh2J9L0mLTK19mFoEB8weD4BkfrY9n5eWdj/Bi9Z2TClc0skklXEpDslfLSULzT0pmZBi+MCAwEAAaN/MH0wHQYDVR0OBBYEFIP+RaLMX112/GIHZF0kTGb2D5wgME4GA1UdIwRHMEWAFIP+RaLMX112/GIHZF0kTGb2D5wgoSKkIDAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlggkA+Q272d9u6/4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBACjaukCBcwceeqDd72YlgLdiNMAgQRx4lLXfIV8TMGaoHmEOoA43OLhqd5xP3In+y09fVfnocnTKxsC/u3jqa/w=
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/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://nya-23.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:8450/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>