new umu idps

2 files changed, 61 insertions, 42 deletions

diff --git a/swamid-1.0/idp.umu.se-saml1.xml b/swamid-1.0/idp.umu.se-saml1.xml
index 9139cf33..a75aefab 100644
--- a/swamid-1.0/idp.umu.se-saml1.xml
+++ b/swamid-1.0/idp.umu.se-saml1.xml
@@ -1,26 +1,33 @@
 <?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.umu.se/shib13/idp/metadata.php">
-  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">umu.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.umu.se/shib13/idp/metadata.php">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEmzCCA4OgAwIBAgILAQAAAAABH0aCSWowDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5MDIwNTExNTU1NloXDTEyMDIwNTExNTU1NlowTDELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxEzARBgNVBAMTCmlkcC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTVztW5Apmw/AKx1SCpyKwGlkz89avgV9fkEwb6IANRMhcI3ftUOJ5BUVD3tsgyzGgZYNGgzYoGHvE3uvUGUHSGObLQv5Wy4a4yN36a2UCgGsaDxXBdAZDT6W9NOLDI86WbIQbKRSWZaeRPSWNkn46q3hE4q6NGh1b2ZY04y9VdvuDSqk3+8Z6w4wC+S2VPAG6hHbbG4gaEakCv/i4hA2haAI9vUP2RVu6aAdydoZR/DdI/GvIwHJsHl1QvmE9tkkAHmNwYhmykIFsMrOeQ8CCZbRswkemiuCWa0d0KyxH2eoJrVo6aAFIdz5yTALHsIli7n6YgSP/PC9TMAobUVU/AgMBAAGjggFpMIIBZTBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBQ44Zw5BzMzy6v5KrfuIjONSiDc8DA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwFQYDVR0RBA4wDIIKaWRwLnVtdS5zZTANBgkqhkiG9w0BAQUFAAOCAQEAXNruvuq2mX23lgcwb7FoQXC9RGMkLnvU2+LF3QXZeGDg7VSzrfxFDEHPX6FuVH8E9KSfCemmkh/rb52oa/YXP97nLWf6tLAB6LHYp34Lx8z6FPWXi93X0vgRKrAkr8fCwk6kNO3yTyvBC8hxPX+zkMcB2Xxh281CjOE8WLTG5ORLC8Em/o4/DC+d1pu1aj24MmVdGcCKsfzXaVFiKhaB+1S8fJi539X0A/R0ig7lqzs46QzaimgcnbcFBIE4lxI0YLfl2YcOyI87jm7SPuBjDjEmNUhONbm896M82PMG4enEh47q76YYkei9ozIynoQ5kefpeSt6ru9GsnScD4eAdA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.umu.se/shib13/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UmU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ume&#xE5; university (New SAML1)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>UMDAC</SurName>
-    <EmailAddress>datordrift@umdac.umu.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmzCCA4OgAwIBAgILAQAAAAABH0aCSWowDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5MDIwNTExNTU1NloXDTEyMDIwNTExNTU1NlowTDELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxEzARBgNVBAMTCmlkcC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTVztW5Apmw/AKx1SCpyKwGlkz89avgV9fkEwb6IANRMhcI3ftUOJ5BUVD3tsgyzGgZYNGgzYoGHvE3uvUGUHSGObLQv5Wy4a4yN36a2UCgGsaDxXBdAZDT6W9NOLDI86WbIQbKRSWZaeRPSWNkn46q3hE4q6NGh1b2ZY04y9VdvuDSqk3+8Z6w4wC+S2VPAG6hHbbG4gaEakCv/i4hA2haAI9vUP2RVu6aAdydoZR/DdI/GvIwHJsHl1QvmE9tkkAHmNwYhmykIFsMrOeQ8CCZbRswkemiuCWa0d0KyxH2eoJrVo6aAFIdz5yTALHsIli7n6YgSP/PC9TMAobUVU/AgMBAAGjggFpMIIBZTBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBQ44Zw5BzMzy6v5KrfuIjONSiDc8DA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwFQYDVR0RBA4wDIIKaWRwLnVtdS5zZTANBgkqhkiG9w0BAQUFAAOCAQEAXNruvuq2mX23lgcwb7FoQXC9RGMkLnvU2+LF3QXZeGDg7VSzrfxFDEHPX6FuVH8E9KSfCemmkh/rb52oa/YXP97nLWf6tLAB6LHYp34Lx8z6FPWXi93X0vgRKrAkr8fCwk6kNO3yTyvBC8hxPX+zkMcB2Xxh281CjOE8WLTG5ORLC8Em/o4/DC+d1pu1aj24MmVdGcCKsfzXaVFiKhaB+1S8fJi539X0A/R0ig7lqzs46QzaimgcnbcFBIE4lxI0YLfl2YcOyI87jm7SPuBjDjEmNUhONbm896M82PMG4enEh47q76YYkei9ozIynoQ5kefpeSt6ru9GsnScD4eAdA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.umu.se/shib13/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
+    <md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University (SAML1)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet (SAML1)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Datordrift</md:SurName>
+    <md:EmailAddress>datordrift@umdac.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-1.0/idp.umu.se-saml2.xml b/swamid-1.0/idp.umu.se-saml2.xml
index 62e6246f..3113624f 100644
--- a/swamid-1.0/idp.umu.se-saml2.xml
+++ b/swamid-1.0/idp.umu.se-saml2.xml
@@ -1,26 +1,38 @@
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.umu.se/saml2/idp/metadata.php" xml:base="swamid-1.0/idp.umu.se-saml2.xml">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">umu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.umu.se/saml2/idp/metadata.php">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEmzCCA4OgAwIBAgILAQAAAAABH0aCSWowDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5MDIwNTExNTU1NloXDTEyMDIwNTExNTU1NlowTDELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxEzARBgNVBAMTCmlkcC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTVztW5Apmw/AKx1SCpyKwGlkz89avgV9fkEwb6IANRMhcI3ftUOJ5BUVD3tsgyzGgZYNGgzYoGHvE3uvUGUHSGObLQv5Wy4a4yN36a2UCgGsaDxXBdAZDT6W9NOLDI86WbIQbKRSWZaeRPSWNkn46q3hE4q6NGh1b2ZY04y9VdvuDSqk3+8Z6w4wC+S2VPAG6hHbbG4gaEakCv/i4hA2haAI9vUP2RVu6aAdydoZR/DdI/GvIwHJsHl1QvmE9tkkAHmNwYhmykIFsMrOeQ8CCZbRswkemiuCWa0d0KyxH2eoJrVo6aAFIdz5yTALHsIli7n6YgSP/PC9TMAobUVU/AgMBAAGjggFpMIIBZTBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBQ44Zw5BzMzy6v5KrfuIjONSiDc8DA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwFQYDVR0RBA4wDIIKaWRwLnVtdS5zZTANBgkqhkiG9w0BAQUFAAOCAQEAXNruvuq2mX23lgcwb7FoQXC9RGMkLnvU2+LF3QXZeGDg7VSzrfxFDEHPX6FuVH8E9KSfCemmkh/rb52oa/YXP97nLWf6tLAB6LHYp34Lx8z6FPWXi93X0vgRKrAkr8fCwk6kNO3yTyvBC8hxPX+zkMcB2Xxh281CjOE8WLTG5ORLC8Em/o4/DC+d1pu1aj24MmVdGcCKsfzXaVFiKhaB+1S8fJi539X0A/R0ig7lqzs46QzaimgcnbcFBIE4lxI0YLfl2YcOyI87jm7SPuBjDjEmNUhONbm896M82PMG4enEh47q76YYkei9ozIynoQ5kefpeSt6ru9GsnScD4eAdA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umu.se/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umu.se/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UmU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Umeå university (New SAML2)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>UMDAC</SurName>
-    <EmailAddress>datordrift@umdac.umu.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmzCCA4OgAwIBAgILAQAAAAABH0aCSWowDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5MDIwNTExNTU1NloXDTEyMDIwNTExNTU1NlowTDELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxEzARBgNVBAMTCmlkcC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTVztW5Apmw/AKx1SCpyKwGlkz89avgV9fkEwb6IANRMhcI3ftUOJ5BUVD3tsgyzGgZYNGgzYoGHvE3uvUGUHSGObLQv5Wy4a4yN36a2UCgGsaDxXBdAZDT6W9NOLDI86WbIQbKRSWZaeRPSWNkn46q3hE4q6NGh1b2ZY04y9VdvuDSqk3+8Z6w4wC+S2VPAG6hHbbG4gaEakCv/i4hA2haAI9vUP2RVu6aAdydoZR/DdI/GvIwHJsHl1QvmE9tkkAHmNwYhmykIFsMrOeQ8CCZbRswkemiuCWa0d0KyxH2eoJrVo6aAFIdz5yTALHsIli7n6YgSP/PC9TMAobUVU/AgMBAAGjggFpMIIBZTBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBQ44Zw5BzMzy6v5KrfuIjONSiDc8DA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwFQYDVR0RBA4wDIIKaWRwLnVtdS5zZTANBgkqhkiG9w0BAQUFAAOCAQEAXNruvuq2mX23lgcwb7FoQXC9RGMkLnvU2+LF3QXZeGDg7VSzrfxFDEHPX6FuVH8E9KSfCemmkh/rb52oa/YXP97nLWf6tLAB6LHYp34Lx8z6FPWXi93X0vgRKrAkr8fCwk6kNO3yTyvBC8hxPX+zkMcB2Xxh281CjOE8WLTG5ORLC8Em/o4/DC+d1pu1aj24MmVdGcCKsfzXaVFiKhaB+1S8fJi539X0A/R0ig7lqzs46QzaimgcnbcFBIE4lxI0YLfl2YcOyI87jm7SPuBjDjEmNUhONbm896M82PMG4enEh47q76YYkei9ozIynoQ5kefpeSt6ru9GsnScD4eAdA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umu.se/saml2/idp/ArtifactResolutionService.php" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umu.se/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umu.se/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
+    <md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University (SAML2)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet (SAML2)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Datordrift</md:SurName>
+    <md:EmailAddress>datordrift@umdac.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>