1 files changed, 38 insertions, 70 deletions
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
index d35bf5e4..0bff0a35 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
@@ -1,91 +1,59 @@
 <?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.itu.dk/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.itu.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-23T14:43:31Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-23T14:43:31Z" 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">itu.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">itu.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">IT-Universitetet i København</mdui:Description>
         <mdui:Description xml:lang="en">IT University of Copenhagen</mdui:Description>
         <mdui:DisplayName xml:lang="da">IT-Universitetet i København</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">IT University of Copenhagen</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>itu.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIFQjCCBCqgAwIBAgIDEeD1MA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTQwNDA4MTkxMzU4WhcNMTcwNDEyMjEwMDE5WjCB2TEpMCcGA1UEBRMgVHlL
-Ry1JWldILTJDY0FWem8zQTYxd1Q3Ti1ITUZiNjIxCzAJBgNVBAYTAkRLMRIwEAYD
-VQQKDAkqLndheWYuZGsxEzARBgNVBAsTCkdUMjE2NTU2MTcxMTAvBgNVBAsTKFNl
-ZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTIxLzAtBgNVBAsT
-JkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRIwEAYDVQQD
-DAkqLndheWYuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwK
-ahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPX
-smDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7H
-Z/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO
-+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVa
-vn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73
-MFOntynlKEvOw1BJAgMBAAGjggGtMIIBqTAfBgNVHSMEGDAWgBRraT1qGEJK3Y8C
-ZTn9NSSGeJEWMDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMB0GA1UdEQQWMBSCCSoud2F5Zi5ka4IHd2F5Zi5kazBDBgNVHR8E
-PDA6MDigNqA0hjJodHRwOi8vcmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxz
-L3JhcGlkc3NsLmNybDAdBgNVHQ4EFgQUBGUCNxYcECVDTWzQsAfeiZPhWW4wDAYD
-VR0TAQH/BAIwADB4BggrBgEFBQcBAQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9y
-YXBpZHNzbC1vY3NwLmdlb3RydXN0LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3Jh
-cGlkc3NsLWFpYS5nZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMw
-QQYKYIZIAYb4RQEHNjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0
-LmNvbS9yZXNvdXJjZXMvY3BzMA0GCSqGSIb3DQEBBQUAA4IBAQBcUobbBCTKnfDK
-3b6juHQhpS/7gl5YF3rFcyj9DTUqGFOfblIYn3NlCWg3Dd607Fo9qeLRrsiRwywI
-vD7TOhKQCnvSDSAJLYxrQS7OT53JhIqcCFwtJVLPM2emYeXkDZUcjYUuw+1Beg2n
-dWq6XbijaEU3EGLDs4cUG5oaoH99EXZ1TV8hHXdZOSG/nn+PVO337Xa06u/1pEB8
-NxvpR5gbmf1NR7Fxrt9Yiob73wAPNtdRYuvPxJQmFbRAyqCqgy6fg2IUzKg+yvgq
-WyrWWsXN8GJXtpTmLYDZW2E8I9+jYzZAzA0iZeHXJAZN524bWtOeTDnGQcIa2Fcn
-St+nV6iy
+          <ds:X509Certificate>MIICGjCCAcQCAQcwDQYJKoZIhvcNAQEFBQAwMzExMC8GA1UEAwwoUHNldWRvIENB
+IC0gbm8gdHJ1c3QgLSBqdXN0IGEgcHVibGljIGtleTAeFw03MDAxMDEwMDAwMDBa
+Fw0zODEyMzEyMzU5NTlaMDUxMzAxBgNVBAMMKmh0dHBzOi8vd2F5Zi5pdHUuZGsv
+c2FtbDIvaWRwL21ldGFkYXRhLnBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5
+zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9
+lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13
+vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3
+mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fs
+R1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQUFAANBAHT9
+T30jIdmmI7zQ/AgK1yvCKpw3kWY7NWx6SA045158DY8h3RvWmhm//jWg5Q+Ii60I
+5EHTyfcBHQqNKB0jjY0=
 </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>MIIFQjCCBCqgAwIBAgIDEeD1MA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTQwNDA4MTkxMzU4WhcNMTcwNDEyMjEwMDE5WjCB2TEpMCcGA1UEBRMgVHlL
