https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-2.0

11 files changed, 179 insertions, 21 deletions

diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 0951b543..aa022618 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -29,7 +29,9 @@
 <xi:include href="swamid-interfederations-2.0/translation.rnd.feide.no.xml"/>
 <xi:include href="swamid-interfederations-2.0/tullbommen.arcada.fi.xml"/>
 <xi:include href="swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/wayf.ordbogen.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/wayf.wayf.dk.xml"/>
 <xi:include href="swamid-interfederations-2.0/web.tut.fi.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.emeraldinsight.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.ordbogen.com.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
new file mode 100644
index 00000000..fd489d01
--- /dev/null
+++ b/swamid-interfederations-2.0/.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:com.itslearning.test" validUntil="2011-12-06T21:14:02Z" cacheDuration="PT345600S">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.itslearning.com/elogin/logout.aspx"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.itslearning.com/elogin/default.aspx" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">itslearning</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">itslearning is a virtual learning environment specifically designed for schools and universities.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">itslearning er et virtuelt læringsmiljø, spesielt utformet for skoler og universiteter.</md:ServiceDescription>
+      <md:RequestedAttribute 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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml b/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
index e51c2177..5541a415 100644
--- a/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
+++ b/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
@@ -86,14 +86,9 @@ DSWPf8vQpQ==</ds:X509Certificate>
     <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  <md:ContactPerson contactType="technical">
     <md:GivenName>Teemu</md:GivenName>
     <md:SurName>Valimaki</md:SurName>
-    <md:EmailAddress>tietojarjestelmat@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Miika</md:GivenName>
-    <md:SurName>Kauppi</md:SurName>
-    <md:EmailAddress>hakajasen@utu.fi</md:EmailAddress>
+    <md:EmailAddress>netmaster@utu.fi</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/atlases.muni.cz.xml b/swamid-interfederations-2.0/atlases.muni.cz.xml
index 813fb539..be0a17f3 100644
--- a/swamid-interfederations-2.0/atlases.muni.cz.xml
+++ b/swamid-interfederations-2.0/atlases.muni.cz.xml
@@ -1,12 +1,27 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://atlases.muni.cz/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://atlases.muni.cz/shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <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://atlases.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Atlas of dermatology</md:ServiceName>
       <md:ServiceName xml:lang="da">Dermatologi-atlas</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide access to the three atlases: 1) Dermapathology, 2) Fetal and Neonaltal Pathology, 3) Pathology for pregraduate students of medicine. The atlases may serve as sources of teaching material for pregraduate as well as postgraduate students of pathology.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">give adgang til tre atlasser: 1) Dermatologi, 2) Fetal og neonatal patologi, 3) Patologi for medicinstudernde. Atlasserne kan bruges som undervisningsmateriale for patologistuderende.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">to provide access to the three atlases: 1) Dermapathology, 2) Fetal and Neonaltal Pathology,      3) Pathology for pregraduate students of medicine. The atlases may serve as sources of teaching material for pregraduate as well as postgraduate students of pathology.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">give adgang til tre atlasser: 1) Dermatologi, 2) Fetal og neonatal patologi, 3) Patologi for      medicinstudernde. Atlasserne kan bruges som undervisningsmateriale for patologistuderende.</md:ServiceDescription>
       <md:RequestedAttribute 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"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index 3ab22786..40979444 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi.xml
