1 files changed, 26 insertions, 30 deletions
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
index 887eac87..d645c019 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.hi.is/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.hi.is/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:31:35Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:31:35Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
   </md:Extensions>
   <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">hi.is</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">hi.is</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Háskóli Íslands</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Iceland</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hi.is</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC8jCCAdoCAQcwDQYJKoZIhvcNAQELBQAwPzE9MDsGA1UEAww0aHR0cHM6Ly93
-YXlmLmhpLmlzL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0x
-NTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMD8xPTA7BgNVBAMMNGh0dHBzOi8v
-d2F5Zi5oaS5pcy9zaW1wbGVzYW1sL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCC
-y3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+b
-k+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB
-5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqL
-SHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAI
-p57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMB
-AAEwDQYJKoZIhvcNAQELBQADggEBADbgrT69n1ETF0MU8bADiTAYVVUf/ws+6Vl8
-heDaGrbl3kabIKmLZ/D0Gxfog2MFirs99jRRJ//oJn8ay+ZggpFGFsBlFrOhjOov
-usM9WeimuXGMu7Qf+HfGZMsySOidDip9DPDSrpNFn21L69tXeBwKVg4YXrAYCwsd
-BtjfSvGiarhQcGJyjobrT8Ya5fnJfbhmK+ndrKXXzNqXSA3VLaXdcahStn9ggTZW
-n3fIsF0rl6NtUF4VOfAP+YF6XQCbSgZ45R9DmQBX1BfDRQxTMiTA7PsfKk/4k8dp
-dGs7tUiZlHqo6haH9iSvsbsBOq6pPaZR8cX1As206778PAS6Q6U=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDAw
+NTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAMmYaG+pRB5/+W+9L0D7
+d9U4+UEdvSnAniC1kPv8sB5pdu4XlGGimFFWR7yUZlm+045a1CuKuGaCW+VdZxVr
+YZ9uABrsuHUrm8ejsJU40332CmdPqagNJfew6ozHxIQFXWS2DBmCg3PvDO+3c/Mo
+aeX7ui+rl6XkwObSeRm+fI2KIAPbHUWwhim4pNqC4xTu9xncGHNk1LMYr2K48K/U
+w94AuVNLyq4jQNzQnlcFBCu2P8W4z4wsZru1Eq75m/d3Bq2x3cEGWX4f8LQCWYZ1
+XHOMM/oxX68nDCHgc9EuQ3bOlAgBPIrtIjvELaAx9+QiIDL7OWztsd5byZZZ3FtR
+ODo=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -50,9 +51,4 @@ dGs7tUiZlHqo6haH9iSvsbsBOq6pPaZR8cX1As206778PAS6Q6U=
     <md:OrganizationURL xml:lang="da">http://www.hi.is</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.english.hi.is</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>WAYF</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>