-Ry1JWldILTJDY0FWem8zQTYxd1Q3Ti1ITUZiNjIxCzAJBgNVBAYTAkRLMRIwEAYD
-VQQKDAkqLndheWYuZGsxEzARBgNVBAsTCkdUMjE2NTU2MTcxMTAvBgNVBAsTKFNl
-ZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTIxLzAtBgNVBAsT
-JkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRIwEAYDVQQD
-DAkqLndheWYuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwK
-ahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPX
-smDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7H
-Z/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO
-+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVa
-vn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73
-MFOntynlKEvOw1BJAgMBAAGjggGtMIIBqTAfBgNVHSMEGDAWgBRraT1qGEJK3Y8C
-ZTn9NSSGeJEWMDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMB0GA1UdEQQWMBSCCSoud2F5Zi5ka4IHd2F5Zi5kazBDBgNVHR8E
-PDA6MDigNqA0hjJodHRwOi8vcmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxz
-L3JhcGlkc3NsLmNybDAdBgNVHQ4EFgQUBGUCNxYcECVDTWzQsAfeiZPhWW4wDAYD
-VR0TAQH/BAIwADB4BggrBgEFBQcBAQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9y
-YXBpZHNzbC1vY3NwLmdlb3RydXN0LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3Jh
-cGlkc3NsLWFpYS5nZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMw
-QQYKYIZIAYb4RQEHNjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0
-LmNvbS9yZXNvdXJjZXMvY3BzMA0GCSqGSIb3DQEBBQUAA4IBAQBcUobbBCTKnfDK
-3b6juHQhpS/7gl5YF3rFcyj9DTUqGFOfblIYn3NlCWg3Dd607Fo9qeLRrsiRwywI
-vD7TOhKQCnvSDSAJLYxrQS7OT53JhIqcCFwtJVLPM2emYeXkDZUcjYUuw+1Beg2n
-dWq6XbijaEU3EGLDs4cUG5oaoH99EXZ1TV8hHXdZOSG/nn+PVO337Xa06u/1pEB8
-NxvpR5gbmf1NR7Fxrt9Yiob73wAPNtdRYuvPxJQmFbRAyqCqgy6fg2IUzKg+yvgq
-WyrWWsXN8GJXtpTmLYDZW2E8I9+jYzZAzA0iZeHXJAZN524bWtOeTDnGQcIa2Fcn
-St+nV6iy
+          <ds:X509Certificate>MIICGjCCAcQCAQcwDQYJKoZIhvcNAQEFBQAwMzExMC8GA1UEAwwoUHNldWRvIENB
+IC0gbm8gdHJ1c3QgLSBqdXN0IGEgcHVibGljIGtleTAeFw03MDAxMDEwMDAwMDBa
+Fw0zODEyMzEyMzU5NTlaMDUxMzAxBgNVBAMMKmh0dHBzOi8vd2F5Zi5pdHUuZGsv
+c2FtbDIvaWRwL21ldGFkYXRhLnBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5
+zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9
+lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13
+vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3
+mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fs
+R1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQUFAANBAHT9
+T30jIdmmI7zQ/AgK1yvCKpw3kWY7NWx6SA045158DY8h3RvWmhm//jWg5Q+Ii60I
+5EHTyfcBHQqNKB0jjY0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -102,8 +70,8 @@ St+nV6iy
     <md:OrganizationURL xml:lang="en">http://itu.dk/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>WAYF</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+    <md:GivenName>Marc Roy</md:GivenName>
+    <md:SurName>Olsen</md:SurName>
+    <md:EmailAddress>mro@itu.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>