@@ -48,6 +48,39 @@ aFahF9tdcjjxkpH+EE+Yq7jt69bDdETfGqqOdIFouh8Mcp4X4B4zUrGgd871S2hN
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+zCCA+OgAwIBAgIQPQJBKvIc9NRY+pPFe5hfBDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTAzMTAwMDAwMFoXDTEzMTAzMDIzNTk1OVowgYgxCzAJBgNV
+BAYTAkZJMRAwDgYDVQQIEwdVdXNpbWFhMQ4wDAYDVQQHEwVFc3BvbzEpMCcGA1UE
+ChMgQ1NDIC0gSVQgQ2VudGVyIGZvciBTY2llbmNlIEx0ZC4xEDAOBgNVBAsTB1Vu
+a25vd24xGjAYBgNVBAMTEWhha2EtaWRwMDEuY3NjLmZpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAt9O61taFpnXBLgpt9TIy9838XN93089o/ATNm9Yx
+JkrX8hqpCNHUM3bzsEe/X7hKcT5xjVxTiwacHw8kYP2YgVPz4HDLbL1wakiq2Mvb
+QFmYvcEw8YsA3AbZWn/QlrOgbP+e81aaUCWq3emm1QBoqTCidlczNetoCU+LuuUj
+EvvqWZaiGSacAZ9qzl7U5MmH7TYt6AovSlVrWZnNagLFaaxQsSt9ccgkVfAXupCq
+voSlF2VbuXWuK3GWEbELmR9LrSx5idX3JGnjIVjFOMYceBDsJJHLaicsiBgL3imt
+9EulnoY+5ifuKr5HGFkQzcF1Qsq2y3lLFVv3whLTGio+bwIDAQABo4IBsDCCAaww
+HwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFHtybSZj
+YQP+ZNnxCQbK8njRX51hMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQB
+sjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYp
+aHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYB
+BQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMGgGA1UdEQRhMF+CEWhh
+a2EtaWRwMDEuY3NjLmZpgg9oYWthLWlkcC5jc2MuZmmCEWhha2EtaWRwMDIuY3Nj
+LmZpggppZHAuY3NjLmZpggxpZHAwMS5jc2MuZmmCDGlkcDAyLmNzYy5maTANBgkq
+hkiG9w0BAQUFAAOCAQEAtTZm+eCpS91dGyQxSK/N/OeO77b879QjODzaPuBmyJNR
+vJKNgWkBJy6oVSsLq2LnRoR1J//9JKkVQ31PfIk9qKX8B92EYUddUx2sBOQkvRK6
+QPURtxM38YsQXqZsgZX0eFSc4H/PZe0Zg4qT1bfoZle0ib1sKJpNO7G97YgnDDwE
+7+4aGUowa81gkiOBsyyUXiJdjv9+ldbBCbU3PkF16Csu7iNiuIXuD9NSGsATh/M1
+qoM8/s5WaIsU1mn7Cbyl4sprVCtObbbENDlkzMpiJ7qoTTVBewhdORXhrLzY8NJu
+9u4191s9DyJqzbzGfsW52la+QW4/tJJn6uYXBpcQfQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csc.fi/idp/profile/Shibboleth/SSO"/>
@@ -84,6 +117,39 @@ aFahF9tdcjjxkpH+EE+Yq7jt69bDdETfGqqOdIFouh8Mcp4X4B4zUrGgd871S2hN
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+zCCA+OgAwIBAgIQPQJBKvIc9NRY+pPFe5hfBDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTAzMTAwMDAwMFoXDTEzMTAzMDIzNTk1OVowgYgxCzAJBgNV
+BAYTAkZJMRAwDgYDVQQIEwdVdXNpbWFhMQ4wDAYDVQQHEwVFc3BvbzEpMCcGA1UE
+ChMgQ1NDIC0gSVQgQ2VudGVyIGZvciBTY2llbmNlIEx0ZC4xEDAOBgNVBAsTB1Vu
+a25vd24xGjAYBgNVBAMTEWhha2EtaWRwMDEuY3NjLmZpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAt9O61taFpnXBLgpt9TIy9838XN93089o/ATNm9Yx
+JkrX8hqpCNHUM3bzsEe/X7hKcT5xjVxTiwacHw8kYP2YgVPz4HDLbL1wakiq2Mvb
+QFmYvcEw8YsA3AbZWn/QlrOgbP+e81aaUCWq3emm1QBoqTCidlczNetoCU+LuuUj
+EvvqWZaiGSacAZ9qzl7U5MmH7TYt6AovSlVrWZnNagLFaaxQsSt9ccgkVfAXupCq
+voSlF2VbuXWuK3GWEbELmR9LrSx5idX3JGnjIVjFOMYceBDsJJHLaicsiBgL3imt
+9EulnoY+5ifuKr5HGFkQzcF1Qsq2y3lLFVv3whLTGio+bwIDAQABo4IBsDCCAaww
+HwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFHtybSZj
+YQP+ZNnxCQbK8njRX51hMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQB
+sjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYp
+aHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYB
+BQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMGgGA1UdEQRhMF+CEWhh
+a2EtaWRwMDEuY3NjLmZpgg9oYWthLWlkcC5jc2MuZmmCEWhha2EtaWRwMDIuY3Nj
+LmZpggppZHAuY3NjLmZpggxpZHAwMS5jc2MuZmmCDGlkcDAyLmNzYy5maTANBgkq
+hkiG9w0BAQUFAAOCAQEAtTZm+eCpS91dGyQxSK/N/OeO77b879QjODzaPuBmyJNR
+vJKNgWkBJy6oVSsLq2LnRoR1J//9JKkVQ31PfIk9qKX8B92EYUddUx2sBOQkvRK6
+QPURtxM38YsQXqZsgZX0eFSc4H/PZe0Zg4qT1bfoZle0ib1sKJpNO7G97YgnDDwE
+7+4aGUowa81gkiOBsyyUXiJdjv9+ldbBCbU3PkF16Csu7iNiuIXuD9NSGsATh/M1
+qoM8/s5WaIsU1mn7Cbyl4sprVCtObbbENDlkzMpiJ7qoTTVBewhdORXhrLzY8NJu
+9u4191s9DyJqzbzGfsW52la+QW4/tJJn6uYXBpcQfQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csc.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csc.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/moodle.utu.fi.xml b/swamid-interfederations-2.0/moodle.utu.fi.xml
index 3023c901..cc6f93eb 100644
--- a/swamid-interfederations-2.0/moodle.utu.fi.xml
+++ b/swamid-interfederations-2.0/moodle.utu.fi.xml
@@ -62,13 +62,8 @@ Z/dJiMGOYt1I1CwOpyO8yRc8WeYZqbrKPxO/VsQ9b15tdADxcf+EMeuQNSs=</ds:X509Certificate
     <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Miika</md:GivenName>
