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

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

1 files changed, 7 insertions, 7 deletions

diff --git a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml
index b9422621..24c53f8f 100644
--- a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml
+++ b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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://idp2.test.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>
+      <shibmd:Scope regexp="false">umu.se</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDkzCCAnugAwIBAgIJAMh43FpeVgSGMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxGTAXBgNVBAMMEGlkcDIudGVzdC51bXUuc2UwHhcNMTExMjIyMDk0NDI3WhcNMjExMjE5MDk0NDI3WjBgMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRkwFwYDVQQDDBBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPXzjMLC6YLO7E83Ga1ZDZFf7i3iJaZfaYUgEbujSrhD0/cbF6aaK40kCln1D1Ohfd5w2i+IGhG+WxTYfvhTGrhi9JG7D0nicid+SL4grrqAchkklkRCoexHy/aPbt00bOt2xablxrxCscejpwIkZnK7NTlgX/0qImHia4esdswMT24F/IKDCQHyej8UNcBz5ghZ7pT4YoXmGlWIehaEkBDGvVdQtIDXBw2V+JWUxT3eEwj/KT9Fxt0ENGW7OGeic4zdFd3y21T3n50r5vxur1rQMjkihPrLtJ9m4G1S7O8huqcXvvEEa2YNL84AgWLP9NSFQtzSxQXAvXbYdhv5OwIDAQABo1AwTjAdBgNVHQ4EFgQU2U+AOc/bptlTZ8dwrJFUyp/fNq8wHwYDVR0jBBgwFoAU2U+AOc/bptlTZ8dwrJFUyp/fNq8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPweZGfiyNRw2YYxOiuuaqvnnp6l0L0h76ddvbdXetDd470L+UnrRcZ20k7afr0T29K8LP2qJnlc0kbLYJcDfl61W9Y5bPgryekGRXCAo0ldB8kZWYWDt6cwkf+N9th3mHli0holE+6OFgKHKDrymyCWUUAgKagAee62O1salCwl06Jl8oO1o09eTVYRKk43I8l+v1NiA10nQZFQaetmy4UFDaN+mnoeVbly5Ccc/UNOGmwLSO8G/wg3DcOdxWMXwoASyRi7nmj6ZMmINC/A2UcFVHzo9QC/n3H23bhyJCaRe0Pgkk1Q2fygtftoEdMXgUAKkyJd+H3eptzAkGHPXJg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDkzCCAnugAwIBAgIJAMh43FpeVgSGMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxGTAXBgNVBAMMEGlkcDIudGVzdC51bXUuc2UwHhcNMTExMjIyMDk0NDI3WhcNMjExMjE5MDk0NDI3WjBgMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRkwFwYDVQQDDBBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPXzjMLC6YLO7E83Ga1ZDZFf7i3iJaZfaYUgEbujSrhD0/cbF6aaK40kCln1D1Ohfd5w2i+IGhG+WxTYfvhTGrhi9JG7D0nicid+SL4grrqAchkklkRCoexHy/aPbt00bOt2xablxrxCscejpwIkZnK7NTlgX/0qImHia4esdswMT24F/IKDCQHyej8UNcBz5ghZ7pT4YoXmGlWIehaEkBDGvVdQtIDXBw2V+JWUxT3eEwj/KT9Fxt0ENGW7OGeic4zdFd3y21T3n50r5vxur1rQMjkihPrLtJ9m4G1S7O8huqcXvvEEa2YNL84AgWLP9NSFQtzSxQXAvXbYdhv5OwIDAQABo1AwTjAdBgNVHQ4EFgQU2U+AOc/bptlTZ8dwrJFUyp/fNq8wHwYDVR0jBBgwFoAU2U+AOc/bptlTZ8dwrJFUyp/fNq8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPweZGfiyNRw2YYxOiuuaqvnnp6l0L0h76ddvbdXetDd470L+UnrRcZ20k7afr0T29K8LP2qJnlc0kbLYJcDfl61W9Y5bPgryekGRXCAo0ldB8kZWYWDt6cwkf+N9th3mHli0holE+6OFgKHKDrymyCWUUAgKagAee62O1salCwl06Jl8oO1o09eTVYRKk43I8l+v1NiA10nQZFQaetmy4UFDaN+mnoeVbly5Ccc/UNOGmwLSO8G/wg3DcOdxWMXwoASyRi7nmj6ZMmINC/A2UcFVHzo9QC/n3H23bhyJCaRe0Pgkk1Q2fygtftoEdMXgUAKkyJd+H3eptzAkGHPXJg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEeDCCA2CgAwIBAgIQSNslvGdmCXnbM5xzWOyrwTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDkwMTAwMDAwMFoXDTEzMDgzMTIzNTk1OVowUzELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxDjAMBgNVBAsTBVVNREFDMRkwFwYDVQQDExBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqnsLBvs8DxJffl1zqULjBc1a+c1+mH+eW2BgUxNOG9FJCZqWAJFO8T4m3c1kO9VSQRSFqCMhQd08bfzySevDwgjX3+mR0UfJbtvcCLujDbSnE/1KgMv9EWcqzqyHsw8sL4ShG21pKaCjlP7Abq9T1flRixM+y47LEqnMlHOPKzNG4+366YzKIudsqNeiqwwAmEE4FZEwooBj8paWl800tNL4fUc7Y4sBxfs3j9e0h3sr32LRhQCL8wAa3OrRmoBrbEp/QDygQZ/XE+cjgbDSPzV/Ii4av4CF8OU+lYysrIZMDkTWjbXwkofm7HwbWgb+ukGO4RQdlf1gTG3pn15fQIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBRq/M6MhWNHffNKe9OpmRL57m17MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGlkcDIudGVzdC51bXUuc2UwDQYJKoZIhvcNAQEFBQADggEBALNp2cyl51WNMXfW6YKwmZ6uOu07sGb5ONvteQ8L3qw8bN5ftBiGGi4LeckZj1K2/ql6roW2AeBdH2ZbsSPzfbgZUGVvZMqm0t/Ty24bhAcBtGmJd8oxDH5z8EwMA3Ko5y/n3Mxgn4kjwmDAuF44aVQG8s7Hh9eVvkQyD81ABpUACj+iqs1ynACdQAk2/As4zsCE0iaew/NQ52R7awPB5KitXABpiaj5pDTEsMVRuSKnTErLNTNE9gE0eeuN8bGsU3Hj7ndohqt8bSQLapIHU8odY52Ekjaq8L4etnipjTxrvZqu5TSskrkb9uOViUWND9DB1fKmTUaAeKWlOS/B0X0=</ds:X509Certificate>
         </ds:X509Data>
@@ -33,8 +33,8 @@
   <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 (New)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet (Ny)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Umeå University (New)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="se">Umeå universitet (Ny)</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>