Normalize use of namespace prefix and remove comments

1 files changed, 63 insertions, 63 deletions

diff --git a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
index 46fc53f0..96a0c2a2 100644
--- a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
@@ -5,14 +5,14 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
@@ -23,33 +23,33 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.test.umu.se/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/" index="2"/>
-  </SPSSODescriptor>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.test.umu.se/adfs/services/trust">
-    <Extensions>
-      <shibmd:Scope xmlns="" regexp="false">umu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.test.umu.se/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/" index="2"/>
+  </md:SPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.test.umu.se/adfs/services/trust">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">umu.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Umeå universitet (TEST)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Umeå University (TEST)</mdui:DisplayName>
@@ -67,34 +67,34 @@
         <mdui:IPHint>130.239.0.0/16</mdui:IPHint>
         <mdui:GeolocationHint>geo:63.820554,20.305799</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.test.umu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <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://adfs.test.umu.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Umeå University</Company>
-    <SurName>ITS datordrift</SurName>
-    <EmailAddress>mailto:datordrift@its.umu.se</EmailAddress>
-    <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.test.umu.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <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://adfs.test.umu.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:ContactPerson contactType="support">
+    <md:Company>Umeå University</md:Company>
+    <md:SurName>ITS datordrift</md:SurName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>