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

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

1 files changed, 41 insertions, 70 deletions

diff --git a/swamid-1.0/lingon.ladok.umu.se.xml b/swamid-1.0/lingon.ladok.umu.se.xml
index 023e9b41..f0609c2e 100644
--- a/swamid-1.0/lingon.ladok.umu.se.xml
+++ b/swamid-1.0/lingon.ladok.umu.se.xml
@@ -1,20 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"
-                      xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                      xmlns:ns2="http://www.w3.org/2000/09/xmldsig#"
-                      entityID="https://lingon.ladok.umu.se:8087/sp.xml">
-    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"
-                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-        <ns0:Extensions>
-            <ns1:DiscoveryResponse
-                    Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                    Location="https://lingon.ladok.umu.se:8087/disco"
-                    index="1"/>
-        </ns0:Extensions>
-        <ns0:KeyDescriptor use="encryption">
-            <ns2:KeyInfo>
-                <ns2:X509Data>
-                    <ns2:X509Certificate>
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://lingon.ladok.umu.se:8087/sp.xml">
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lingon.ladok.umu.se:8087/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>
                         MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
                         BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
                         EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
@@ -32,13 +25,13 @@
                         zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
                         +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
                     </ns2:X509Certificate>
-                </ns2:X509Data>
-            </ns2:KeyInfo>
-        </ns0:KeyDescriptor>
-        <ns0:KeyDescriptor use="signing">
-            <ns2:KeyInfo>
-                <ns2:X509Data>
-                    <ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>
                         MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
                         BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
                         EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
@@ -56,52 +49,30 @@
                         zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
                         +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
                     </ns2:X509Certificate>
-                </ns2:X509Data>
-            </ns2:KeyInfo>
-        </ns0:KeyDescriptor>
-        <ns0:ArtifactResolutionService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                Location="https://lingon.ladok.umu.se:8087/ars" index="1"/>
-        <ns0:SingleLogoutService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                Location="https://lingon.ladok.umu.se:8087/sls"/>
-        <ns0:ManageNameIDService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                Location="https://lingon.ladok.umu.se:8087/mni"/>
-        <ns0:ManageNameIDService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-                Location="https://lingon.ladok.umu.se:8087/mni"/>
-        <ns0:ManageNameIDService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                Location="https://lingon.ladok.umu.se:8087/mni"/>
-        <ns0:ManageNameIDService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                Location="https://lingon.ladok.umu.se:8087/acs/artifact"/>
-        <ns0:AssertionConsumerService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-                Location="https://lingon.ladok.umu.se:8087/acs/post" index="1"/>
-        <ns0:AssertionConsumerService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-                Location="https://lingon.ladok.umu.se:8087/acs/redirect"
-                index="2"/>
-        <ns0:AssertionConsumerService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-                Location="https://lingon.ladok.umu.se:8087/acs/artifact"
-                index="3"/>
-        <ns0:AssertionConsumerService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
-                Location="https://lingon.ladok.umu.se:8087/ecp" index="4"/>
-    </ns0:SPSSODescriptor>
-    <ns0:Organization>
-        <ns0:OrganizationName xml:lang="se">Ume Universitet</ns0:OrganizationName>
-        <ns0:OrganizationDisplayName xml:lang="se">Ume Universitet
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lingon.ladok.umu.se:8087/ars" index="1"/>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lingon.ladok.umu.se:8087/sls"/>
+    <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lingon.ladok.umu.se:8087/mni"/>
+    <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lingon.ladok.umu.se:8087/mni"/>
+    <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lingon.ladok.umu.se:8087/mni"/>
+    <ns0:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lingon.ladok.umu.se:8087/acs/artifact"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lingon.ladok.umu.se:8087/acs/post" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lingon.ladok.umu.se:8087/acs/redirect" index="2"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lingon.ladok.umu.se:8087/acs/artifact" index="3"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lingon.ladok.umu.se:8087/ecp" index="4"/>
+  </ns0:SPSSODescriptor>
+  <ns0:Organization>
+    <ns0:OrganizationName xml:lang="se">Ume Universitet</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="se">Ume Universitet
         </ns0:OrganizationDisplayName>
-        <ns0:OrganizationURL xml:lang="en">http://www.umu.se
+    <ns0:OrganizationURL xml:lang="en">http://www.umu.se
         </ns0:OrganizationURL>
-    </ns0:Organization>
-    <ns0:ContactPerson contactType="technical">
-        <ns0:GivenName>Roland</ns0:GivenName>
-        <ns0:SurName>Hedberg</ns0:SurName>
-        <ns0:EmailAddress>roland.hedberg@umu.se</ns0:EmailAddress>
-    </ns0:ContactPerson>
+  </ns0:Organization>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:GivenName>Roland</ns0:GivenName>
+    <ns0:SurName>Hedberg</ns0:SurName>
+    <ns0:EmailAddress>roland.hedberg@umu.se</ns0:EmailAddress>
+  </ns0:ContactPerson>
 </ns0:EntityDescriptor>