Cleaning up

2 files changed, 14 insertions, 150 deletions

diff --git a/swamid-2.0/ladok.release-check.swamid.se-shibboleth.xml b/swamid-2.0/ladok.release-check.swamid.se-shibboleth.xml
deleted file mode 100644
index 5469ea2b..00000000
--- a/swamid-2.0/ladok.release-check.swamid.se-shibboleth.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok.release-check.swamid.se/shibboleth">
-  <!-- Test with SP with EC = Code of Conduct from SWAMID SP, part 1-->
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-05T11:22:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok.release-check.swamid.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - Ladok</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - Ladok</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok.release-check.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok.release-check.swamid.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok.release-check.swamid.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok.release-check.swamid.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok.release-check.swamid.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok.release-check.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok.release-check.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok.release-check.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Release-check for SWAMID</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>SWAMID</md:Company>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/release-check.swamid.se-shibboleth.xml b/swamid-2.0/release-check.swamid.se-shibboleth.xml
index 3174d92b..e05f873a 100644
--- a/swamid-2.0/release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/release-check.swamid.se-shibboleth.xml
@@ -24,11 +24,6 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -52,6 +47,7 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
         <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -137,7 +133,7 @@ rtSd5rXgy930PQ==
       <md:ServiceName xml:lang="en">Release-check for SWAMID</md:ServiceName>
       <md:ServiceName xml:lang="sv">Release-check for SWAMID</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonUniqueID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -161,11 +157,23 @@ rtSd5rXgy930PQ==
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>SWAMID</md:Company>
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SWAMID Operations</md:GivenName>
     <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>