-    <md:SurName>Kauppi</md:SurName>
+    <md:GivenName>Nadja</md:GivenName>
+    <md:SurName>Plankevitch</md:SurName>
     <md:EmailAddress>hakajasen@utu.fi</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Teemu</md:GivenName>
-    <md:SurName>Valimaki</md:SurName>
-    <md:EmailAddress>moodle-tuki@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/talli.funet.fi.xml b/swamid-interfederations-2.0/talli.funet.fi.xml
index 782ade31..eee8a90f 100644
--- a/swamid-interfederations-2.0/talli.funet.fi.xml
+++ b/swamid-interfederations-2.0/talli.funet.fi.xml
@@ -5,8 +5,8 @@
       <mdui:UIInfo>
           <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
           <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
-          <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
           <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
+          <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
           <mdui:Keywords xml:lang="fi">testi attribuutit</mdui:Keywords>
           <mdui:Keywords xml:lang="en">test attributes</mdui:Keywords>
         </mdui:UIInfo>
@@ -137,6 +137,11 @@ eEAH1RvfTsj/y527aKeZCRXGK8M8QBOJaA1VAE84H7qCBfB61q1jLPZJQqi/PpQt
     <md:EmailAddress>haka@csc.fi</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
+    <md:GivenName>Kari</md:GivenName>
+    <md:SurName>Laalo</md:SurName>
+    <md:EmailAddress>kari.laalo@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
     <md:GivenName>Janne</md:GivenName>
     <md:SurName>Lauros</md:SurName>
     <md:EmailAddress>haka@csc.fi</md:EmailAddress>
