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

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

1 files changed, 39 insertions, 70 deletions

diff --git a/swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml
index f122abb1..5585d686 100644
--- a/swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml
+++ b/swamid-1.0/ladok3-04.ladok.umu.se-user-idp.xml
@@ -1,74 +1,43 @@
-<EntityDescriptor entityID="https://ladok3-04.ladok.umu.se/user-idp"
-                  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">
-
-    <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">ladok3.ladok.umu.se</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+<?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://ladok3-04.ladok.umu.se/user-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">ladok3.ladok.umu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIBizCCATWgAwIBAgIJANPLS0K54P4ZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA5WhcNMjIwNjI3MTIwODA5WjAhMR8wHQYDVQQDDBZsYWRvazMtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANOhkVrIMMyWE8pChmHiDLxFaaThCHTUoXktWxcmjgDqJi+IFgmpF3YvY464fC01Cce2LkPFRmcPzlNGu45jsrkCAwEAAaNQME4wHQYDVR0OBBYEFJUxbkgsfPkTFfSGA5D/VVdRRC6IMB8GA1UdIwQYMBaAFJUxbkgsfPkTFfSGA5D/VVdRRC6IMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIV9Cl+cn1VGu93W/RTzlSJBpqZ5FeFOzGdmirFuZwph4NTJXOR+4Jwwptm92IaCyoxIfLbSjtT4gAdN4IKdCs
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://ladok3-04.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://ladok3-04.ladok.umu.se:8445/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://ladok3-04.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://ladok3-04.ladok.umu.se:8444/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">ladok3.ladok.umu.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://ladok3-04.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-04.ladok.umu.se:8445/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://ladok3-04.ladok.umu.se:8444/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-04.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-04.ladok.umu.se:8444/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">ladok3.ladok.umu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIBizCCATWgAwIBAgIJANPLS0K54P4ZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wNC5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTIwODA5WhcNMjIwNjI3MTIwODA5WjAhMR8wHQYDVQQDDBZsYWRvazMtMDQubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANOhkVrIMMyWE8pChmHiDLxFaaThCHTUoXktWxcmjgDqJi+IFgmpF3YvY464fC01Cce2LkPFRmcPzlNGu45jsrkCAwEAAaNQME4wHQYDVR0OBBYEFJUxbkgsfPkTFfSGA5D/VVdRRC6IMB8GA1UdIwQYMBaAFJUxbkgsfPkTFfSGA5D/VVdRRC6IMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIV9Cl+cn1VGu93W/RTzlSJBpqZ5FeFOzGdmirFuZwph4NTJXOR+4Jwwptm92IaCyoxIfLbSjtT4gAdN4IKdCs
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://ladok3-04.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://ladok3-04.ladok.umu.se:8445/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>    
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ladok3-04.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-04.ladok.umu.se:8445/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>