Merge remote branch 'remotes/git-svn'

2 files changed, 76 insertions, 0 deletions

diff --git a/nya-1.0-testing.mxml b/nya-1.0-testing.mxml
index ef812a41..7f2b6687 100644
--- a/nya-1.0-testing.mxml
+++ b/nya-1.0-testing.mxml
@@ -59,4 +59,5 @@
   <xi:include href="nya-1.0/nya-00-dw-sp.xml"/>
   <xi:include href="nya-1.0/nya-08.ladok.umu.se.xml"/>
   <xi:include href="nya-1.0/nya-00.ladok.umu.se.xml"/>
+  <xi:include href="nya-1.0/nya-08.ladok.umu.se-sp.xml"/>
 </EntitiesDescriptor>
diff --git a/nya-1.0/nya-08.ladok.umu.se-sp.xml b/nya-1.0/nya-08.ladok.umu.se-sp.xml
new file mode 100644
index 00000000..73108501
--- /dev/null
+++ b/nya-1.0/nya-08.ladok.umu.se-sp.xml
@@ -0,0 +1,75 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-08.ladok.umu.se/ecs-sp">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-08.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKY6wQXl/OYdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE1MjUxWhcNMjAwODE2
+MTE1MjUxWjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOKXz8CyzuOeG3QWk7OHEuXvv6aSv555
+5NqUJpvr55pqHbwaoxcGimEaJhIt8KI8ZfIuQ+doY8cSfYcm6YVJqVp85uG0fE6S
+BC3jSQunEZcziVB+vAX5G4eguLPuW/x2wFlHwzRAT6tRvoezmW4+hJrnOZgAFScJ
+LOHdmFYiMXXPF2f3k1GQtgzj1F/bE1CVyJGunihONwPXOXNODrsmlFqLV7IXK9RB
+LMFgN2ypxRFkB7mXl/7EESMV6l9ISxDQlPrC4Plbbp4Qxf3ob65Y3R/c8o/5TuNx
+ZLm6jUaxQZITiPGpFeXkhFf+xa+imJobvsSuOmO43K7QtoxLDOBXWQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS66LMAll0wKzUBqKSP+CbH
+2lD4EjANBgkqhkiG9w0BAQUFAAOCAQEAAuSg1kVvHbowjjfvEbI6R0eT6x1bkeja
+TseD2XjH53ZMNP5u5JSqqaYQILEYlMXmb4ALIup+TU/zYGoPP+IisR6ggKDmeMp0
+1HYV1jXr822BcV6eASILlDuqHEN63tqaSbyjbhSQxUBimU+GqhGA1HJO+PdCd7uf
+Zom+8+Pf3B+LgdhUiJ7VB+ttIlCg7Z+k3oCBdOgW1b6E57A6IlvetbF9PraCtsCG
+h8vkUuVg5GOCJbvf4gADKXl2aLwSR40Roo4qlVHkhNT7J4BVPiY5CunZzC06fAE8
+LBzTjleTsC/pW9Q2h6AMt2Nc+k+LhT74yBBqLusMMmirA6l96Ajn7g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-08.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKY6wQXl/OYdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTAwODE5MTE1MjUxWhcNMjAwODE2
+MTE1MjUxWjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOKXz8CyzuOeG3QWk7OHEuXvv6aSv555
+5NqUJpvr55pqHbwaoxcGimEaJhIt8KI8ZfIuQ+doY8cSfYcm6YVJqVp85uG0fE6S
+BC3jSQunEZcziVB+vAX5G4eguLPuW/x2wFlHwzRAT6tRvoezmW4+hJrnOZgAFScJ
+LOHdmFYiMXXPF2f3k1GQtgzj1F/bE1CVyJGunihONwPXOXNODrsmlFqLV7IXK9RB
+LMFgN2ypxRFkB7mXl/7EESMV6l9ISxDQlPrC4Plbbp4Qxf3ob65Y3R/c8o/5TuNx
+ZLm6jUaxQZITiPGpFeXkhFf+xa+imJobvsSuOmO43K7QtoxLDOBXWQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDgubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBS66LMAll0wKzUBqKSP+CbH
+2lD4EjANBgkqhkiG9w0BAQUFAAOCAQEAAuSg1kVvHbowjjfvEbI6R0eT6x1bkeja
+TseD2XjH53ZMNP5u5JSqqaYQILEYlMXmb4ALIup+TU/zYGoPP+IisR6ggKDmeMp0
+1HYV1jXr822BcV6eASILlDuqHEN63tqaSbyjbhSQxUBimU+GqhGA1HJO+PdCd7uf
+Zom+8+Pf3B+LgdhUiJ7VB+ttIlCg7Z+k3oCBdOgW1b6E57A6IlvetbF9PraCtsCG
+h8vkUuVg5GOCJbvf4gADKXl2aLwSR40Roo4qlVHkhNT7J4BVPiY5CunZzC06fAE8
+LBzTjleTsC/pW9Q2h6AMt2Nc+k+LhT74yBBqLusMMmirA6l96Ajn7g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>