urkund new entityID

1 files changed, 40 insertions, 40 deletions

diff --git a/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
index d10e8a3e..2fbeb306 100644
--- a/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.eenet.ee/sso/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eenet.ee</shibmd:Scope>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDpjCCAo4CCQDINHfRT/2NbzANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwHhcNMTYwMzE0MTE1NTMzWhcNMTkwMzE0MTE1NTMzWjCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfKb0HFR4cR/fpsQHIC6HJrWEWj+X5q+vqVdJ7Fcgk4paZzGkxACeVaK7ZXYexXs6UfzAzR6QDINNWbw4ThHtfjZx67CLQDLzqvXGqV1WuC0VFutkK+8xzYGi7JNOyT9vPiXI3kQsMS4iBF/0ai/UfDBHITGDfgi8cORgD2pAxacjXPv89E9C1Sc5GLGAXtRJbOK67kseCZRP0Es3swXv/cO91LK58MO3QTiXsxtQFNYFpZTSQmE6i/Di1YBATcYcbgFWvCCyFsqzbpJHs/zaAjW5VnQAsYOshS3ae8GBzIfVxelXggH4iqP5hbDTC5r5qGZjuzw/9IIqI/Vlr0007AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJXRmwnfLZjGHEri0N1dJig/hQItjki8H3bji9hY13OLOTqB4gaxKk8pYWwaf7Hv1Nz17gkx6JdrQ2uub+kuGgT14fIx/Te4q2v1WUe4d9xRYZ59GBz5WgTv3BDRDxmtulyuvH7j9csmOB4pDL8FIUd/VzVxA90oMa1sOGMSUfZSCNUvElL59vOK+qeVX3UWOJRT54BBO7fPAGAgjFXK6YKKYZw1MekiMwqNzQ5oCJg91YWt5ELZvBAdBdQurRya6Tso6IXWyNyvipfFrJ+NIXWjzrEQ/OHRxBg5os8oXHwdaXac9UUlRDW1UEzIA+ljiU5r/riT9F/PSN6zlGdL9lQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDpjCCAo4CCQDINHfRT/2NbzANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwHhcNMTYwMzE0MTE1NTMzWhcNMTkwMzE0MTE1NTMzWjCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfKb0HFR4cR/fpsQHIC6HJrWEWj+X5q+vqVdJ7Fcgk4paZzGkxACeVaK7ZXYexXs6UfzAzR6QDINNWbw4ThHtfjZx67CLQDLzqvXGqV1WuC0VFutkK+8xzYGi7JNOyT9vPiXI3kQsMS4iBF/0ai/UfDBHITGDfgi8cORgD2pAxacjXPv89E9C1Sc5GLGAXtRJbOK67kseCZRP0Es3swXv/cO91LK58MO3QTiXsxtQFNYFpZTSQmE6i/Di1YBATcYcbgFWvCCyFsqzbpJHs/zaAjW5VnQAsYOshS3ae8GBzIfVxelXggH4iqP5hbDTC5r5qGZjuzw/9IIqI/Vlr0007AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJXRmwnfLZjGHEri0N1dJig/hQItjki8H3bji9hY13OLOTqB4gaxKk8pYWwaf7Hv1Nz17gkx6JdrQ2uub+kuGgT14fIx/Te4q2v1WUe4d9xRYZ59GBz5WgTv3BDRDxmtulyuvH7j9csmOB4pDL8FIUd/VzVxA90oMa1sOGMSUfZSCNUvElL59vOK+qeVX3UWOJRT54BBO7fPAGAgjFXK6YKKYZw1MekiMwqNzQ5oCJg91YWt5ELZvBAdBdQurRya6Tso6IXWyNyvipfFrJ+NIXWjzrEQ/OHRxBg5os8oXHwdaXac9UUlRDW1UEzIA+ljiU5r/riT9F/PSN6zlGdL9lQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eenet.ee/sso/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://www.eenet.ee/sso/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="et">Eesti Hariduse ja Teaduse Andmesidevõrk</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Estonian Education and Research Network</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="et">EENet (aevastaja)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">EENet (aevastaja)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="et">http://www.eenet.ee</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.eenet.ee/EENet/EENet_en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>TAAT</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eenet.ee</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>MIIDpjCCAo4CCQDINHfRT/2NbzANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwHhcNMTYwMzE0MTE1NTMzWhcNMTkwMzE0MTE1NTMzWjCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfKb0HFR4cR/fpsQHIC6HJrWEWj+X5q+vqVdJ7Fcgk4paZzGkxACeVaK7ZXYexXs6UfzAzR6QDINNWbw4ThHtfjZx67CLQDLzqvXGqV1WuC0VFutkK+8xzYGi7JNOyT9vPiXI3kQsMS4iBF/0ai/UfDBHITGDfgi8cORgD2pAxacjXPv89E9C1Sc5GLGAXtRJbOK67kseCZRP0Es3swXv/cO91LK58MO3QTiXsxtQFNYFpZTSQmE6i/Di1YBATcYcbgFWvCCyFsqzbpJHs/zaAjW5VnQAsYOshS3ae8GBzIfVxelXggH4iqP5hbDTC5r5qGZjuzw/9IIqI/Vlr0007AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJXRmwnfLZjGHEri0N1dJig/hQItjki8H3bji9hY13OLOTqB4gaxKk8pYWwaf7Hv1Nz17gkx6JdrQ2uub+kuGgT14fIx/Te4q2v1WUe4d9xRYZ59GBz5WgTv3BDRDxmtulyuvH7j9csmOB4pDL8FIUd/VzVxA90oMa1sOGMSUfZSCNUvElL59vOK+qeVX3UWOJRT54BBO7fPAGAgjFXK6YKKYZw1MekiMwqNzQ5oCJg91YWt5ELZvBAdBdQurRya6Tso6IXWyNyvipfFrJ+NIXWjzrEQ/OHRxBg5os8oXHwdaXac9UUlRDW1UEzIA+ljiU5r/riT9F/PSN6zlGdL9lQ=</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>MIIDpjCCAo4CCQDINHfRT/2NbzANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwHhcNMTYwMzE0MTE1NTMzWhcNMTkwMzE0MTE1NTMzWjCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfKb0HFR4cR/fpsQHIC6HJrWEWj+X5q+vqVdJ7Fcgk4paZzGkxACeVaK7ZXYexXs6UfzAzR6QDINNWbw4ThHtfjZx67CLQDLzqvXGqV1WuC0VFutkK+8xzYGi7JNOyT9vPiXI3kQsMS4iBF/0ai/UfDBHITGDfgi8cORgD2pAxacjXPv89E9C1Sc5GLGAXtRJbOK67kseCZRP0Es3swXv/cO91LK58MO3QTiXsxtQFNYFpZTSQmE6i/Di1YBATcYcbgFWvCCyFsqzbpJHs/zaAjW5VnQAsYOshS3ae8GBzIfVxelXggH4iqP5hbDTC5r5qGZjuzw/9IIqI/Vlr0007AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJXRmwnfLZjGHEri0N1dJig/hQItjki8H3bji9hY13OLOTqB4gaxKk8pYWwaf7Hv1Nz17gkx6JdrQ2uub+kuGgT14fIx/Te4q2v1WUe4d9xRYZ59GBz5WgTv3BDRDxmtulyuvH7j9csmOB4pDL8FIUd/VzVxA90oMa1sOGMSUfZSCNUvElL59vOK+qeVX3UWOJRT54BBO7fPAGAgjFXK6YKKYZw1MekiMwqNzQ5oCJg91YWt5ELZvBAdBdQurRya6Tso6IXWyNyvipfFrJ+NIXWjzrEQ/OHRxBg5os8oXHwdaXac9UUlRDW1UEzIA+ljiU5r/riT9F/PSN6zlGdL9lQ=</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eenet.ee/sso/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://www.eenet.ee/sso/saml2/idp/SSOService.php"/>
+    </md:IDPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="et">Eesti Hariduse ja Teaduse Andmesidevõrk</md:OrganizationName>
+      <md:OrganizationName xml:lang="en">Estonian Education and Research Network</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="et">EENet (aevastaja)</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName xml:lang="en">EENet (aevastaja)</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="et">http://www.eenet.ee</md:OrganizationURL>
+      <md:OrganizationURL xml:lang="en">http://www.eenet.ee/EENet/EENet_en</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>TAAT</md:GivenName>
+      <md:SurName>Operations</md:SurName>
+      <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>