diff --git a/swamid-interfederations-2.0/wayf.ordbogen.com.xml b/swamid-interfederations-2.0/wayf.ordbogen.com.xml
new file mode 100644
index 00000000..b63055c8
--- /dev/null
+++ b/swamid-interfederations-2.0/wayf.ordbogen.com.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://wayf.ordbogen.com">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEdjCCA16gAwIBAgILAQAAAAABLysKVFswDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExFjAUBgNVBAsTDU9iamVjdFNpZ24gQ0ExITAfBgNVBAMTGEdsb2JhbFNpZ24gT2JqZWN0U2lnbiBDQTAeFw0xMTA0MDYxMzI1NDZaFw0xMzA0MDYxMzI1NDRaMEwxCzAJBgNVBAYTAkRLMQ8wDQYDVQQIEwZPZGVuc2UxFTATBgNVBAoTDE9yZGJvZ2VuIEEvUzEVMBMGA1UEAxMMT3JkYm9nZW4gQS9TMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAovIjWe1fOERH9N7Dk7OP9K1YveGQZipKE+GaOHnCNe33F4a1sXMhT38fEUNWQpRLDBeLsWF2G5FnwrVDGb3qo8dN7e4ycZWbZIBuC/lyq8qRt6iIxNHQ7oad8N2m7CTe3ZNdkPHEY8eaDHUP2AC8c1SXyakv394WKuT2roIZ4OD74pv9CTDGFVNsbgOU1xTM+QIvbRSUDmVGBdkUv5tstC9w7R7UdhrW8R1wYcTwA9UxMNEiCNBvyMTfAcJO32FzDTa5nBopyoAK4jgGEdrz8Oeb17MCb+sStxJiZRTuFCgkvuNkCNXEuBBYiNDAyB8AwsLKMw6IzBPCG88NfcmUZwIDAQABo4IBQDCCATwwHwYDVR0jBBgwFoAU0lvzSyZLpbDnXf1Wf/bxLjhOU6AwTgYIKwYBBQUHAQEEQjBAMD4GCCsGAQUFBzAChjJodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9PYmplY3RTaWduLmNydDA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09iamVjdFNpZ24uY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEyMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgQQMA0GCSqGSIb3DQEBBQUAA4IBAQA0lPLNM6+JLbeGyjZQ5tU7H4c1hX1WcAAGgRVF1oVtTEH8vA4V+roVB35+8Jk08rzqh+ghIUX99P2keUTOlllYUbxb7DXfsOprD5tDGc/jmMMZrYzL3ibdW0229/eaokXMPI6As7ApvQ7utb+sjftwQoI9BkJlbMRoW//t2GYY3bP7+r7yDUbcOVwNUm3ZoxErIM7SulpTS36uP8jcr0zPOwRAx6atMmtNVfZlt91FR3xzvrnfFLPv5YzZ5euAqFnhxmW97co1IgOElcHazmcj+m/uTaoCjaGhxB6eg7cZePuQW0iX7Ufcb0YIAHczY1d+ZfCe5wTuSYnbdJGwoor7</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEdjCCA16gAwIBAgILAQAAAAABLysKVFswDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExFjAUBgNVBAsTDU9iamVjdFNpZ24gQ0ExITAfBgNVBAMTGEdsb2JhbFNpZ24gT2JqZWN0U2lnbiBDQTAeFw0xMTA0MDYxMzI1NDZaFw0xMzA0MDYxMzI1NDRaMEwxCzAJBgNVBAYTAkRLMQ8wDQYDVQQIEwZPZGVuc2UxFTATBgNVBAoTDE9yZGJvZ2VuIEEvUzEVMBMGA1UEAxMMT3JkYm9nZW4gQS9TMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAovIjWe1fOERH9N7Dk7OP9K1YveGQZipKE+GaOHnCNe33F4a1sXMhT38fEUNWQpRLDBeLsWF2G5FnwrVDGb3qo8dN7e4ycZWbZIBuC/lyq8qRt6iIxNHQ7oad8N2m7CTe3ZNdkPHEY8eaDHUP2AC8c1SXyakv394WKuT2roIZ4OD74pv9CTDGFVNsbgOU1xTM+QIvbRSUDmVGBdkUv5tstC9w7R7UdhrW8R1wYcTwA9UxMNEiCNBvyMTfAcJO32FzDTa5nBopyoAK4jgGEdrz8Oeb17MCb+sStxJiZRTuFCgkvuNkCNXEuBBYiNDAyB8AwsLKMw6IzBPCG88NfcmUZwIDAQABo4IBQDCCATwwHwYDVR0jBBgwFoAU0lvzSyZLpbDnXf1Wf/bxLjhOU6AwTgYIKwYBBQUHAQEEQjBAMD4GCCsGAQUFBzAChjJodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9PYmplY3RTaWduLmNydDA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09iamVjdFNpZ24uY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEyMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgQQMA0GCSqGSIb3DQEBBQUAA4IBAQA0lPLNM6+JLbeGyjZQ5tU7H4c1hX1WcAAGgRVF1oVtTEH8vA4V+roVB35+8Jk08rzqh+ghIUX99P2keUTOlllYUbxb7DXfsOprD5tDGc/jmMMZrYzL3ibdW0229/eaokXMPI6As7ApvQ7utb+sjftwQoI9BkJlbMRoW//t2GYY3bP7+r7yDUbcOVwNUm3ZoxErIM7SulpTS36uP8jcr0zPOwRAx6atMmtNVfZlt91FR3xzvrnfFLPv5YzZ5euAqFnhxmW97co1IgOElcHazmcj+m/uTaoCjaGhxB6eg7cZePuQW0iX7Ufcb0YIAHczY1d+ZfCe5wTuSYnbdJGwoor7</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <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://wayf.ordbogen.com/saml2/sp/AssertionConsumerService.php" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Ordbogen.com</md:ServiceName>
+      <md:ServiceName xml:lang="da">Ordbogen.com</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to provide an online dictionary in which you look up an unlimited number of words in the dictionaries bought by your educational institution.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at levere en online ordbog hvori du kan foretage et ubegrænset antal opslag i de ordbøger, som din institution har købt adgang til.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute 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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index a08172f6..1d23920f 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -2,7 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.wayf.dk">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">au.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dtu.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
@@ -23,7 +22,6 @@
       <shibmd:Scope regexp="false">iha.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">uni-login.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sdu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">itu.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ucn.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">frg.itcfyn.dk</shibmd:Scope>
