From f8cffe943ea11f0af9c48e5540ba9da7f23d1b65 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 15 Dec 2010 22:00:58 +0100
Subject: resolves SWAMIDOPS-6116

---
 swamid-1.0/kurser3.math.su.se.xml | 80 +++++++++++++++++++++++++++++----------
 1 file changed, 61 insertions(+), 19 deletions(-)

diff --git a/swamid-1.0/kurser3.math.su.se.xml b/swamid-1.0/kurser3.math.su.se.xml
index f9aed627..b893e1fe 100644
--- a/swamid-1.0/kurser3.math.su.se.xml
+++ b/swamid-1.0/kurser3.math.su.se.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kurser3.math.su.se/shibboleth">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kurser3.math.su.se/shibboleth">
+
+  <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>kurser3.math.su.se</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>CN=kurser3.math.su.se,O=Stockholms universitet,L=Stockholm,C=SE</ds:X509SubjectName>
           <ds:X509Certificate>MIIEtjCCA56gAwIBAgILAQAAAAABI1KpT2swDQYJKoZIhvcNAQEFBQAwXzELMAkG
 A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
 bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
@@ -29,21 +32,60 @@ ynlkHdTPKhhKRHcHoqLi/utnmG5tH817fcCNLrabB3L84mA172cmIIIgfF1S+xQa
 OMM+/7x3KmFUyn8K4cOjKkyhoGfyPz++tdN1AR0FE6tWG2r1u+gpNITjFYDwB3Ba
 3HaEyyRqiHhRW0gEYG7LaYXByvmHb4KEtYusqsnhu5Y2lijAflG80wg1PEMvF3C2
 Vo1PJ3opmKEAdZHAL/nZniQHlIHby78aGbKMQPqm7iYiNFXzEe7pAYT5z09lNEYn
-Xc321jpcxyFWaw==</ds:X509Certificate>
+Xc321jpcxyFWaw==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kurser3.math.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Stockholm university</Company>
-    <GivenName>Tomas</GivenName>
-    <SurName>Ericsson</SurName>
-    <EmailAddress>te@math.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>kurser3.math.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=kurser3.math.su.se,O=Stockholms universitet,L=Stockholm,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEtjCCA56gAwIBAgILAQAAAAABI1KpT2swDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
+MDgyNTE2NTI0MFoXDTEyMDgyNTE2NTI0MFowXzELMAkGA1UEBhMCU0UxEjAQBgNV
+BAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEb
+MBkGA1UEAxMSa3Vyc2VyMy5tYXRoLnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA81v4BRy2bE1ZmyJYI0Xayn6smwUIXQdY9rOn5AHpnxeU8mNT
+mo/vSopSjLKicu2MQAabe9R/zboVioupmQWwAXkQlvZolgTGoNH1pCcIey3cUnjo
+2mUhNIpAFMdfESD4QL40KWc69DQ7kxY9wqCTGGSX61f5wyxeZYXuKflC5DBNy9EU
++kR3Bn7ljougWvZWhkPqCAah07SBigsiAbOitrzhl+eM4QxiE4i51eJMVEnRS3Jk
+BwlPqRR9fOMzhwAqGQSmZe1IGYURH+ZHDfVF7zj52HEC0bmCoLaNHMwSrGNZ9mKY
+2gt7QCMHC9NNXFuTB5NBP9RStJJ5r8ZmV+qPHwIDAQABo4IBcTCCAW0wUAYDVR0g
+BEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFs
+c2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNV
+HSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQULZhdxlWnrzBe
+jXVa5xkoY+x9R64wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxz
+aWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUF
+BzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRp
+b25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdEQQW
+MBSCEmt1cnNlcjMubWF0aC5zdS5zZTANBgkqhkiG9w0BAQUFAAOCAQEARrduZeqy
+FZmxDdUP+Tbr9pqCGsqrHwkqU/sUf0EN5fv7dIIhxByQkEgSPNs/gZ3sSAcI7FjA
+ynlkHdTPKhhKRHcHoqLi/utnmG5tH817fcCNLrabB3L84mA172cmIIIgfF1S+xQa
+OMM+/7x3KmFUyn8K4cOjKkyhoGfyPz++tdN1AR0FE6tWG2r1u+gpNITjFYDwB3Ba
+3HaEyyRqiHhRW0gEYG7LaYXByvmHb4KEtYusqsnhu5Y2lijAflG80wg1PEMvF3C2
+Vo1PJ3opmKEAdZHAL/nZniQHlIHby78aGbKMQPqm7iYiNFXzEe7pAYT5z09lNEYn
+Xc321jpcxyFWaw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kurser3.math.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kurser3.math.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurser3.math.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurser3.math.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kurser3.math.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kurser3.math.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurser3.math.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurser3.math.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurser3.math.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kurser3.math.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurser3.math.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kurser3.math.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kurser3.math.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kurser3.math.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
-- 
cgit v1.2.3