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

4 files changed, 153 insertions, 74 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 8c73bb37..296e8e88 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -151,7 +151,6 @@
   <xi:include href="swamid-1.0/login-dev.du.se.xml"/>
   <xi:include href="swamid-1.0/sp-test.it.su.se.xml"/>
   <xi:include href="swamid-1.0/www.studera.nu.xml"/>
-  <xi:include href="swamid-1.0/mondo-test.su.se.xml"/>
   <xi:include href="swamid-1.0/smd-dev.nordu.net.xml"/>
   <xi:include href="swamid-1.0/vlab-chemsub.explizit.se.xml"/>
   <xi:include href="swamid-1.0/sp.it.gu.se.xml"/>
diff --git a/swamid-1.0/etenta.math.su.se b/swamid-1.0/etenta.math.su.se
index b5d03957..3e526732 100644
--- a/swamid-1.0/etenta.math.su.se
+++ b/swamid-1.0/etenta.math.su.se
@@ -1,49 +1,91 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://etenta.math.su.se/shibboleth">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEtDCCA5ygAwIBAgILAQAAAAABI1KvDRQwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
-MDgyNTE2NTg1NloXDTEyMDgyNTE2NTg1NlowXjELMAkGA1UEBhMCU0UxEjAQBgNV
-BAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEa
-MBgGA1UEAxMRZXRlbnRhLm1hdGguc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDCk1rCVO4JNfFTpRd1hVKFrun2JZp8ozPOSBqJxGpaeYolhvYD
-B4EB75+CYhb22GLj/JhoQpHXN5an9ykoG327eAHNFSMmtAfKIqlEs/5NdBk4r27J
-Tcd6JUUTIMKWf0G7b0t6ozBXxQZ5ZvH2v2kujiVnReXBN0+mnPSG4uOZw4ZEZZll
-ZaVAMuxn/gGoOd+Z3X17ycmbKsnNQBsn1HDIUQreBSg9fNo+nV/9Okb/XM8LwlGn
-cCGZHCgzsM1jjC+U90exftFDqNE06rAQpcKLz6jNB0HLQc0x5meC8EwoBHiapXhy
-e+slK5W8DYxUcxuT89QlqnslIuijFV2yxC59AgMBAAGjggFwMIIBbDBQBgNVHSAE
-STBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxz
-aWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1Ud
-IwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBTVFjECf7beKmVA
-yoHsH05lstrajDA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNp
-Z24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUH
-MAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlv
-bmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHAYDVR0RBBUw
-E4IRZXRlbnRhLm1hdGguc3Uuc2UwDQYJKoZIhvcNAQEFBQADggEBAC5bK1eft98i
-qO8dVMe6CtCL4FWFbjNaRVjTy04vVtmU8Uql/9/Tkim7g0Rybt4GKBOj64hQykdZ
-AsgdJYqvd74LSsohvevPHQoS0sDRc40JxkQbByeVYqPcIz+GPY935PckWYjGYKq7
-OGA1xTdacLCk2miLLkzJyzDursWsuA4d0sj3v4UBo4MRLUgbWRy9wWGVByBgZIzA
-fHhv0ckGJPG5ml9MarGcZPZq/hS8NUm5bC8B15LDf1qYobkFPYDBUwQlBkFY4w4n
-ns5Y9roi6C3cE3VSH9nSy9eLagzf/JLWLOxigZp0/XkP/eMIr12BjKfu9up5TAUF
-YOqkcMoSjDE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://etenta.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:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://etenta.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>etenta.math.su.se</ds:KeyName>

+        <ds:X509Data>

+          <ds:X509SubjectName>CN=etenta.math.su.se,O=Stockholms universitet,L=Stockholm,C=SE</ds:X509SubjectName>

+          <ds:X509Certificate>MIIEtDCCA5ygAwIBAgILAQAAAAABI1KvDRQwDQYJKoZIhvcNAQEFBQAwXzELMAkG

+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv

+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5

+MDgyNTE2NTg1NloXDTEyMDgyNTE2NTg1NlowXjELMAkGA1UEBhMCU0UxEjAQBgNV

+BAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEa

+MBgGA1UEAxMRZXRlbnRhLm1hdGguc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IB

+DwAwggEKAoIBAQDCk1rCVO4JNfFTpRd1hVKFrun2JZp8ozPOSBqJxGpaeYolhvYD

+B4EB75+CYhb22GLj/JhoQpHXN5an9ykoG327eAHNFSMmtAfKIqlEs/5NdBk4r27J

+Tcd6JUUTIMKWf0G7b0t6ozBXxQZ5ZvH2v2kujiVnReXBN0+mnPSG4uOZw4ZEZZll

+ZaVAMuxn/gGoOd+Z3X17ycmbKsnNQBsn1HDIUQreBSg9fNo+nV/9Okb/XM8LwlGn

+cCGZHCgzsM1jjC+U90exftFDqNE06rAQpcKLz6jNB0HLQc0x5meC8EwoBHiapXhy

+e+slK5W8DYxUcxuT89QlqnslIuijFV2yxC59AgMBAAGjggFwMIIBbDBQBgNVHSAE

+STBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxz

+aWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1Ud

+IwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBTVFjECf7beKmVA

+yoHsH05lstrajDA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNp

+Z24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUH

+MAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlv

+bmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHAYDVR0RBBUw

+E4IRZXRlbnRhLm1hdGguc3Uuc2UwDQYJKoZIhvcNAQEFBQADggEBAC5bK1eft98i

+qO8dVMe6CtCL4FWFbjNaRVjTy04vVtmU8Uql/9/Tkim7g0Rybt4GKBOj64hQykdZ

+AsgdJYqvd74LSsohvevPHQoS0sDRc40JxkQbByeVYqPcIz+GPY935PckWYjGYKq7

+OGA1xTdacLCk2miLLkzJyzDursWsuA4d0sj3v4UBo4MRLUgbWRy9wWGVByBgZIzA

+fHhv0ckGJPG5ml9MarGcZPZq/hS8NUm5bC8B15LDf1qYobkFPYDBUwQlBkFY4w4n

+ns5Y9roi6C3cE3VSH9nSy9eLagzf/JLWLOxigZp0/XkP/eMIr12BjKfu9up5TAUF

+YOqkcMoSjDE=

+</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>etenta.math.su.se</ds:KeyName>

+        <ds:X509Data>

+          <ds:X509SubjectName>CN=etenta.math.su.se,O=Stockholms universitet,L=Stockholm,C=SE</ds:X509SubjectName>

+          <ds:X509Certificate>MIIEtDCCA5ygAwIBAgILAQAAAAABI1KvDRQwDQYJKoZIhvcNAQEFBQAwXzELMAkG

+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv

+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5

+MDgyNTE2NTg1NloXDTEyMDgyNTE2NTg1NlowXjELMAkGA1UEBhMCU0UxEjAQBgNV

+BAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEa

+MBgGA1UEAxMRZXRlbnRhLm1hdGguc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IB

+DwAwggEKAoIBAQDCk1rCVO4JNfFTpRd1hVKFrun2JZp8ozPOSBqJxGpaeYolhvYD

+B4EB75+CYhb22GLj/JhoQpHXN5an9ykoG327eAHNFSMmtAfKIqlEs/5NdBk4r27J

+Tcd6JUUTIMKWf0G7b0t6ozBXxQZ5ZvH2v2kujiVnReXBN0+mnPSG4uOZw4ZEZZll

+ZaVAMuxn/gGoOd+Z3X17ycmbKsnNQBsn1HDIUQreBSg9fNo+nV/9Okb/XM8LwlGn

+cCGZHCgzsM1jjC+U90exftFDqNE06rAQpcKLz6jNB0HLQc0x5meC8EwoBHiapXhy

+e+slK5W8DYxUcxuT89QlqnslIuijFV2yxC59AgMBAAGjggFwMIIBbDBQBgNVHSAE

+STBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxz

+aWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1Ud

+IwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBTVFjECf7beKmVA

+yoHsH05lstrajDA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNp

+Z24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUH

+MAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlv

+bmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHAYDVR0RBBUw

+E4IRZXRlbnRhLm1hdGguc3Uuc2UwDQYJKoZIhvcNAQEFBQADggEBAC5bK1eft98i

+qO8dVMe6CtCL4FWFbjNaRVjTy04vVtmU8Uql/9/Tkim7g0Rybt4GKBOj64hQykdZ

+AsgdJYqvd74LSsohvevPHQoS0sDRc40JxkQbByeVYqPcIz+GPY935PckWYjGYKq7

+OGA1xTdacLCk2miLLkzJyzDursWsuA4d0sj3v4UBo4MRLUgbWRy9wWGVByBgZIzA

+fHhv0ckGJPG5ml9MarGcZPZq/hS8NUm5bC8B15LDf1qYobkFPYDBUwQlBkFY4w4n

+ns5Y9roi6C3cE3VSH9nSy9eLagzf/JLWLOxigZp0/XkP/eMIr12BjKfu9up5TAUF

+YOqkcMoSjDE=

+</ds:X509Certificate>

+        </ds:X509Data>

+      </ds:KeyInfo>

+    </md:KeyDescriptor>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://etenta.math.su.se/Shibboleth.sso/SLO/SOAP"/>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://etenta.math.su.se/Shibboleth.sso/SLO/Redirect"/>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://etenta.math.su.se/Shibboleth.sso/SLO/POST"/>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://etenta.math.su.se/Shibboleth.sso/SLO/Artifact"/>

+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://etenta.math.su.se/Shibboleth.sso/NIM/SOAP"/>

+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://etenta.math.su.se/Shibboleth.sso/NIM/Redirect"/>

+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://etenta.math.su.se/Shibboleth.sso/NIM/POST"/>

+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://etenta.math.su.se/Shibboleth.sso/NIM/Artifact"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://etenta.math.su.se/Shibboleth.sso/SAML2/POST" index="1"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="http://etenta.math.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://etenta.math.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://etenta.math.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://etenta.math.su.se/Shibboleth.sso/SAML/POST" index="5"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://etenta.math.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>

