summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2013-04-08 09:22:54 +0200
committerLeif Johansson <leifj@sunet.se>2013-04-08 09:22:54 +0200
commit789774d707a057d7ec5c5f1c5cfd7138c6d6bcef (patch)
tree0b75e270a6459845eb9cb128a2317f1f9223ddd6
parent9660da9374552e1bfd87ca92faa08c8f0237abf9 (diff)
https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-2.0
-rw-r--r--swamid-interfederations-2.0.mxml1
-rw-r--r--swamid-interfederations-2.0/.xml77
-rw-r--r--swamid-interfederations-2.0/agw-sparknet.utu.fi.xml4
-rw-r--r--swamid-interfederations-2.0/filesender.funet.fi.xml126
-rw-r--r--swamid-interfederations-2.0/foodl.org.xml84
-rw-r--r--swamid-interfederations-2.0/fse.eduuni.fi.xml4
-rw-r--r--swamid-interfederations-2.0/idp.abo.fi.xml8
-rw-r--r--swamid-interfederations-2.0/idp.csc.fi.xml6
-rw-r--r--swamid-interfederations-2.0/idp.feide.no.xml574
-rw-r--r--swamid-interfederations-2.0/idp.ids-mannheim.de.xml2
-rw-r--r--swamid-interfederations-2.0/idp.it.helsinki.fi.xml4
-rw-r--r--swamid-interfederations-2.0/idp.metropolia.fi.xml4
-rw-r--r--swamid-interfederations-2.0/idp.shh.fi.xml6
-rw-r--r--swamid-interfederations-2.0/idp.tut.fi.xml2
-rw-r--r--swamid-interfederations-2.0/moodle.helsinki.fi.xml20
-rw-r--r--swamid-interfederations-2.0/moodle.utu.fi.xml4
-rw-r--r--swamid-interfederations-2.0/openwiki.uninett.no.xml89
-rw-r--r--swamid-interfederations-2.0/rr.funet.fi.xml235
-rw-r--r--swamid-interfederations-2.0/shibboleth.bbaw.de.xml2
-rw-r--r--swamid-interfederations-2.0/sp.catalog.clarin.eu.xml2
-rw-r--r--swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml2
-rw-r--r--swamid-interfederations-2.0/sp.lat.csc.fi.xml130
-rw-r--r--swamid-interfederations-2.0/sp.lux17.mpi.nl.xml2
-rw-r--r--swamid-interfederations-2.0/terena.org.xml72
-rw-r--r--swamid-interfederations-2.0/tullbommen.arcada.fi.xml35
-rw-r--r--swamid-interfederations-2.0/wayf.wayf.dk.xml177
-rw-r--r--swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml4
-rw-r--r--swamid-interfederations-2.0/wiseflow.dk.xml44
28 files changed, 906 insertions, 814 deletions
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 2d1be64a..b4fa712e 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -276,6 +276,7 @@
<xi:include href="swamid-interfederations-2.0/web.tut.fi.xml"/>
<xi:include href="swamid-interfederations-2.0/whoami.cesnet.cz.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiseflow.dk.xml"/>
<xi:include href="swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml"/>
<xi:include href="swamid-interfederations-2.0/wws.redi-bw.de.xml"/>
<xi:include href="swamid-interfederations-2.0/www2.munzinger.de.xml"/>
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index 97ddb782..4173cab0 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,48 +1,33 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:geant:edugain:component:be:aaieduhr:aaiedu.hr">
-<md:Extensions>
-<mdrpi:RegistrationInfo registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
-</md:Extensions>
-<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-<md:Extensions>
-<mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">AAI@EduHr Single Sign-On Service</mdui:DisplayName>
- <mdui:DisplayName xml:lang="hr">Središnji AAI@EduHr autentifikacijski servis</mdui:DisplayName>
- <mdui:Description xml:lang="en">Central Login Service for the AAI@EduHr Federation with implemented Single Sign-On Feature</mdui:Description>
- <mdui:Description xml:lang="hr">Središnji autentifikacijski servis AAI@EduHr federacije s implementiranim sustavom jedinstvene autentifikacije (Single Sign-On Service)</mdui:Description>
- </mdui:UIInfo>
-</md:Extensions>
-<md:KeyDescriptor use="signing">
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>MIIEbDCCA1SgAwIBAgICAVYwDQYJKoZIhvcNAQEFBQAwQTETMBEGCgmSJomT8ixkARkTA25ldDEVMBMGCgmSJomT8ixkARkTBWdlYW50MRMwEQYDVQQDEwplZHVHQUlOU0NBMB4XDTEwMDYxMDA3NTk1NloXDTE4MDExNDA3NTk1NlowWTETMBEGCgmSJomT8ixkARkWA25ldDEVMBMGCgmSJomT8ixkARkWBWdlYW50MREwDwYDVQQKEwhBQUlFZHVIcjEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxSGZkVlXr7xZYvilQxqXfxinRUuKPJMVrrOXo33P5Y7PXZiNRiMldtAyD3gQpcPWY68HrTZWspypX6oLRKRIlRC7Nj4/E6Bwn+pD/TqnN8UwL5SuDm+kp7z/zHXYGfmalIzibOHpPlmV39PcObdPE02wtrxV3WtmZjakzD8vZwnRjwcS3jbcHgwmEnzcAcMrrXtJ4A5G5OlgE7A3U5cCttxd3Y8w3u9meZWAxsb9AzrWGwYUsH1bbStVQqXFZHH5U9VIs8iyQSfHCdV2jEN46nZkwbNVPnIMzQ3eaZrZ4JRth1BUdpNnbvv2mZH7YPbdLz2vWSrBpFfubwuxJHrrEQIDAQABo4IBVDCCAVAwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU3UDcH284PfxY0A2gvZ7CGfclywIwHwYDVR0jBBgwFoAUiw+PJ4DSk9dGXZGEuy6YYq4E8dIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB9BgNVHREEdjB0gg9sb2dpbi5hYWllZHUuaHKGYWh0dHBzOi8vcmVnaXN0cnkuZWR1Z2Fpbi5vcmcvcmVzb2x2ZXI/dXJuPXVybjpnZWFudDplZHVnYWluOmNvbXBvbmVudDpiZTphYWllZHVocjpsb2dpbi5hYWllZHUuaHIwNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL3NjYS5lZHVnYWluLm9yZy9jcmwvY2FjcmwuZGVyMBsGA1UdIAQUMBIwEAYOKwYBBAGB1H4BDAIAAAQwDQYJKoZIhvcNAQEFBQADggEBAHvccCTPvtBVhBUJA8TZEAhOhctLbafP9vE2BDEuPy7cQLujli9mnocpIthwZ4JmRp2xZeTki+vetpikyc192o4d6iUrYVorY//uow3YUifsSDIN2VNfZvjs0lDAzfdTfXMvDugg8hEoEhOhr/yP6FGalM1nhvxauD4jwv6rgTuKPcNWDvFV6LVCxO0m3Mfk5pSlndFE9SXrQFC1dyXRcU1KqvMjjbZ0idKEpe7wMwIgWNGadqKCtBzF1GLkZQSsgiQUIVD3YG6OYBHzi6+/Shl3oueoMGWa8NQdycPHiz0qBS3CuCVwpJAoGymxJqoyWVkyKcrsYpwFgNq0PoAhN78=</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</md:KeyDescriptor>
-<md:KeyDescriptor use="encryption">
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>MIIEbDCCA1SgAwIBAgICAVYwDQYJKoZIhvcNAQEFBQAwQTETMBEGCgmSJomT8ixkARkTA25ldDEVMBMGCgmSJomT8ixkARkTBWdlYW50MRMwEQYDVQQDEwplZHVHQUlOU0NBMB4XDTEwMDYxMDA3NTk1NloXDTE4MDExNDA3NTk1NlowWTETMBEGCgmSJomT8ixkARkWA25ldDEVMBMGCgmSJomT8ixkARkWBWdlYW50MREwDwYDVQQKEwhBQUlFZHVIcjEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxSGZkVlXr7xZYvilQxqXfxinRUuKPJMVrrOXo33P5Y7PXZiNRiMldtAyD3gQpcPWY68HrTZWspypX6oLRKRIlRC7Nj4/E6Bwn+pD/TqnN8UwL5SuDm+kp7z/zHXYGfmalIzibOHpPlmV39PcObdPE02wtrxV3WtmZjakzD8vZwnRjwcS3jbcHgwmEnzcAcMrrXtJ4A5G5OlgE7A3U5cCttxd3Y8w3u9meZWAxsb9AzrWGwYUsH1bbStVQqXFZHH5U9VIs8iyQSfHCdV2jEN46nZkwbNVPnIMzQ3eaZrZ4JRth1BUdpNnbvv2mZH7YPbdLz2vWSrBpFfubwuxJHrrEQIDAQABo4IBVDCCAVAwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU3UDcH284PfxY0A2gvZ7CGfclywIwHwYDVR0jBBgwFoAUiw+PJ4DSk9dGXZGEuy6YYq4E8dIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB9BgNVHREEdjB0gg9sb2dpbi5hYWllZHUuaHKGYWh0dHBzOi8vcmVnaXN0cnkuZWR1Z2Fpbi5vcmcvcmVzb2x2ZXI/dXJuPXVybjpnZWFudDplZHVnYWluOmNvbXBvbmVudDpiZTphYWllZHVocjpsb2dpbi5hYWllZHUuaHIwNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL3NjYS5lZHVnYWluLm9yZy9jcmwvY2FjcmwuZGVyMBsGA1UdIAQUMBIwEAYOKwYBBAGB1H4BDAIAAAQwDQYJKoZIhvcNAQEFBQADggEBAHvccCTPvtBVhBUJA8TZEAhOhctLbafP9vE2BDEuPy7cQLujli9mnocpIthwZ4JmRp2xZeTki+vetpikyc192o4d6iUrYVorY//uow3YUifsSDIN2VNfZvjs0lDAzfdTfXMvDugg8hEoEhOhr/yP6FGalM1nhvxauD4jwv6rgTuKPcNWDvFV6LVCxO0m3Mfk5pSlndFE9SXrQFC1dyXRcU1KqvMjjbZ0idKEpe7wMwIgWNGadqKCtBzF1GLkZQSsgiQUIVD3YG6OYBHzi6+/Shl3oueoMGWa8NQdycPHiz0qBS3CuCVwpJAoGymxJqoyWVkyKcrsYpwFgNq0PoAhN78=</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</md:KeyDescriptor>
-<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/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://login.aaiedu.hr/sso/saml2/idp/SSOService.php"/>
-</md:IDPSSODescriptor>
-<md:Organization>
-<md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
-<md:OrganizationName xml:lang="hr">AAI@EduHr</md:OrganizationName>
-<md:OrganizationDisplayName xml:lang="en">AAI@EduHr - Croatian Research and Education Federation</md:OrganizationDisplayName>
-<md:OrganizationDisplayName xml:lang="hr">AAI@EduHr - Autentifikacijska i autorizacijska infrastruktura sustava znanosti i obrazovanja u Republici Hrvatskoj</md:OrganizationDisplayName>
-<md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
-<md:OrganizationURL xml:lang="hr">http://www.aaiedu.hr</md:OrganizationURL>
-</md:Organization>
-<md:ContactPerson contactType="technical">
-<md:GivenName>Dubravko</md:GivenName>
-<md:SurName>Voncina</md:SurName>
-<md:EmailAddress>team@aaiedu.hr</md:EmailAddress>
-</md:ContactPerson>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2013-04-12T07:17:02Z" cacheDuration="PT345600S">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIHPDCCBiSgAwIBAgIQBqroOeZGXLtbM/pxpybmVDANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTExMDIwNzAwMDAwMFoXDTEzMDQyNTIzNTk1OVowgeIxHTAbBgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzELMAkGA1UEBhMCREsxFDASBgNVBAgTC0hvdmVkc3RhZGVuMRcwFQYDVQQHEw5Lb25nZW5zIEx5bmdieTEpMCcGA1UEChMgSUJJU1RJQyBURUNITk9MT0dJRVMgREVOTUFSSyBBL1MxEzARBgNVBAsTCk9wZXJhdGlvbnMxHTAbBgNVBAMTFHNlcnZpY2VzLmliaXN0aWMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArewM8dSQqpWoBWgFQa4P5vQ53fWsYLyJNkPsVmOf3YBE4XjCHhm0jgJkSE4vgcLmolaPHxkxYwyfRif11bpkcxtWN2QQwqNJjZcgfin8kYiImRu1Y+dDW/BQUsmkUgNgo+ualWDtP8Rx0BTm81BzJYDUUPzeyGhwDKY2urHpJFCp83eChopbCb7L7ITjKoQNv6Ak+1vkrWhugJBUyS+1o7fnWYbXSmQCBztlZ2rzcXojYiI5vP0OQ6wrJ7sWXCusdvDNpXzK/CdmzTNLjKEl3Ofmd+tQC001NH62DvvukyirESjc4AvlCaymEXVLJL8LrsBFdzxGTjPjBJz2kcbLGwIDAQABo4IDZDCCA2AwHwYDVR0jBBgwFoAUTFjLJfBBT1L0KMiBQ5umqKDmkuUwHQYDVR0OBBYEFO3n6sj7ezQ9K5XEsjB3hZnMpHu3MB8GA1UdEQQYMBaCFHNlcnZpY2VzLmliaXN0aWMubmV0MIGBBggrBgEFBQcBAQR1MHMwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBLBggrBgEFBQcwAoY/aHR0cDovL3d3dy5kaWdpY2VydC5jb20vQ0FDZXJ0cy9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwYQYDVR0fBFowWDAqoCigJoYkaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL2V2MjAwOWEuY3JsMCqgKKAmhiRodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vZXYyMDA5YS5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBEGCWCGSAGG+EIBAQQEAwIGwDAOBgNVHQ8BAf8EBAMCBaAwDQYJKoZIhvcNAQEFBQADggEBAHddJRU33qaEDpYuogJ3H4bMQ+LhMwaCKxpH0W/BPbplL9hPzPByJqaM216LH4npiTsnWVrzQ7SWVl6J6yVHgLLctekigjBjz0JNk6UB3skVZsfMhK1GyD6r4SspuPY7RU6ejEbm/1rlB4haDvr0Yd56zRSKP/OUf8P0wTqPOk4V55OUH0vMmnDH7VlaswRtZZBeai3q/3BeZiuQEvrs6ZZBo6UbVWUzRbxvlRAAkRm+cKR6RA0FHIzmjKD36SLQhyMAgE9PFPLwu52LgsYR9Fq0qzHxTQ5rLN7OWz7RSonda1UPkjp5qGdit3M4a/T6t9hLFXcmA6kmL8hq13l0tUw=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIHPDCCBiSgAwIBAgIQBqroOeZGXLtbM/pxpybmVDANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTExMDIwNzAwMDAwMFoXDTEzMDQyNTIzNTk1OVowgeIxHTAbBgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzELMAkGA1UEBhMCREsxFDASBgNVBAgTC0hvdmVkc3RhZGVuMRcwFQYDVQQHEw5Lb25nZW5zIEx5bmdieTEpMCcGA1UEChMgSUJJU1RJQyBURUNITk9MT0dJRVMgREVOTUFSSyBBL1MxEzARBgNVBAsTCk9wZXJhdGlvbnMxHTAbBgNVBAMTFHNlcnZpY2VzLmliaXN0aWMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArewM8dSQqpWoBWgFQa4P5vQ53fWsYLyJNkPsVmOf3YBE4XjCHhm0jgJkSE4vgcLmolaPHxkxYwyfRif11bpkcxtWN2QQwqNJjZcgfin8kYiImRu1Y+dDW/BQUsmkUgNgo+ualWDtP8Rx0BTm81BzJYDUUPzeyGhwDKY2urHpJFCp83eChopbCb7L7ITjKoQNv6Ak+1vkrWhugJBUyS+1o7fnWYbXSmQCBztlZ2rzcXojYiI5vP0OQ6wrJ7sWXCusdvDNpXzK/CdmzTNLjKEl3Ofmd+tQC001NH62DvvukyirESjc4AvlCaymEXVLJL8LrsBFdzxGTjPjBJz2kcbLGwIDAQABo4IDZDCCA2AwHwYDVR0jBBgwFoAUTFjLJfBBT1L0KMiBQ5umqKDmkuUwHQYDVR0OBBYEFO3n6sj7ezQ9K5XEsjB3hZnMpHu3MB8GA1UdEQQYMBaCFHNlcnZpY2VzLmliaXN0aWMubmV0MIGBBggrBgEFBQcBAQR1MHMwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBLBggrBgEFBQcwAoY/aHR0cDovL3d3dy5kaWdpY2VydC5jb20vQ0FDZXJ0cy9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwYQYDVR0fBFowWDAqoCigJoYkaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL2V2MjAwOWEuY3JsMCqgKKAmhiRodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vZXYyMDA5YS5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBEGCWCGSAGG+EIBAQQEAwIGwDAOBgNVHQ8BAf8EBAMCBaAwDQYJKoZIhvcNAQEFBQADggEBAHddJRU33qaEDpYuogJ3H4bMQ+LhMwaCKxpH0W/BPbplL9hPzPByJqaM216LH4npiTsnWVrzQ7SWVl6J6yVHgLLctekigjBjz0JNk6UB3skVZsfMhK1GyD6r4SspuPY7RU6ejEbm/1rlB4haDvr0Yd56zRSKP/OUf8P0wTqPOk4V55OUH0vMmnDH7VlaswRtZZBeai3q/3BeZiuQEvrs6ZZBo6UbVWUzRbxvlRAAkRm+cKR6RA0FHIzmjKD36SLQhyMAgE9PFPLwu52LgsYR9Fq0qzHxTQ5rLN7OWz7RSonda1UPkjp5qGdit3M4a/T6t9hLFXcmA6kmL8hq13l0tUw=</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://services.ibistic.net/redirector/saml/post/ac" index="0"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
+ <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</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:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" 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: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/agw-sparknet.utu.fi.xml b/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
index 7c8e897f..8ee7fff4 100644
--- a/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
+++ b/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
@@ -60,11 +60,11 @@ DSWPf8vQpQ==</ds:X509Certificate>
<md:ContactPerson contactType="technical">
<md:GivenName>Mikko</md:GivenName>
<md:SurName>Niemi</md:SurName>
- <md:EmailAddress>hakajasen@utu.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:GivenName>Mikko</md:GivenName>
<md:SurName>Niemi</md:SurName>
- <md:EmailAddress>hakajasen@utu.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index 2cd8fae7..297b43d4 100644
--- a/swamid-interfederations-2.0/filesender.funet.fi.xml
+++ b/swamid-interfederations-2.0/filesender.funet.fi.xml
@@ -1,19 +1,9 @@
<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.funet.fi">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.edugain.org/dataprotection/coc-eu-01-draft</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <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://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" 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://filesender.funet.fi">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
+ <mdui:UIInfo>
<mdui:DisplayName xml:lang="fi">Funet FileSender</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Funet FileSender</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Funet FileSender</mdui:DisplayName>
@@ -23,11 +13,15 @@
<mdui:PrivacyStatementURL xml:lang="fi">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
+ <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">finland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEyMDYyNjAwMDAwMFoXDTE1MDYyNjIzNTk1OVowgbAxCzAJBgNV
BAYTAkZJMQ4wDAYDVQQREwUwMjEwMTEQMA4GA1UECBMHdXVzaW1hYTEOMAwGA1UE
@@ -53,49 +47,49 @@ Fq9C5c4z3aH1DOpUaVDzRr3gKxEloP0iJfp/jR00cs8hNKw0Lzw/dXVIQ+ObT1B7
4Qm4RJUOIO/yHNqLvs0QRhYCnonyfUN5Hg5RA0hGwBXJzLZpVYG4yNVYEuSS47BA
NuSoiRuRqUwvjh1crrpK3aEPzrhwALKEQo0tIKOpSHjVUwvGXWtoljY7JJJt94y1
o9pAScnCYOeqNoQ//wrcSVQcwozZLhGlymlLAyDI0rx/hM9v+8PL1E0iFmf/</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="2" isDefault="false"/>
- <AttributeConsumingService index="1" isDefault="true">
- <ServiceName xml:lang="fi">Funet FileSender</ServiceName>
- <ServiceName xml:lang="en">Funet FileSender</ServiceName>
- <ServiceName xml:lang="sv">Funet FileSender</ServiceName>
- <ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</ServiceDescription>
- <ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</ServiceDescription>
- <ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</ServiceDescription>
- <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <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"/>
- <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"/>
- <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"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
- <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
- <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
- <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
- <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
- <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
- <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
- </Organization>
- <ContactPerson contactType="administrative">
- <GivenName>Harri</GivenName>
- <SurName>Kuusisto</SurName>
- <EmailAddress>funyht@csc.fi</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Tomi</GivenName>
- <SurName>Salmi</SurName>
- <EmailAddress>noc@funet.fi</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Tomi</GivenName>
- <SurName>Salmi</SurName>
- <EmailAddress>noc@funet.fi</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
+ </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://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="1" isDefault="true"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="2" isDefault="false"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="fi">Funet FileSender</md:ServiceName>
+ <md:ServiceName xml:lang="en">Funet FileSender</md:ServiceName>
+ <md:ServiceName xml:lang="sv">Funet FileSender</md:ServiceName>
+ <md:ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+ <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" FriendlyName="eduPersonPrincipalName"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Harri</md:GivenName>
+ <md:SurName>Kuusisto</md:SurName>
+ <md:EmailAddress>mailto:funyht@csc.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Tomi</md:GivenName>
+ <md:SurName>Salmi</md:SurName>
+ <md:EmailAddress>mailto:noc@funet.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Tomi</md:GivenName>
+ <md:SurName>Salmi</md:SurName>
+ <md:EmailAddress>mailto:noc@funet.fi</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/foodl.org.xml b/swamid-interfederations-2.0/foodl.org.xml
index ebb05e1d..41952b49 100644
--- a/swamid-interfederations-2.0/foodl.org.xml
+++ b/swamid-interfederations-2.0/foodl.org.xml
@@ -1,54 +1,34 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
-<md:Extensions>
-<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-05-05T06:16:34Z">
-<mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-</mdrpi:RegistrationInfo>
-</md:Extensions>
-<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-<md:Extensions>
-<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-<mdui:DisplayName xml:lang="en">Foodle</mdui:DisplayName>
-<mdui:DisplayName xml:lang="no">Foodle</mdui:DisplayName>
-<mdui:DisplayName xml:lang="nn">Foodle</mdui:DisplayName>
-<mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
-<mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
-<mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
-</mdui:UIInfo>
-</md:Extensions>
-<md:KeyDescriptor>
-<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:X509Data>
-<ds:X509Certificate>MIICLzCCAZgCCQDWeshLcjcICTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wHhcNMDkwMTMwMTIyMzI4WhcNMzYwNjE2MTIyMzI4WjBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMLZMDXYErToL/IAb8WcTYN4bGZtwnwc8RmsuFSo2Bu3q+27fQIjn5uF/OfC9D2Bs5nqy8PjHSfp4gTG2gL/+Vi8J1rLnTLgTCBl/DacPU1MhkKiw8+dqzsPm96ELoDRJH4+O0vML3rUizkpZidEN5CgWNcg72CyKE83vN7zijevAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAmw2o4gbWppGxd5Xleyyd+s2kJMVnuXlwjsLiXz8uzeqOifAG1RVTZQDCxIAw8lAse1nLKKGZYj5PyCVwAhVjaVYuATErfeJqyTft9xtbH6Qk5mV99u1GujO2Lx54uaZFOCiCahwQGPfAm+qlrCteDoE8gqo0RJWno/HQxXE6/ac=</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</md:KeyDescriptor>
-<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
-<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
-<md:AttributeConsumingService index="0">
-<md:ServiceName xml:lang="en">Foodle</md:ServiceName>
-<md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
-<md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
-<md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
-<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"/>
-<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"/>
-<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"/>
-<md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-<md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-<md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-<md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-</md:AttributeConsumingService>
-</md:SPSSODescriptor>
-<md:Organization>
-<md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
-<md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
-<md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
-<md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
-<md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
-<md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
-</md:Organization>
-<md:ContactPerson contactType="technical">
-<md:GivenName>Feide Support</md:GivenName>
-<md:EmailAddress>support@feide.no</md:EmailAddress>
-</md:ContactPerson>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIICLzCCAZgCCQDWeshLcjcICTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wHhcNMDkwMTMwMTIyMzI4WhcNMzYwNjE2MTIyMzI4WjBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMLZMDXYErToL/IAb8WcTYN4bGZtwnwc8RmsuFSo2Bu3q+27fQIjn5uF/OfC9D2Bs5nqy8PjHSfp4gTG2gL/+Vi8J1rLnTLgTCBl/DacPU1MhkKiw8+dqzsPm96ELoDRJH4+O0vML3rUizkpZidEN5CgWNcg72CyKE83vN7zijevAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAmw2o4gbWppGxd5Xleyyd+s2kJMVnuXlwjsLiXz8uzeqOifAG1RVTZQDCxIAw8lAse1nLKKGZYj5PyCVwAhVjaVYuATErfeJqyTft9xtbH6Qk5mV99u1GujO2Lx54uaZFOCiCahwQGPfAm+qlrCteDoE8gqo0RJWno/HQxXE6/ac=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">Foodle</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</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" FriendlyName="eduPersonPrincipalName"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:Company>UNINETT AS</md:Company>
+ <md:GivenName>Andreas</md:GivenName>
+ <md:SurName>Solberg</md:SurName>
+ <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+ <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fse.eduuni.fi.xml b/swamid-interfederations-2.0/fse.eduuni.fi.xml
index a4403a4f..ee808e0c 100644
--- a/swamid-interfederations-2.0/fse.eduuni.fi.xml
+++ b/swamid-interfederations-2.0/fse.eduuni.fi.xml
@@ -71,11 +71,11 @@ NUEsJ2eMhHrNWw==</ds:X509Certificate>
<md:ContactPerson contactType="technical">
<md:GivenName>Sami</md:GivenName>
<md:SurName>Saarikoski</md:SurName>
- <md:EmailAddress>asiakaspalvelu@eduuni.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:GivenName>Toni</md:GivenName>
<md:SurName>Sormunen</md:SurName>
- <md:EmailAddress>asiakaspalvelu@eduuni.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.abo.fi.xml b/swamid-interfederations-2.0/idp.abo.fi.xml
index fcdbd245..4b7751f3 100644
--- a/swamid-interfederations-2.0/idp.abo.fi.xml
+++ b/swamid-interfederations-2.0/idp.abo.fi.xml
@@ -57,21 +57,21 @@ c1VLPrddhPOAvbbcdQPiNR6q6I7LkgyAl6KhRBYcWYd7oszFtuik</ds:X509Certificate>
<md:ContactPerson contactType="administrative">
<md:GivenName>Barbro</md:GivenName>
<md:SurName>Sjoblom</md:SurName>
- <md:EmailAddress>haka@abo.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Dennis</md:GivenName>
<md:SurName>Holtlund</md:SurName>
- <md:EmailAddress>haka@abo.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Barbro</md:GivenName>
<md:SurName>Sjoblom</md:SurName>
- <md:EmailAddress>haka@abo.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:GivenName>Barbro</md:GivenName>
<md:SurName>Sjoblom</md:SurName>
- <md:EmailAddress>haka@abo.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index 063b19a2..daddee88 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi.xml
@@ -11,9 +11,9 @@
<mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
<mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
<mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
<mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
- <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
</mdui:UIInfo>
<mdui:DiscoHints>
<mdui:DomainHint>csc.fi</mdui:DomainHint>
@@ -72,9 +72,9 @@ yDPlRNL+S5OBIx61TJQTJ1DZ</ds:X509Certificate>
<md:ContactPerson contactType="technical">
<md:GivenName>Janne</md:GivenName>
<md:SurName>Lauros</md:SurName>
- <md:EmailAddress>haka@csc.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
- <md:EmailAddress>haka@csc.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index 5210e25f..8d2322d0 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,286 +1,292 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.feide.no">
-<md:Extensions>
-<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2012-10-09T13:08:24Z">
-<mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-</mdrpi:RegistrationInfo>
-</md:Extensions>
-<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-<md:Extensions>
-<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-<mdui:DisplayName xml:lang="en">Feide</mdui:DisplayName>
-<mdui:DisplayName xml:lang="no">Feide</mdui:DisplayName>
-<mdui:DisplayName xml:lang="nn">Feide</mdui:DisplayName>
-<mdui:Description xml:lang="en">Feide is the login system for norwegian educational and research institusions.</mdui:Description>
-<mdui:Description xml:lang="no">Feide er innloggingssiden for norske utdannings- og forskningsinstitusjoner.</mdui:Description>
-<mdui:Description xml:lang="nn">Feide er innloggingssida for norske utdannings- og forskningsinstitusjonar.</mdui:Description>
-</mdui:UIInfo>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agdenes.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aho.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alstahaug.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aremark.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">as-skole.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askim.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askoy.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aure.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austagderfk.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austrheim.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">averoy.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baerum.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balestrand.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bamble.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bergensskolen.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfk.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bibsys.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bokn.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bomlo.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bremanger.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonhjemmet.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmmh.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">donna.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drammen.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eid.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eideskolen.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidfjord.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidskog.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elverum.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etne.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etnedal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fedje.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.afjord.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ahk.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.amot.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.farsund.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.kg.vgs.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.mosseskolen.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osen.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rade.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rissa.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roan.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roros.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rygge.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.sarpsborg.com</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.skedsmo.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stord.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stranda.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.trysil.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flaa.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flesberg.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flora.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forsand.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frana.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frogn.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frosta.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froya.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fusa.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">giske.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjemnes.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloppen.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gol.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">granvin.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grong.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.alesund.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.skodje.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.sula.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ha.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadsel.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haldenskole.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halsa.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnegs.fronter.com</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnes.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemsedal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy-no.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hfk.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hials.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hib.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hibu.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hifm.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hih.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hihm.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hil.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">himolde.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hin.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinesna.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hint.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hioa.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiof.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hisf.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hist.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hit.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hitra.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hive.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hivolda.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoylandet.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsh.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karmoyskolen.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khib.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khio.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klabu.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsberg.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansand.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansund.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvam.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvinnherad.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ldh.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leikanger.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leirfjord.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lierne.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillesand.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lindas.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luster.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngdal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malvik.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marker.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">masfjorden.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meland.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meldal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">melhus.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meraker.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">modalen.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mrfylke.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsskogan.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-bu.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesset.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nfk.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhh.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nih.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nla.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmh.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notodden.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notteroy.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntfk.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntnu.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nvh.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oddaskolen.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oksnes.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppdal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppland.org</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ho.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osteroy.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovgs.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oygarden.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phs.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radoy.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rana.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rauma.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennebu.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rogfk.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rollag.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">romskog.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royken.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royrvik.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samfunnsforskning.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samiskhs.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samnanger.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sande.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandefjord.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauda.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selbu.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selje.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfj.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skaun.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.fredrikstad.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.svk.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smola.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snasa.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sogndal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorum.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spusers.feide.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stavanger.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">steinkjer.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfk.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stjordal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stpaul.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strand.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stryn.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suldal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sund.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunndal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surnadal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svelvik.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tingvoll.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tinn.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tokke.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">troms.vgs.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tromso.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trondheim.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tydal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysnes.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysver.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uia.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uib.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uin.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uio.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uit.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensvang.herad.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulvik.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umb.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uninett.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsira.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaalerskolene.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaf.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagsoy.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaksdal.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valer-of.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vang.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vefsn.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestby.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfk.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgsa.no</shibmd:Scope>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voss.kommune.no</shibmd:Scope>
-</md:Extensions>
-<md:KeyDescriptor>
-<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:X509Data>
-<ds:X509Certificate>MIIDhjCCAm4CCQCMHNhxUI2H1TANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0wODA5MDUxMTU0MzNaFw0xODA3MTUxMTU0MzNaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4fTsmIsKVGtniXddnerSeiLeAZAlAOL8v+ebzVzYcpTJzMHrplD+lF2tXxRgs7IGEw3t2zRCtxnGbiGkXPW+oCs4T989z+Sq8nh7Lff/XlyK+jQ7BtfC8RUYQ+eNEQy0Fif+81JyPbiwZovbiL4WrK1GOG81/2CF7rvwyXJkDD1YXJ5W18/c06YLfYJjuzZgEoCVRq6ecgQyPKg1xwIpW2GpkKOBXA7oKWtev+xcmSiLZwZE96mSHjty0L+wW6NUuf2/8VSCc4IED0EbzqFUoeHuGXqPak+tu9+VpP6vmmyp4gSCxsmWtoKm7UC8P1QeCyZxwQaoGlIp78wsE5ao5wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQACUWuuirUSwDWksdkwKuqsNttnNmivwUMLtKDjHbMcwVK/b4qWjrAjfmJXxamUSYlnGjeoiqSQQuc3/qHCPAZUnN8VqXcZUCBXWjMO7Y/AnnsFKHpkYm51jWckjudeyfUr4UnH7te0OuUrGRIVrRRg3DqLdgrcbkJ98JyT97hnaDMke4qNVwrQFF+yvxYs1aYkILySBB/KPGSTh5sxJovcyWd7GY4ad5nH5oEjXF1yZzndmUuHGlTTzk6SGzmUJgqKyba+KJ/jauy6qNC1gPqfnbntWKDkE9a9ow8tlsi3jHI9AZu9U6LnOvTJ8MjhyXOEByCaDnTpK8JiZr6JvCaV</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</md:KeyDescriptor>
-<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SingleLogoutService.php"/>
-<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
-</md:IDPSSODescriptor>
-<md:Organization>
-<md:OrganizationName xml:lang="en">Feide</md:OrganizationName>
-<md:OrganizationName xml:lang="no">Feide</md:OrganizationName>
-<md:OrganizationDisplayName xml:lang="en">Feide</md:OrganizationDisplayName>
-<md:OrganizationDisplayName xml:lang="no">Feide</md:OrganizationDisplayName>
-<md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
-<md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
-</md:Organization>
-<md:ContactPerson contactType="technical">
-<md:GivenName>Feide Support</md:GivenName>
-<md:EmailAddress>support@feide.no</md:EmailAddress>
-</md:ContactPerson>
+<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://idp.feide.no">
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">aal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">agdenes.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">aho.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">alstahaug.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">aremark.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">arendal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">as-skole.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">askim.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">askoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">asnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">aure.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">austagderfk.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">austrheim.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">averoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">baerum.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">balestrand.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">bamble.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">bergensskolen.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">bremanger.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">diakonhjemmet.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">dmmh.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">donna.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">drammen.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">eid.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">eideskolen.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">eidfjord.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">eidskog.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">elverum.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">etne.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">etnedal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">fedje.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.afjord.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.ahk.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.amot.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.farsund.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.kg.vgs.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.mosseskolen.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.oknett.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.osen.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.rade.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.rissa.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.roan.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.roros.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.rygge.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.sarpsborg.com</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.skedsmo.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.stord.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.stranda.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">feide.trysil.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">flesberg.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">flora.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">forsand.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">frogn.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">froland.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">frosta.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">froya.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">fusa.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">giske.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">gjemnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">gloppen.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">gol.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">granvin.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">grimstad.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">grong.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">gs.alesund.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">gs.skodje.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">gs.sula.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">ha.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hadsel.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">haldenskole.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">halsa.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
+ <shibmd:Scope regexp="false">hemnegs.fronter.com</shibmd:Scope>
+ <shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hfk.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hials.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hib.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hibu.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hifm.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hig.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hih.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hihm.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hil.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">himolde.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hin.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hinesna.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hint.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hioa.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hiof.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hisf.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hist.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hit.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hitra.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hive.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hivolda.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hjartdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hjelmeland.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hobol.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hol.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hornindal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">horten.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hoylandet.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hsh.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">klabu.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">kongsberg.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">kristiansand.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">kristiansund.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">kvam.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">ldh.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">leikanger.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">leirfjord.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">lierne.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">lyngdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">malvik.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">marker.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">masfjorden.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">meland.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">meldal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">melhus.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">meraker.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">mf.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">mrfylke.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nes-bu.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nesset.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nfk.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nhh.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nih.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nith.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nla.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nmh.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">notodden.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">notteroy.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">ntfk.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">ntnu.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nvh.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">oddaskolen.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">oksnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">oppdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">oppland.org</shibmd:Scope>
+ <shibmd:Scope regexp="false">os-ho.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">osteroy.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">ovgs.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">oygarden.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">phs.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">radoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">rana.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">randaberg.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">rauma.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">rennebu.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">rogfk.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">rollag.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">romskog.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">royken.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">royrvik.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">samfunnsforskning.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">samiskhs.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">samnanger.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sande.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sandefjord.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sauda.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">selbu.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">selje.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sfj.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">smola.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">snasa.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">snillfjord.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sogndal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sola.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">stavanger.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">steinkjer.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">stfk.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">stjordal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">stpaul.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">strand.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">stryn.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">suldal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sund.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sunndal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">surnadal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">svelvik.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">tingvoll.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">tinn.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">tokke.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">troms.vgs.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">tromso.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">trondheim.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">tydal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">tysnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">tysver.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">uia.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">uib.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">uin.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">uio.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">uis.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">uit.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">ullensvang.herad.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">ulvik.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">umb.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">uninett.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">utsira.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vaalerskolene.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vaf.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vagan.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vagsoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vaksdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">valer-of.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vang.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vestby.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">voss.kommune.no</shibmd:Scope>
+ <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">norway</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDhjCCAm4CCQCMHNhxUI2H1TANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0wODA5MDUxMTU0MzNaFw0xODA3MTUxMTU0MzNaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4fTsmIsKVGtniXddnerSeiLeAZAlAOL8v+ebzVzYcpTJzMHrplD+lF2tXxRgs7IGEw3t2zRCtxnGbiGkXPW+oCs4T989z+Sq8nh7Lff/XlyK+jQ7BtfC8RUYQ+eNEQy0Fif+81JyPbiwZovbiL4WrK1GOG81/2CF7rvwyXJkDD1YXJ5W18/c06YLfYJjuzZgEoCVRq6ecgQyPKg1xwIpW2GpkKOBXA7oKWtev+xcmSiLZwZE96mSHjty0L+wW6NUuf2/8VSCc4IED0EbzqFUoeHuGXqPak+tu9+VpP6vmmyp4gSCxsmWtoKm7UC8P1QeCyZxwQaoGlIp78wsE5ao5wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQACUWuuirUSwDWksdkwKuqsNttnNmivwUMLtKDjHbMcwVK/b4qWjrAjfmJXxamUSYlnGjeoiqSQQuc3/qHCPAZUnN8VqXcZUCBXWjMO7Y/AnnsFKHpkYm51jWckjudeyfUr4UnH7te0OuUrGRIVrRRg3DqLdgrcbkJ98JyT97hnaDMke4qNVwrQFF+yvxYs1aYkILySBB/KPGSTh5sxJovcyWd7GY4ad5nH5oEjXF1yZzndmUuHGlTTzk6SGzmUJgqKyba+KJ/jauy6qNC1gPqfnbntWKDkE9a9ow8tlsi3jHI9AZu9U6LnOvTJ8MjhyXOEByCaDnTpK8JiZr6JvCaV</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SingleLogoutService.php"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationName>
+ <md:OrganizationName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Feide Support</md:GivenName>
+ <md:EmailAddress>support@feide.no</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Feide Support</md:GivenName>
+ <md:EmailAddress>support@feide.no</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
index 87519fe5..1e112127 100644
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
@@ -68,6 +68,6 @@ VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
<md:ContactPerson contactType="technical">
<md:GivenName>Oliver</md:GivenName>
<md:SurName>Schonefeld</md:SurName>
- <md:EmailAddress>schonefeld@ids-mannheim.de</md:EmailAddress>
+ <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.helsinki.fi.xml b/swamid-interfederations-2.0/idp.it.helsinki.fi.xml
index 424beb9b..e7ddf6bc 100644
--- a/swamid-interfederations-2.0/idp.it.helsinki.fi.xml
+++ b/swamid-interfederations-2.0/idp.it.helsinki.fi.xml
@@ -103,11 +103,11 @@ mdOXEA==</ds:X509Certificate>
<md:ContactPerson contactType="technical">
<md:GivenName>Olli</md:GivenName>
<md:SurName>Saikko</md:SurName>
- <md:EmailAddress>haka-hy@helsinki.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Aarno</md:GivenName>
<md:SurName>Sandvik</md:SurName>
- <md:EmailAddress>haka-hy@helsinki.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.metropolia.fi.xml b/swamid-interfederations-2.0/idp.metropolia.fi.xml
index 45f876b0..0e8c1014 100644
--- a/swamid-interfederations-2.0/idp.metropolia.fi.xml
+++ b/swamid-interfederations-2.0/idp.metropolia.fi.xml
@@ -87,11 +87,11 @@ LQc3QWj/dW5XWHUtjA==</ds:X509Certificate>
<md:ContactPerson contactType="administrative">
<md:GivenName>Jani</md:GivenName>
<md:SurName>Kaljunen</md:SurName>
- <md:EmailAddress>jani.kaljunen@metropolia.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:jani.kaljunen@metropolia.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Jukka</md:GivenName>
<md:SurName>Veikkolainen</md:SurName>
- <md:EmailAddress>jukka.veikkolainen@metropolia.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:jukka.veikkolainen@metropolia.fi</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shh.fi.xml b/swamid-interfederations-2.0/idp.shh.fi.xml
index e04a3f08..d9e636cc 100644
--- a/swamid-interfederations-2.0/idp.shh.fi.xml
+++ b/swamid-interfederations-2.0/idp.shh.fi.xml
@@ -57,16 +57,16 @@ DHUtc3gzsgtW+kmogclxEEhyxzzdY3RDFKnBuX2HGUNJEI35KVIfYyHgV+32jzW4
<md:ContactPerson contactType="administrative">
<md:GivenName>Kuno</md:GivenName>
<md:SurName>Ohrman</md:SurName>
- <md:EmailAddress>shibboservice@hanken.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:shibboservice@hanken.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Johan</md:GivenName>
<md:SurName>Isaksson</md:SurName>
- <md:EmailAddress>shibboservice@hanken.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:shibboservice@hanken.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:GivenName>Hanken</md:GivenName>
<md:SurName>Helpdesk</md:SurName>
- <md:EmailAddress>help@hanken.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:help@hanken.fi</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tut.fi.xml b/swamid-interfederations-2.0/idp.tut.fi.xml
index d931071c..73ac3b4e 100644
--- a/swamid-interfederations-2.0/idp.tut.fi.xml
+++ b/swamid-interfederations-2.0/idp.tut.fi.xml
@@ -97,6 +97,6 @@ FZ4=</ds:X509Certificate>
<md:ContactPerson contactType="technical">
<md:GivenName>Teemu</md:GivenName>
<md:SurName>Turpeinen</md:SurName>
- <md:EmailAddress>idp-support@tut.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:idp-support@tut.fi</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/moodle.helsinki.fi.xml b/swamid-interfederations-2.0/moodle.helsinki.fi.xml
index 09ab1c6f..af13cb7e 100644
--- a/swamid-interfederations-2.0/moodle.helsinki.fi.xml
+++ b/swamid-interfederations-2.0/moodle.helsinki.fi.xml
@@ -1,8 +1,15 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" 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://moodle.helsinki.fi/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" 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://moodle.helsinki.fi/shibboleth">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">University of Helsinki\'s Moodle</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Moodle</mdui:DisplayName>
+ <mdui:Description xml:lang="en">University of Helsinki\'s Moodle learning management system.</mdui:Description>
+ <mdui:Description xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</mdui:Description>
+ <mdui:PrivacyStatementURL xml:lang="fi">https://moodle.helsinki.fi/rekisteriseloste.htm</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
<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">finland</saml:AttributeValue>
@@ -43,7 +50,7 @@ vyAaHRvOgS1o4x1UPp8JoqYpWm/T9Q==</ds:X509Certificate>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
<md:AttributeConsumingService index="1" isDefault="true">
<md:ServiceName xml:lang="fi">Helsingin yliopiston Moodle</md:ServiceName>
- <md:ServiceName xml:lang="en">Helsinki University's Moodle</md:ServiceName>
+ <md:ServiceName xml:lang="en">University of Helsinki's Moodle</md:ServiceName>
<md:ServiceDescription xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</md:ServiceDescription>
<md:ServiceDescription xml:lang="en">University of Helsinki's Moodle learning management system.</md:ServiceDescription>
<md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
@@ -68,16 +75,11 @@ vyAaHRvOgS1o4x1UPp8JoqYpWm/T9Q==</ds:X509Certificate>
<md:ContactPerson contactType="administrative">
<md:GivenName>Heiko</md:GivenName>
<md:SurName>Schach</md:SurName>
- <md:EmailAddress>heiko.schach@helsinki.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Olli</md:GivenName>
- <md:SurName>Saikko</md:SurName>
- <md:EmailAddress>haka-hy@helsinki.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:heiko.schach@helsinki.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Aarno</md:GivenName>
<md:SurName>Sandvik</md:SurName>
- <md:EmailAddress>haka-hy@helsinki.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/moodle.utu.fi.xml b/swamid-interfederations-2.0/moodle.utu.fi.xml
index 7d5621a6..a536fd82 100644
--- a/swamid-interfederations-2.0/moodle.utu.fi.xml
+++ b/swamid-interfederations-2.0/moodle.utu.fi.xml
@@ -71,11 +71,11 @@ Z/dJiMGOYt1I1CwOpyO8yRc8WeYZqbrKPxO/VsQ9b15tdADxcf+EMeuQNSs=</ds:X509Certificate
<md:ContactPerson contactType="technical">
<md:GivenName>Nadja</md:GivenName>
<md:SurName>Plankevitch</md:SurName>
- <md:EmailAddress>hakajasen@utu.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:GivenName>Nadja</md:GivenName>
<md:SurName>Plankevitch</md:SurName>
- <md:EmailAddress>hakajasen@utu.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no.xml b/swamid-interfederations-2.0/openwiki.uninett.no.xml
index 66ea7589..a4ca33a0 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no.xml
@@ -1,58 +1,35 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-<md:Extensions>
-<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T11:34:54Z">
-<mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-</mdrpi:RegistrationInfo>
-</md:Extensions>
-<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-<md:Extensions>
-<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-<mdui:DisplayName xml:lang="en">UNINETT OpenWiki</mdui:DisplayName>
-<mdui:DisplayName xml:lang="no">UNINETT OpenWiki</mdui:DisplayName>
-<mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
-<mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</mdui:Description>
-</mdui:UIInfo>
-</md:Extensions>
-<md:KeyDescriptor use="signing">
-<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:X509Data>
-<ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</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>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</md:KeyDescriptor>
-<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-<md:AttributeConsumingService index="0">
-<md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
-<md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
-<md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</md:ServiceDescription>
-<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"/>
-<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"/>
-<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"/>
-<md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-<md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-<md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-<md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-</md:AttributeConsumingService>
-</md:SPSSODescriptor>
-<md:Organization>
-<md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
-<md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
-<md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
-<md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
-<md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
-<md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
-</md:Organization>
-<md:ContactPerson contactType="technical">
-<md:GivenName>Feide Support</md:GivenName>
-<md:EmailAddress>support@feide.no</md:EmailAddress>
-</md:ContactPerson>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a wikifarm where Feide users can create their own wiki.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikifarm hvor Feidebrukere kan lage egne wikier.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="nn">UNINETT OpenWiki er ein wikifarm der Feidebrukarar kan lage eigne wikiar.</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" FriendlyName="eduPersonPrincipalName"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:Company>UNINETT AS</md:Company>
+ <md:GivenName>Andreas</md:GivenName>
+ <md:SurName>Solberg</md:SurName>
+ <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+ <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rr.funet.fi.xml b/swamid-interfederations-2.0/rr.funet.fi.xml
index 678743f3..2f0366d3 100644
--- a/swamid-interfederations-2.0/rr.funet.fi.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi.xml
@@ -1,14 +1,9 @@
<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rr.funet.fi/attribute-test">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <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://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" 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://rr.funet.fi/attribute-test">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo>
<mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
<mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
@@ -17,11 +12,15 @@
<mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</mdui:PrivacyStatementURL>
</mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEzDCCA7SgAwIBAgIRANkuMGk/HlexnQRYLfLoQaEwDQYJKoZIhvcNAQEFBQAw
+ <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">finland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEzDCCA7SgAwIBAgIRANkuMGk/HlexnQRYLfLoQaEwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMjAyMjgwMDAwMDBaFw0xNDAyMjcyMzU5NTlaMIGqMQswCQYD
VQQGEwJGSTEOMAwGA1UEERMFMDIxMDExEDAOBgNVBAgTB1V1c2ltYWExDjAMBgNV
@@ -47,106 +46,106 @@ KoZIhvcNAQEFBQADggEBADH55FfR7I+1zt41DTwz2Ig9w6S6l0pFL889eFl772qV
BipmtjTfM/pv+j2iTDMRfjzTjKSlDdDOaRbCQeLDtIgJkXvwSb/OTPOWHzbLLiPE
rpMTlKYf36DnHsyERNItnzU02J686VAecWTuNgUwHHI3LzZCWVncQm+I6veK43Ct
PahX4Y7zrHlQEDDBvQM0uwFM4Dgy07Qk3EwVXCs+46U=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <AttributeConsumingService index="1" isDefault="true">
- <ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</ServiceName>
- <ServiceName xml:lang="en">Haka Attribute Test Service</ServiceName>
- <ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</ServiceDescription>
- <ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</ServiceDescription>
- <RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="CountryOfResidence" Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <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"/>
- <RequestedAttribute FriendlyName="eduCourseMember" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="eduCourseOffering" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" 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"/>
- <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <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"/>
- <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"/>
- <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"/>
- <RequestedAttribute FriendlyName="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonCreditUnits" Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonECTS" Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonEPPNTimeStamp" Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonHomeCity" Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonPrimaryStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonProgram" Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonSpecialisation" Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonStudentCategory" Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonStudentStatus" Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonStudentUnion" Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonStudyToEnd" Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="funetEduPersonTargetDegree" Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="Nickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="schacCountryOfCitizenship" Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="schacGender" Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="schacPersonalUniqueCode" Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="schacPlaceOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="userPresenceID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="userStatus" Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
- <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
- <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
- <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
- <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
- <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
- <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <GivenName>Timo</GivenName>
- <SurName>Mustonen</SurName>
- <EmailAddress>haka@csc.fi</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Timo</GivenName>
- <SurName>Mustonen</SurName>
- <EmailAddress>haka@csc.fi</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
+ <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://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
+ <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
+ <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
+ <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
+ <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" FriendlyName="eduPersonPrimaryAffiliation"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
+ <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" FriendlyName="eduPersonPrincipalName"/>
+ <md:RequestedAttribute 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" FriendlyName="eduPersonScopedAffiliation"/>
+ <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" FriendlyName="eduPersonTargetedID"/>
+ <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
+ <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
+ <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" FriendlyName="schacHomeOrganization"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Timo</md:GivenName>
+ <md:SurName>Mustonen</md:SurName>
+ <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Timo</md:GivenName>
+ <md:SurName>Mustonen</md:SurName>
+ <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bbaw.de.xml b/swamid-interfederations-2.0/shibboleth.bbaw.de.xml
index 005d0724..59676c17 100644
--- a/swamid-interfederations-2.0/shibboleth.bbaw.de.xml
+++ b/swamid-interfederations-2.0/shibboleth.bbaw.de.xml
@@ -69,6 +69,6 @@ eQj7ACg8</ds:X509Certificate>
<md:ContactPerson contactType="technical">
<md:GivenName>Kai</md:GivenName>
<md:SurName>Zimmer</md:SurName>
- <md:EmailAddress>zimmer@bbaw.de</md:EmailAddress>
+ <md:EmailAddress>mailto:zimmer@bbaw.de</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index 217f52d9..d61efbbe 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -60,6 +60,6 @@ hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI</ds:X509Certifi
<md:ContactPerson contactType="technical">
<md:GivenName>Tobias</md:GivenName>
<md:SurName>Vanvalkenhoef</md:SurName>
- <md:EmailAddress>tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
+ <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml b/swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml
index 653321a9..01cbf6ed 100644
--- a/swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml
+++ b/swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml
@@ -65,6 +65,6 @@ MLV2RZ8HHAgA9AeBjEdJIavF9Q9H6a59eFcx4A==</ds:X509Certificate>
<md:ContactPerson contactType="technical">
<md:GivenName>Marco</md:GivenName>
<md:SurName>Van der Laan</md:SurName>
- <md:EmailAddress>systeembeheer@inl.nl</md:EmailAddress>
+ <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lat.csc.fi.xml b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
index baf38a40..8f091ebc 100644
--- a/swamid-interfederations-2.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
@@ -1,38 +1,30 @@
<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sp.lat.csc.fi">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.edugain.org/dataprotection/coc-eu-01-draft</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <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://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">LAT – Language Archive Tools</mdui:DisplayName>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" 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="http://sp.lat.csc.fi">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo>
<mdui:DisplayName xml:lang="en">LAT – Language Archive Tools</mdui:DisplayName>
- <mdui:Description xml:lang="sv">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
- <mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
+ <mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
<mdui:Description xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja käsitellä video- ja äänimateriaalia.</mdui:Description>
+ <mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
<mdui:Logo height="41" width="100">https://lat.csc.fi/gif/LA.png</mdui:Logo>
- <mdui:InformationURL xml:lang="fi">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
<mdui:InformationURL xml:lang="sv">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
+ <mdui:InformationURL xml:lang="fi">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="sv">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
</mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEuDCCA6CgAwIBAgIRAJRkURURLhdqLNjrk9ROa4QwDQYJKoZIhvcNAQEFBQAw
+ <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">finland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEuDCCA6CgAwIBAgIRAJRkURURLhdqLNjrk9ROa4QwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMTA1MTgwMDAwMDBaFw0xMzA1MTcyMzU5NTlaMIGXMQswCQYD
VQQGEwJGSTEOMAwGA1UEERMFMDIxMDExEDAOBgNVBAgTB1V1c2ltYWExDjAMBgNV
@@ -58,46 +50,44 @@ lQ6NKPiVSlp9N1V6EVDnYlioyqv/pabKKivWlvl+MAAjZlfk8OmdWsBYUgH2aeM5
Q76UgcYknkN+Trpc4n8TExlhXZw881XVdm/hKgaRDnS4obofKFpZyqTtVNekHMr6
0/tukGQvVEp3KmukbhzJ2Oa4d4Q0sIZctuU8RRh62IqbBKkSAQx/kw9dF43X8rmf
gIbcJY1SYVwxxDSg</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <AttributeConsumingService index="1" isDefault="true">
- <ServiceName xml:lang="fi">LAT – Language Archive Tools</ServiceName>
- <ServiceName xml:lang="en">LAT – Language Archive Tools</ServiceName>
- <ServiceName xml:lang="sv">LAT – Language Archive Tools</ServiceName>
- <ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</ServiceDescription>
- <ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</ServiceDescription>
- <ServiceDescription xml:lang="sv">LAT is a user interface for language researchers to deposit and process audiovisual material.</ServiceDescription>
- <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"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
- <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
- <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
- <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
- <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
- <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
- <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
- </Organization>
- <ContactPerson contactType="administrative">
- <GivenName>Tero</GivenName>
- <SurName>Aalto</SurName>
- <EmailAddress>ling@csc.fi</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Martin</GivenName>
- <SurName>Matthiesen</SurName>
- <EmailAddress>martin.matthiesen@csc.fi</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Tero</GivenName>
- <SurName>Aalto</SurName>
- <EmailAddress>ling@csc.fi</EmailAddress>
- </ContactPerson>
- </EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="fi">LAT – Language Archive Tools</md:ServiceName>
+ <md:ServiceName xml:lang="en">LAT – Language Archive Tools</md:ServiceName>
+ <md:ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</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" FriendlyName="eduPersonPrincipalName"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Tero</md:GivenName>
+ <md:SurName>Aalto</md:SurName>
+ <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Martin</md:GivenName>
+ <md:SurName>Matthiesen</md:SurName>
+ <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Tero</md:GivenName>
+ <md:SurName>Aalto</md:SurName>
+ <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index d1ba3828..cb43d90b 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -60,6 +60,6 @@ A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
<md:ContactPerson contactType="technical">
<md:GivenName>Tobias</md:GivenName>
<md:SurName>van Valkenhoef</md:SurName>
- <md:EmailAddress>tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
+ <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org.xml
index 765d1414..415b4e60 100644
--- a/swamid-interfederations-2.0/terena.org.xml
+++ b/swamid-interfederations-2.0/terena.org.xml
@@ -1,43 +1,31 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">TERENA Secretariat</mdui:DisplayName>
- <mdui:Description xml:lang="en">Services run by the TERENA Secretariat.</mdui:Description>
- <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p/</mdui:PrivacyStatementURL>
- <mdui:Logo height="143" width="150" xml:lang="en">https://www.terena.org/gfx/terena-150px-SP-Logo.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</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>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>TERENA</md:GivenName>
- <md:SurName>AAI team</md:SurName>
- <md:EmailAddress>aai@terena.org</md:EmailAddress>
- </md:ContactPerson>
- </md:EntityDescriptor>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</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-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
+ <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</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:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" 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.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tullbommen.arcada.fi.xml b/swamid-interfederations-2.0/tullbommen.arcada.fi.xml
index 46de7f3a..d5c92306 100644
--- a/swamid-interfederations-2.0/tullbommen.arcada.fi.xml
+++ b/swamid-interfederations-2.0/tullbommen.arcada.fi.xml
@@ -11,35 +11,6 @@
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIIELTCCAxWgAwIBAgIQavqUF8l15ouY6e+Gm1RlcjANBgkqhkiG9w0BAQUFADA5
-MQswCQYDVQQGEwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEg
-Q2xhc3MyIENBMB4XDTA5MTIwMzIxMDMyNVoXDTEwMTIwMzIxMDMyNVowdzEaMBgG
-A1UEChMRU3RpZnRlbHNlbiBBcmNhZGExFTATBgNVBAsTDElULWNlbnRyYWxlbjEd
-MBsGA1UEAxMUdHVsbGJvbW1lbi5hcmNhZGEuZmkxIzAhBgkqhkiG9w0BCQEWFGhv
-c3RtYXN0ZXJAYXJjYWRhLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA1Af5oqZO2J/9MkGva6UNwDBpkdPf+OZAScaLOp0vXQmz2fnn8tHTZ73Bf4Vw
-m7252Fx4gGSYNU4wRTiTuo3jzaZc7PKA1iJOQVf2Glq5ys2Z7muupuHX3hSKi150
-65Z0d2wazfRjnUgx3TBLkyJ7ZvtjlZ6SVJ1S0wbBY6hnJ1iErJOw8UlrySSOXIq2
-sEPkSt8nl0Eo4P1V6VkGFU2oS3vd/FWmey1NnC3jSdDtoqb+SxFzOZi1+ykmyPv2
-kjnV4vtFnQ+04WM64xtXFsCFvGMFNSDSGbtcDr83Pq+C8iIseMBWiiKETh4hq/3T
-G8YM/aDmgpGi5dmXSuDh9odZ/wIDAQABo4HyMIHvMBMGA1UdIwQMMAqACEqgqliE
-0148MBkGA1UdIAQSMBAwDgYMKwYBBAGCDwIDAQECMHIGA1UdHwRrMGkwZ6BloGOG
-YWxkYXA6Ly8xOTQuMjUyLjEyNC4yNDE6Mzg5L2NuPVNvbmVyYSUyMENsYXNzMiUy
-MENBLG89U29uZXJhLGM9Rkk/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDtiaW5h
-cnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAsGA1UdDwQEAwIF4DAd
-BgNVHQ4EFgQUYw143pn/Vha8iT1GD6cNUD36ZxYwDQYJKoZIhvcNAQEFBQADggEB
-AHPPpWkAatTuwIYfA3eF4lV1wUx9VCcYgeu5n/yzu6p9lEGtnT9Oyf2isD9Ll6fP
-EAF86nLA0sUUY8VwmKmz4NJFyVo/jegOGVXIb/wre0hapJR73OHI4APb8IkoYUPD
-LDmh6ukYvLM5TwhpDmDaFY4hrcxu5GDq4DG9cE0X8Utbx8xZdQA9i6OjYvTKWd40
-CMpKUKb8ZGmXsx5pVDJzu5gWxXaAIX36lmg8e/kAWdOMD7e+yiQr9YDfajpWKwzv
-eIG1Ef6b4TSUvypncJLKqfKO4nQrq2rS1HNMUE+Ipfhd4pnjXk5MsX/UHvheW4F0
-8Wo8LAnlYbl+MJgiAFzNJJw=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
<ds:X509Certificate>MIIE5jCCA86gAwIBAgIQa3vG7hzvE9YGrscDYuR+kDANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEwMTExMTAwMDAwMFoXDTEzMTExMDIzNTk1OVowgbwxCzAJBgNV
@@ -88,16 +59,16 @@ zQgT271kaFblsw==</ds:X509Certificate>
<md:ContactPerson contactType="administrative">
<md:GivenName>Fredrik</md:GivenName>
<md:SurName>Finnberg</md:SurName>
- <md:EmailAddress>haka.admin@arcada.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka.admin@arcada.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="administrative">
<md:GivenName>David</md:GivenName>
<md:SurName>Sjoberg</md:SurName>
- <md:EmailAddress>haka@arcada.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka@arcada.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Harald</md:GivenName>
<md:SurName>Hannelius</md:SurName>
- <md:EmailAddress>haka.technical@arcada.fi</md:EmailAddress>
+ <md:EmailAddress>mailto:haka.technical@arcada.fi</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 72507e31..d394dc5c 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,11 +1,171 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wayf.wayf.dk">
-<md:Extensions>
-<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk">
-<mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
-</mdrpi:RegistrationInfo>
-</md:Extensions>
+<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">kb.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">hi.is</shibmd:Scope>
+ <shibmd:Scope regexp="false">ruc.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">tietgen.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">orphanage.wayf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ucl.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">aau.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">viauc.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">phmetropol.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ihk.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ucc.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">drlund-gym.dk</shibmd:Scope>
+ <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">itu.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">frberg-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ags.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">nordfyns-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">midtfyns-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">middelfart-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">opengym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">maribo-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">mulerne-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">nakskov-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">norreg.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">nyborg-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ribekatedralskole.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sctknud-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">svendborg-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">tgy.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">tornbjerg-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">vestfyns-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">vucfyn.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sosufyn.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sopu.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sosufh.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">faaborg-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">og.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">aa.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">aip.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ak.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">akat.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">asg.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">eg.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">gg.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">lg.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">mg.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ra.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">rs.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sg.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sgy.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sosur.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sska.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sss.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">stv.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">udc.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">vd.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">vhg.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">via.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">its.itsf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sikker-adgang.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">regionsjaelland.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ibc.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">natmus.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">rungsted-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">roskilde-gym.gymund.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">greve-hym.gymund.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">himmelev-gymnasium.gymund.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">kggym.gymund.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">rks-gym.gymund.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">solgym.gymund.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sst.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ucsj.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sosuc.cphwest.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">kea.cphwest.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">cphwest.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">dab.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">akf.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">bst.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">dmi.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ism.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ens.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">fob.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">fsv.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">kul.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ami.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sfi.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ank.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">vfc.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">stm.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">vej.minibib.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">dsl.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sosu-syd.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">videndjurs.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">munkensdam.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">odensekatedralskole.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">nghf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">cg-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">hs-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">kolding-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">zbc.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">cbs.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sosuesbjerg.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">deff.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">hogym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ku.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">dsn.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">aalborgstudenterkursus.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">dmjx.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">hasseris-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">apoteket.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">statsskolen.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sosusj.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">kadk.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">iva.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">dansidpp.uniit.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">dtu.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ucn.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">gribskovgymnasium.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">gefion-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">frhavn-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sde.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">eal.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">eucnvs.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">hrs.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">vuc-vs.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">sceu.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">nykat-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">vgtgym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">odense.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">dalumls.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">fredericia-gym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ghg.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">au.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">koldcollege.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">knord.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">bggym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">vibkat.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">vghf.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">eucnord.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">horsensgym.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">eucvest.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>
+ <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:KeyDescriptor use="signing">
<ds:KeyInfo>
<ds:X509Data>
@@ -32,9 +192,4 @@
<md:OrganizationURL xml:lang="da">http://wayf.dk/index.php/da</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://wayf.dk/index.php/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:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
index dfa66329..7bc00eaf 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -74,11 +74,11 @@ wN2yHSwHNNMiiGY=</ds:X509Certificate>
<md:ContactPerson contactType="technical">
<md:GivenName>Thomas</md:GivenName>
<md:SurName>Zastrow</md:SurName>
- <md:EmailAddress>thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
+ <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:GivenName>Thomas</md:GivenName>
<md:SurName>Zastrow</md:SurName>
- <md:EmailAddress>thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
+ <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiseflow.dk.xml b/swamid-interfederations-2.0/wiseflow.dk.xml
new file mode 100644
index 00000000..6a4e910e
--- /dev/null
+++ b/swamid-interfederations-2.0/wiseflow.dk.xml
@@ -0,0 +1,44 @@
+<?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://wiseflow.dk">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIE3zCCA8egAwIBAgISESEiAeIYf9g8rz2wXinbKc2kMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTIxMTI5MTI1MDEwWhcNMTMxMTMwMTI1MDEwWjA7MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEuP0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5AgMBAAGjggG/MIIBuzAOBgNVHQ8BAf8EBAMCBaAwTAYDVR0gBEUwQzBBBgkrBgEEAaAyAQowNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGswCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbGcyLmNybDCBiAYIKwYBBQUHAQEEfDB6MEEGCCsGAQUFBzAChjVodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbGcyLmNydDA1BggrBgEFBQcwAYYpaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsZzIwHQYDVR0OBBYEFDWkeXXAWKP/NtMfriWD19/ncjzAMB8GA1UdIwQYMBaAFJat+rBbuYNkKnbCHIpp2kLc/v0oMA0GCSqGSIb3DQEBBQUAA4IBAQBe/gSHt9Bypb/7HVy8fxOYmnX45aKHq1C2BZMf3Be334+Y9ewaifVstMyTHPZqoFaX/aSbrQOYjnYgh8f0L/odStFv6zGS3aYMb+/jnFJ6ibnm9jMxP+h0srn/D8H//uXUfiqUVFr55Pp9d89AkUkz9VhE5e/YhSlYhXNo0VJnd3OXLbh1rF+juNcKY+Gk9MlKVYpJJkHBmHcngZbvvMFsPc4CPV4q9iw5HJ+TD8/U6GhfJrt7pW9YN9vETCKhsUooKHIm5VjGcvMsJnv6zJ2IWUMqvmxLmOcT9YeDleBzmY3SzhxB/6wSZRw8tnegzr2vkQ59MOIODLbU1T04M+09</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIE3zCCA8egAwIBAgISESEiAeIYf9g8rz2wXinbKc2kMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTIxMTI5MTI1MDEwWhcNMTMxMTMwMTI1MDEwWjA7MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEuP0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5AgMBAAGjggG/MIIBuzAOBgNVHQ8BAf8EBAMCBaAwTAYDVR0gBEUwQzBBBgkrBgEEAaAyAQowNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGswCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbGcyLmNybDCBiAYIKwYBBQUHAQEEfDB6MEEGCCsGAQUFBzAChjVodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbGcyLmNydDA1BggrBgEFBQcwAYYpaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsZzIwHQYDVR0OBBYEFDWkeXXAWKP/NtMfriWD19/ncjzAMB8GA1UdIwQYMBaAFJat+rBbuYNkKnbCHIpp2kLc/v0oMA0GCSqGSIb3DQEBBQUAA4IBAQBe/gSHt9Bypb/7HVy8fxOYmnX45aKHq1C2BZMf3Be334+Y9ewaifVstMyTHPZqoFaX/aSbrQOYjnYgh8f0L/odStFv6zGS3aYMb+/jnFJ6ibnm9jMxP+h0srn/D8H//uXUfiqUVFr55Pp9d89AkUkz9VhE5e/YhSlYhXNo0VJnd3OXLbh1rF+juNcKY+Gk9MlKVYpJJkHBmHcngZbvvMFsPc4CPV4q9iw5HJ+TD8/U6GhfJrt7pW9YN9vETCKhsUooKHIm5VjGcvMsJnv6zJ2IWUMqvmxLmOcT9YeDleBzmY3SzhxB/6wSZRw8tnegzr2vkQ59MOIODLbU1T04M+09</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://wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiseflow.dk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">WISEflow</md:ServiceName>
+ <md:ServiceName xml:lang="da">WISEflow</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">to facilitate digital management of written exams</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="da">at facilitere digital hΌndtering af skriftlige eksaminer</md:ServiceDescription>
+ <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.6" 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.9" 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:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" 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:RequestedAttribute Name="urn:oid:2.5.4.4" 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.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Administrator</md:GivenName>
+ <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>