@@ -118,21 +116,29 @@
       <shibmd:Scope regexp="false">karch.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">zbc.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">jach-idp.test.wayf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">cbs.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sosuesbjerg.itcfyn.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">deff.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">hogym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">kristne-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">eucsyd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ikgym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">skgym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">vggym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">vgtgym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dsn.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">koldcollege.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">au.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">naestved-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">learnmark.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">aabc.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">vordingborg-gym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">hasseris-gym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">statsskolen.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">sosusj.itcfyn.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">wayf.dk</shibmd:Scope>
       <saml:Attribute Name="tags">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com.xml b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
new file mode 100644
index 00000000..5405fd3f
--- /dev/null
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/entity">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <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-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">EmeraldInsight</md:ServiceName>
+      <md:ServiceName xml:lang="da">EmeraldInsight</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">provide personalized access to journals and papers on social sciences</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">give adgang til EmeraldInsights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
+      <md:RequestedAttribute 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"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ordbogen.com.xml b/swamid-interfederations-2.0/www.ordbogen.com.xml
index 93e135de..1325d7c6 100644
--- a/swamid-interfederations-2.0/www.ordbogen.com.xml
+++ b/swamid-interfederations-2.0/www.ordbogen.com.xml
@@ -24,7 +24,7 @@
       <md:ServiceDescription xml:lang="da">at levere en online ordbog hvori du kan foretage et ubegrænset antal opslag i de ordbøger, som din institution har købt adgang til.</md:ServiceDescription>
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute 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"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">