+  </md:SPSSODescriptor>

+

+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/kurser.math.su.se.xml b/swamid-1.0/kurser.math.su.se.xml
index 9ab07693..23fc5c95 100644
--- a/swamid-1.0/kurser.math.su.se.xml
+++ b/swamid-1.0/kurser.math.su.se.xml
@@ -1,9 +1,12 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kurser.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://kurser.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>kurser.math.su.se</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>CN=kurser.math.su.se,O=Stockholms universitet,L=Stockholm,C=SE</ds:X509SubjectName>
           <ds:X509Certificate>MIIEtDCCA5ygAwIBAgILAQAAAAABFmyXfAIwDQYJKoZIhvcNAQEFBQAwXzELMAkG
 A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
 bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA3
@@ -29,21 +32,60 @@ E4IRa3Vyc2VyLm1hdGguc3Uuc2UwDQYJKoZIhvcNAQEFBQADggEBAGytPXdEBB4U
 i2gsbjSvu8+fw06fKRugHVhbcEJFF8nqt6chHLOA0cf7JAHSQ2gy9a4I3/b4U7IF
 SC5WW4xs4jCsEbCrSY99/EbwACex7vAdJ226wstTpOfexJddSDMcMdbk9lT0lkNv
 IRL+ZeKXIrjU/i9+hCL9CpANjmwYrK6nZ44KBIfliqrClTB95b96JOm12ec96mlm
-NqEG6NW6bIM=</ds:X509Certificate>
+NqEG6NW6bIM=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kurser.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>kurser.math.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=kurser.math.su.se,O=Stockholms universitet,L=Stockholm,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEtDCCA5ygAwIBAgILAQAAAAABFmyXfAIwDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA3
+MTEyMzEyNTkzNVoXDTEwMTEyMzEyNTkzNVowXjELMAkGA1UEBhMCU0UxEjAQBgNV
+BAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEa
+MBgGA1UEAxMRa3Vyc2VyLm1hdGguc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDNGGpeQmYPRHeph0GbX0P6oyNiIL1FFYAPm5habntpevZbN2lf
+p+oWq3/yqJBiMJvOxIJZemGBobBHGaT9LRStePQAc2Himgj+3u/HDFj8QKjfTVTc
+lezFSpOy088S38zCu3JcKFxSH6I+l85iMKg5EhpJzUhta13FUPy2klngVqcspRuV
+14lIyt3rUW4cG6++0dd/NRlIGi8ziq8eWjlE2CaazjjzSDeQYeLVsBQEqO4B/1A4
+hrtyK/oCV1/7DVzLuACZ5WKG1HhH53b8+lKHqZyZSWriJ2ePB3skhGkEorffcx72
+oOxhR9BxTTh4Jjw0gJeHI2qPm1+gzSbUS+WXAgMBAAGjggFwMIIBbDBQBgNVHSAE
+STBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxz
+aWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1Ud
+IwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBRfPKPMhzkyAHi+
+RKLzjmRSrYzXIDA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNp
+Z24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUH
+MAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlv
+bmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHAYDVR0RBBUw
+E4IRa3Vyc2VyLm1hdGguc3Uuc2UwDQYJKoZIhvcNAQEFBQADggEBAGytPXdEBB4U
+1y1na9fAAEtuxk93EQ3MoFsVJeS7JwTDtPvRmy1CeiA62XTSuFNXmM0Vi590aXB7
+9cSAVVlg1prxzCjsrttxTQNzHZ7wW+ztn6RjNokfDQtLl1MvH83reAaq5TCWD3o/
+i2gsbjSvu8+fw06fKRugHVhbcEJFF8nqt6chHLOA0cf7JAHSQ2gy9a4I3/b4U7IF
+SC5WW4xs4jCsEbCrSY99/EbwACex7vAdJ226wstTpOfexJddSDMcMdbk9lT0lkNv
+IRL+ZeKXIrjU/i9+hCL9CpANjmwYrK6nZ44KBIfliqrClTB95b96JOm12ec96mlm
+NqEG6NW6bIM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kurser.math.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kurser.math.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurser.math.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurser.math.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kurser.math.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kurser.math.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurser.math.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurser.math.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurser.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://kurser.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://kurser.math.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kurser.math.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kurser.math.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kurser.math.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/www.cambro.umu.se.xml b/swamid-1.0/www.cambro.umu.se.xml
index bc0e08d1..9c2ba927 100644
--- a/swamid-1.0/www.cambro.umu.se.xml
+++ b/swamid-1.0/www.cambro.umu.se.xml
@@ -74,17 +74,13 @@ icknTeF+RsafVHg+EFL9nH4U/yB6wesYu8jG5Fsv5p+ARKVdZb9YWXaRPtH3mzpN
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cambro.umu.se/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cambro.umu.se/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cambro.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cambro.umu.se/Shibboleth.sso/SLO/Artifact"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cambro.umu.se/Shibboleth.sso/NIM/SOAP"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cambro.umu.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cambro.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cambro.umu.se/Shibboleth.sso/NIM/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 
 </md:EntityDescriptor>