summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2013-11-28 09:33:15 +0100
committerLeif Johansson <leifj@sunet.se>2013-11-28 09:33:15 +0100
commitad0660f350f6e336bb90b1c735f0091815f76767 (patch)
tree89c7a315e7598fae43c0579706969ed735c9920b
parent18db6df438e882cee25185b2c37519a88b9874e1 (diff)
http://mds.edugain.org into swamid-interfederations-2.0
-rw-r--r--swamid-interfederations-2.0.mxml14
-rw-r--r--swamid-interfederations-2.0/.xml77
-rw-r--r--swamid-interfederations-2.0/aai-idp.uzh.ch.xml4
-rw-r--r--swamid-interfederations-2.0/aai-logon.bfh.ch.xml18
-rw-r--r--swamid-interfederations-2.0/aai-logon.switch.ch.xml2
-rw-r--r--swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml9
-rw-r--r--swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml118
-rw-r--r--swamid-interfederations-2.0/cafe.unicentro.br.xml118
-rw-r--r--swamid-interfederations-2.0/capuccino.iff.edu.br.xml112
-rw-r--r--swamid-interfederations-2.0/clarin.ids-mannheim.de.xml8
-rw-r--r--swamid-interfederations-2.0/community.ja.net.xml3
-rw-r--r--swamid-interfederations-2.0/core.uwap.org.xml22
-rw-r--r--swamid-interfederations-2.0/dev.emeraldinsight.com.xml3
-rw-r--r--swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml7
-rw-r--r--swamid-interfederations-2.0/filesender.funet.fi.xml118
-rw-r--r--swamid-interfederations-2.0/foodl.org.xml58
-rw-r--r--swamid-interfederations-2.0/iam.cf.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp.aai.arnes.si.xml68
-rw-r--r--swamid-interfederations-2.0/idp.admin.grnet.gr.xml2
-rw-r--r--swamid-interfederations-2.0/idp.company.ja.net.xml3
-rw-r--r--swamid-interfederations-2.0/idp.csc.fi.xml77
-rw-r--r--swamid-interfederations-2.0/idp.feide.no.xml615
-rw-r--r--swamid-interfederations-2.0/idp.heanet.ie.xml65
-rw-r--r--swamid-interfederations-2.0/idp.ids-mannheim.de.xml149
-rw-r--r--swamid-interfederations-2.0/idp.its.fz-juelich.de.xml154
-rw-r--r--swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp.niif.hu.xml8
-rw-r--r--swamid-interfederations-2.0/idp.renater.fr.xml2
-rw-r--r--swamid-interfederations-2.0/idp.reuna.cl.xml100
-rw-r--r--swamid-interfederations-2.0/idp.shibboleth.net.xml7
-rw-r--r--swamid-interfederations-2.0/idp.uqam.ca.xml7
-rw-r--r--swamid-interfederations-2.0/idp2.iay.org.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml114
-rw-r--r--swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml118
-rw-r--r--swamid-interfederations-2.0/issues.shibboleth.net.xml25
-rw-r--r--swamid-interfederations-2.0/lu-idp.lu.lv.xml2
-rw-r--r--swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml115
-rw-r--r--swamid-interfederations-2.0/openwiki.uninett.no.xml61
-rw-r--r--swamid-interfederations-2.0/qub.ac.uk.xml95
-rw-r--r--swamid-interfederations-2.0/repos.ids-mannheim.de.xml8
-rw-r--r--swamid-interfederations-2.0/rr.funet.fi.xml232
-rw-r--r--swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/shib.manchester.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/sourcesup.cru.fr.xml70
-rw-r--r--swamid-interfederations-2.0/sp.catalog.clarin.eu.xml151
-rw-r--r--swamid-interfederations-2.0/sp.ebrary.com.xml84
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk.xml37
-rw-r--r--swamid-interfederations-2.0/sp.lat.csc.fi.xml108
-rw-r--r--swamid-interfederations-2.0/sp.lux17.mpi.nl.xml152
-rw-r--r--swamid-interfederations-2.0/sso.utu.fi.xml79
-rw-r--r--swamid-interfederations-2.0/swamid.user.uu.se.xml172
-rw-r--r--swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml13
-rw-r--r--swamid-interfederations-2.0/terena.org.xml51
-rw-r--r--swamid-interfederations-2.0/test-adfs.geant.net.xml82
-rw-r--r--swamid-interfederations-2.0/test.federation.renater.fr.xml143
-rw-r--r--swamid-interfederations-2.0/test.ukfederation.org.uk.xml3
-rw-r--r--swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml3
-rw-r--r--swamid-interfederations-2.0/wayf.wayf.dk.xml179
-rw-r--r--swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml149
-rw-r--r--swamid-interfederations-2.0/wiki.shibboleth.net.xml27
-rw-r--r--swamid-interfederations-2.0/www.emeraldinsight.com.xml176
-rw-r--r--swamid-interfederations-2.0/www.knodium.com.xml67
-rw-r--r--swamid-interfederations-2.0/www.videotorium.hu.xml28
66 files changed, 3176 insertions, 1340 deletions
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 4d15700c..dbc888f7 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -38,6 +38,7 @@
<xi:include href="swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ifes.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ifg.edu.br.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ifpi.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.on.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.pucminas.br.xml"/>
@@ -47,11 +48,13 @@
<xi:include href="swamid-interfederations-2.0/cafe.uesb.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.uesc.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ufpa.br.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.unicentro.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.unifap.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.unisc.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.upf.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.uscs.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/calipso.cpd.ufv.br.xml"/>
+<xi:include href="swamid-interfederations-2.0/capuccino.iff.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/capuccino.info.ufrn.br.xml"/>
<xi:include href="swamid-interfederations-2.0/caroa.univasf.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cas.cuni.cz.xml"/>
@@ -120,11 +123,13 @@
<xi:include href="swamid-interfederations-2.0/idp2.idem.garr.it.xml"/>
<xi:include href="swamid-interfederations-2.0/idp2.jacobs-university.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp2.kau.se.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aai.arnes.si.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.abo.fi.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aco.net.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.admin.grnet.gr.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.bsb-muenchen.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.bth.se.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-cafe.unir.br.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.canarie.ca.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.capes.gov.br.xml"/>
@@ -145,6 +150,7 @@
<xi:include href="swamid-interfederations-2.0/idp.fh-trier.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.fraunhofer.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.georgikon.hu.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.heanet.ie.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hebis.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hig.se.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hochschule-bc.de.xml"/>
@@ -177,6 +183,7 @@
<xi:include href="swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.renater.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.reuna.cl.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.reutlingen-university.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.rnp.br.xml"/>
<xi:include href="swamid-interfederations-2.0/ID-Prov.fh-ludwigshafen.de.xml"/>
@@ -218,6 +225,7 @@
<xi:include href="swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.wlb-stuttgart.de.xml"/>
<xi:include href="swamid-interfederations-2.0/ieeexplore.ieee.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/imogen.surfnet.nl.xml"/>
<xi:include href="swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml"/>
<xi:include href="swamid-interfederations-2.0/issues.shibboleth.net.xml"/>
@@ -252,6 +260,7 @@
<xi:include href="swamid-interfederations-2.0/logout.uwasa.fi.xml"/>
<xi:include href="swamid-interfederations-2.0/lu-idp1.lu.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/lu-idp.lu.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/monitor.eduroam.org.xml"/>
<xi:include href="swamid-interfederations-2.0/moodle.helsinki.fi.xml"/>
<xi:include href="swamid-interfederations-2.0/moodle.utu.fi.xml"/>
@@ -265,6 +274,7 @@
<xi:include href="swamid-interfederations-2.0/pqshibboleth.proquest.com:9443.xml"/>
<xi:include href="swamid-interfederations-2.0/proxy.nationallizenzen.de.xml"/>
<xi:include href="swamid-interfederations-2.0/pubs.ama-assn.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/qub.ac.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/ra-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/repos.ids-mannheim.de.xml"/>
<xi:include href="swamid-interfederations-2.0/ricevi.ct.infn.it.xml"/>
@@ -342,6 +352,7 @@
<xi:include href="swamid-interfederations-2.0/sp.catalog.clarin.eu.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.eblib.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.ebrary.com.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.elearning.uni-bremen.de.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.lat.csc.fi.xml"/>
@@ -363,6 +374,8 @@
<xi:include href="swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml"/>
<xi:include href="swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml"/>
<xi:include href="swamid-interfederations-2.0/terena.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-adfs.geant.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.federation.renater.fr.xml"/>
<xi:include href="swamid-interfederations-2.0/test-sp.aco.net.xml"/>
<xi:include href="swamid-interfederations-2.0/test.ukfederation.org.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/theia.unifei.edu.br.xml"/>
@@ -409,6 +422,7 @@
<xi:include href="swamid-interfederations-2.0/www.historicum.net.xml"/>
<xi:include href="swamid-interfederations-2.0/www.jstor.org.xml"/>
<xi:include href="swamid-interfederations-2.0/www.jwatch.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.knodium.com.xml"/>
<xi:include href="swamid-interfederations-2.0/www.ordbogen.com.xml"/>
<xi:include href="swamid-interfederations-2.0/www.propylaeum.de.xml"/>
<xi:include href="swamid-interfederations-2.0/www.rcpsych.org.xml"/>
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index db6d46f1..cd8f79ad 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,33 +1,48 @@
<?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="urn:ibistic:prod:services.ibistic.net" validUntil="2013-12-02T08:17:01Z" cacheDuration="PT345600S">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>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</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>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</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 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.aaiedu.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>
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
index e409bb36..1a679dc1 100644
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.uzh.ch/idp/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-08-30T07:24:39Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-11-19T10:00:11Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
@@ -80,8 +80,6 @@ GunZGU5KKa/fp43Yo6/iWDu5H/pL4CNiaXblImmUO4nDKCIjwN0=
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.uzh.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.uzh.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
diff --git a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml b/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
index 77571926..c65ea83d 100644
--- a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.bfh.ch/idp/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-07-24T06:16:29Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-11-01T14:28:27Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
@@ -10,13 +10,13 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfh.ch</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="de">BFH - Berner Fachhochschule</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">BUAS - Bern University of Applied Sciences</mdui:DisplayName>
- <mdui:DisplayName xml:lang="fr">HESB - Haute école spécialisée bernoise</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">BFH - Bern University of Applied Sciences</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</mdui:DisplayName>
<mdui:Description xml:lang="de">Berner Fachhochschule BFH</mdui:Description>
- <mdui:Description xml:lang="en">BUAS - Bern University of Applied Sciences</mdui:Description>
- <mdui:Description xml:lang="fr">Haute école spécialisée bernoise HESB</mdui:Description>
- <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAFhJREFUeJxiYBgW4P9AO4ByMJy9MH/+/DR3d/f/XFxc/0E0iE+0qSDF7Ozs/6EWgDGIT7QhIBuRNcMwVBynF9DZGBjkHaq7ACugOAxghhCKBQAAAAD//wMANgtDReIXswQAAAAASUVORK5CYII=</mdui:Logo>
- <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAllSURBVHic7JoFjBRLEIYXl+Du7u5OcA3uwSE4BAhO8OAOwSVYcAsSbJEAwd0WCwR320MXrcfXeb2Z2+OFYbm7YXh7Sd3u9nTPVP9dVV1/9ThExBEQ/8VyBewulitgd7FcAbuL5QrYXSxXwO5iuQJ2F8sVsLuofydPnvQ4vn81ytKlS+Xbt2+WK/ini/p34sQJT5QoUWTu3LmyZMkSGTRokCRIkEBu3Ljh0h3fvn3rCAoK8g588+aN4/379+rT4/E43G63aueTNuND+P369etgvz98+KA+P336ZDkIvw3g8ePHPdGjRxfdeOvWLReAnj171qMBzp49u6RMmVLWrl2r+rVo0ULy5MkjmTJlktWrV0uaNGmkefPmEidOHEmXLp3s3btX9Tt8+LA7S5Yskjp1atmyZYtqq1+/vhQpUkSNPXTokNtqEH4bQFw4QoQIauIZMmSQePHiCZN+9eqVE+sqWLCgtG7dWvr16yepUqUSLLFRo0YKAAC6ffu2K3LkyNK+fXs5c+aMp0KFClKuXDn5/Pmzo0CBAtKtWzfp2bOnpE+fXt69e+eoUaOG5M6dW44ePer2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</mdui:Logo>
+ <mdui:Description xml:lang="en">BFH - Bern University of Applied Sciences</mdui:Description>
+ <mdui:Description xml:lang="fr">Haute école spécialisée bernoise BFH</mdui:Description>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAwUlEQVR4nGNkYGBgYGDIrJ3IgAl+vD+4bfW1q1eRxZiwqIMDDkH7gEQtbW1kMRY0NRPd8iGM/F0TGRgYGJhYbV39kC1B14BQCncDrwQBJ010y4fbgwmIsOH3FwI2oIGrp/bj04Bm/K/3jw7s20OCDWyCcl4+/vg0QLyL7Gl5QycZGVlibYAAO2d3fBrwhCl2DWj+JqwBE1w4cxzOZoRQ2FMrAwMDA8PX57cWzZkK58Ji+t9vBiZWdLU/3l8/ewQtHgAvTzp9DJhgSwAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo height="58" width="80">data:image/png;base64,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</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:IPHint>2001:620:500::/48</mdui:IPHint>
@@ -105,8 +105,8 @@ M2r2BWHVZt2GQD4ZsRgLjtsaRoyobIN2CWhOVZqnlk4vbXFXlS++TwtBzJq8HKft
<Organization>
<OrganizationName xml:lang="en">bfh.ch</OrganizationName>
<OrganizationDisplayName xml:lang="de">BFH - Berner Fachhochschule</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">BUAS - Bern University of Applied Sciences</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="fr">HESB - Haute école spécialisée bernoise</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">BFH - Bern University of Applied Sciences</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</OrganizationDisplayName>
<OrganizationURL xml:lang="de">http://www.bfh.ch/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch.xml b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
index 4b50bcb8..97f66d9a 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.switch.ch/idp/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-10-14T14:33:11Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-11-26T12:44:13Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
diff --git a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
index 75e2ba51..0647278d 100644
--- a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
+++ b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
@@ -113,8 +113,11 @@
<AttributeConsumingService index="0" isDefault="true">
<ServiceName xml:lang="en">~okeanos global</ServiceName>
<ServiceDescription xml:lang="en">~okeanos global GRNET cloud services</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"/>
- <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="false"/>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
<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" isRequired="false"/>
<RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
<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="false"/>
@@ -141,7 +144,7 @@
<Company>Greek Research and Technology Network</Company>
<EmailAddress>helpdesk@grnet.gr</EmailAddress>
<TelephoneNumber>800-11-47638</TelephoneNumber>
- <TelephoneNumber>+30-210-9569181</TelephoneNumber>
+ <TelephoneNumber>+30-2109569181</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<GivenName>~okeanos support</GivenName>
diff --git a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
index ef926099..2226fdb1 100644
--- a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.shib.manchester.ac.uk/shibboleth">
- <!--
- This is a "beta" Shibboleth IdP for The University of Manchester.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-06T16:24:24Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml b/swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml
new file mode 100644
index 00000000..e7af68a7
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.ifnmg.edu.br/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ifnmg.edu.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ifnmg.edu.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEbjCCA1YCAQAwDQYJKoZIhvcNAQEFBQAwgfwxOzA5BgNVBAoTMklGTk1HIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgRG8gTm9ydGUgRGUgTWluYXMgR2VyYWlzMUIwQAYD
+VQQLFDlER1RJIC0gRGlyZXRvcmlhIERlIEdlc3TDo28gRGUgVGVjbm9sb2dpYSBE
+YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
+cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEVMBMGA1UECBMMTWluYXMgR2VyYWlz
+MQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTMx
+MTA1MjE1MzEwWhcNMTYxMTA0MjE1MzEwWjCB/DE7MDkGA1UEChMySUZOTUcgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBEbyBOb3J0ZSBEZSBNaW5hcyBHZXJhaXMxQjBABgNV
+BAsUOURHVEkgLSBEaXJldG9yaWEgRGUgR2VzdMOjbyBEZSBUZWNub2xvZ2lhIERh
+IEluZm9ybWHDp8OjbzEhMB8GCSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJy
+MRYwFAYDVQQHEw1Nb250ZXMgQ2xhcm9zMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMx
+CzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6di0FPFPgvZEkK/maZ
+kaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuqVbihU2FRJ63ld57t
+/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4yXmt3FVdyEXrMnIg3
+5viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnMxcHzsZwfx/duHrvl
+QaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCnljf8x5qGRmzWQoT8
+Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9KsPmRmLsECAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAntnSiyrTaKTSoQcf8yqORTIO306rR+XEcZ2PdPeS
+PhbKGs6aBgHJZEU/L5YIdpuqZ5LQUNfeZEN5OwkBlGN/EljwzbhG/BJUxPYlbCiE
+eZJPZ42KSEFmN0vMVE6w/9qk+b12ZxN6Jxacf5YoRwZxsMuyWzyi32zhtdWsZXpl
+XJ+KSCrwJ4xqzhWijIbVRAyVH9LV7LJauYJMMtCLvcdA4LoZwsMdfJBhXyzrStfF
+Mu85g0yi6D/P4xUr9Sfh5PrlYz0DOq4K8uOcMUuQdgHI4XrY2GR5Bsb/bhEj1G3y
+cxwm5m7irBCpuw6n0qXBnOBlv+ZnUvSL2IuRPXpUw2vJ0A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifnmg.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifnmg.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.ifnmg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifnmg.edu.br/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifnmg.edu.br/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifnmg.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEbjCCA1YCAQAwDQYJKoZIhvcNAQEFBQAwgfwxOzA5BgNVBAoTMklGTk1HIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgRG8gTm9ydGUgRGUgTWluYXMgR2VyYWlzMUIwQAYD
+VQQLFDlER1RJIC0gRGlyZXRvcmlhIERlIEdlc3TDo28gRGUgVGVjbm9sb2dpYSBE
+YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
+cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEVMBMGA1UECBMMTWluYXMgR2VyYWlz
+MQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTMx
+MTA1MjE1MzEwWhcNMTYxMTA0MjE1MzEwWjCB/DE7MDkGA1UEChMySUZOTUcgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBEbyBOb3J0ZSBEZSBNaW5hcyBHZXJhaXMxQjBABgNV
+BAsUOURHVEkgLSBEaXJldG9yaWEgRGUgR2VzdMOjbyBEZSBUZWNub2xvZ2lhIERh
+IEluZm9ybWHDp8OjbzEhMB8GCSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJy
+MRYwFAYDVQQHEw1Nb250ZXMgQ2xhcm9zMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMx
+CzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6di0FPFPgvZEkK/maZ
+kaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuqVbihU2FRJ63ld57t
+/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4yXmt3FVdyEXrMnIg3
+5viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnMxcHzsZwfx/duHrvl
+QaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCnljf8x5qGRmzWQoT8
+Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9KsPmRmLsECAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAntnSiyrTaKTSoQcf8yqORTIO306rR+XEcZ2PdPeS
+PhbKGs6aBgHJZEU/L5YIdpuqZ5LQUNfeZEN5OwkBlGN/EljwzbhG/BJUxPYlbCiE
+eZJPZ42KSEFmN0vMVE6w/9qk+b12ZxN6Jxacf5YoRwZxsMuyWzyi32zhtdWsZXpl
+XJ+KSCrwJ4xqzhWijIbVRAyVH9LV7LJauYJMMtCLvcdA4LoZwsMdfJBhXyzrStfF
+Mu85g0yi6D/P4xUr9Sfh5PrlYz0DOq4K8uOcMUuQdgHI4XrY2GR5Bsb/bhEj1G3y
+cxwm5m7irBCpuw6n0qXBnOBlv+ZnUvSL2IuRPXpUw2vJ0A==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifnmg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifnmg.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationName>
+ <OrganizationName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ifnmg.edu.br/</OrganizationURL>
+ <OrganizationURL xml:lang="pt-br">http://www.ifnmg.edu.br/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>Christopher Mota</SurName>
+ <EmailAddress>christopher.mota@ifnmg.edu.br</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unicentro.br.xml b/swamid-interfederations-2.0/cafe.unicentro.br.xml
new file mode 100644
index 00000000..0e3bcb80
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.unicentro.br.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.unicentro.br/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">unicentro.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.unicentro.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.unicentro.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEWjCCA0ICAQAwDQYJKoZIhvcNAQEFBQAwgfIxRDBCBgNVBAoTO1VOSUNFTlRS
+TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUgZG8gUGFy
+YW5hMTowOAYDVQQLFDFDT09SVEkgLSBDb29yZGVuYWRvcmlhIGRlIFRlY25vbG9n
+aWEgZSBJbmZvcm1h52FvMR8wHQYJKoZIhvcNAQkBFhB3ZWJAdW5pY2VudHJvLmJy
+MRMwEQYDVQQHEwpHdWFyYXB1YXZhMQ8wDQYDVQQIEwZQYXJhbmExCzAJBgNVBAYT
+AkJSMRowGAYDVQQDExFjYWZlLnVuaWNlbnRyby5icjAeFw0xMzEwMjQxNjI5NTla
+Fw0xNjEwMjMxNjI5NTlaMIHyMUQwQgYDVQQKEztVTklDRU5UUk8gLSBVbml2ZXJz
+aWRhZGUgRXN0YWR1YWwgZG8gQ2VudHJvLU9lc3RlIGRvIFBhcmFuYTE6MDgGA1UE
+CxQxQ09PUlRJIC0gQ29vcmRlbmFkb3JpYSBkZSBUZWNub2xvZ2lhIGUgSW5mb3Jt
+YedhbzEfMB0GCSqGSIb3DQEJARYQd2ViQHVuaWNlbnRyby5icjETMBEGA1UEBxMK
+R3VhcmFwdWF2YTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJCUjEaMBgGA1UE
+AxMRY2FmZS51bmljZW50cm8uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC607Qfkx4TEKYhLrko/Wedr9CcRZhxTEwI1gSiQnR1jTtH4tciXzJYWhLa
+RMayXwdv7790MNiDf+dQqwwyIVXUQTyTxvt/ZBXHuDzdFJ55UaqzxcL64Ppxhs/Q
+UoFt+/IO2eOWgOmAcj4R4oiebL62UJXSiMUVQ6tsmZFjiVnCR3bbf/vaJfn0Av50
+Tht6lf0BQOdaKug/lhVpoubXl+F19gH+6wne+GdMxqb4GTuLNliJiXPkMDPKzAF6
+DMwHruOiz6zLzvTYAlVIsOlHcRpHJD9Pm7wm9xQtbDpNZbRantZc03ca2vrzTpPt
+MhRZWyij1cjww58GxRXyrLL180JHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEqe
+7k9//oLDi60deCaFZNsOMBlNpkQxW4wHYtgUJ16ZJKpVDq6HO8c/rBYXrTPRbPjf
+vE6cmv/20uVkMCpRwGCZ4ndzkQLZsveT6Ro3gkGzBsQmJs4Ujd1e2vhVr6RRbgTF
+9dbIMcngDRakeFx76lnLx6w2LbVuaTCw4iwwmMUSF+xDNorZeN2za/7B1hFKP4im
+H1niJe6ks5HnzSGtY84qpuCMkWvw3vQPgekrU7NJZ7JvYNR23GJ18EzQYH/Bi88D
+rKEQ5KnwgbMVxET6a4vsKXDzNYbLeMHGt6mIunciYbQzuXcCg++QthuBqng8Wre+
+uIoHx7ZhxQYffJyfRtc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unicentro.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.unicentro.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unicentro.br/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unicentro.br/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unicentro.br/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">unicentro.br</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEWjCCA0ICAQAwDQYJKoZIhvcNAQEFBQAwgfIxRDBCBgNVBAoTO1VOSUNFTlRS
+TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUgZG8gUGFy
+YW5hMTowOAYDVQQLFDFDT09SVEkgLSBDb29yZGVuYWRvcmlhIGRlIFRlY25vbG9n
+aWEgZSBJbmZvcm1h52FvMR8wHQYJKoZIhvcNAQkBFhB3ZWJAdW5pY2VudHJvLmJy
+MRMwEQYDVQQHEwpHdWFyYXB1YXZhMQ8wDQYDVQQIEwZQYXJhbmExCzAJBgNVBAYT
+AkJSMRowGAYDVQQDExFjYWZlLnVuaWNlbnRyby5icjAeFw0xMzEwMjQxNjI5NTla
+Fw0xNjEwMjMxNjI5NTlaMIHyMUQwQgYDVQQKEztVTklDRU5UUk8gLSBVbml2ZXJz
+aWRhZGUgRXN0YWR1YWwgZG8gQ2VudHJvLU9lc3RlIGRvIFBhcmFuYTE6MDgGA1UE
+CxQxQ09PUlRJIC0gQ29vcmRlbmFkb3JpYSBkZSBUZWNub2xvZ2lhIGUgSW5mb3Jt
+YedhbzEfMB0GCSqGSIb3DQEJARYQd2ViQHVuaWNlbnRyby5icjETMBEGA1UEBxMK
+R3VhcmFwdWF2YTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJCUjEaMBgGA1UE
+AxMRY2FmZS51bmljZW50cm8uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC607Qfkx4TEKYhLrko/Wedr9CcRZhxTEwI1gSiQnR1jTtH4tciXzJYWhLa
+RMayXwdv7790MNiDf+dQqwwyIVXUQTyTxvt/ZBXHuDzdFJ55UaqzxcL64Ppxhs/Q
+UoFt+/IO2eOWgOmAcj4R4oiebL62UJXSiMUVQ6tsmZFjiVnCR3bbf/vaJfn0Av50
+Tht6lf0BQOdaKug/lhVpoubXl+F19gH+6wne+GdMxqb4GTuLNliJiXPkMDPKzAF6
+DMwHruOiz6zLzvTYAlVIsOlHcRpHJD9Pm7wm9xQtbDpNZbRantZc03ca2vrzTpPt
+MhRZWyij1cjww58GxRXyrLL180JHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEqe
+7k9//oLDi60deCaFZNsOMBlNpkQxW4wHYtgUJ16ZJKpVDq6HO8c/rBYXrTPRbPjf
+vE6cmv/20uVkMCpRwGCZ4ndzkQLZsveT6Ro3gkGzBsQmJs4Ujd1e2vhVr6RRbgTF
+9dbIMcngDRakeFx76lnLx6w2LbVuaTCw4iwwmMUSF+xDNorZeN2za/7B1hFKP4im
+H1niJe6ks5HnzSGtY84qpuCMkWvw3vQPgekrU7NJZ7JvYNR23GJ18EzQYH/Bi88D
+rKEQ5KnwgbMVxET6a4vsKXDzNYbLeMHGt6mIunciYbQzuXcCg++QthuBqng8Wre+
+uIoHx7ZhxQYffJyfRtc=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unicentro.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationName>
+ <OrganizationName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.unicentro.br/</OrganizationURL>
+ <OrganizationURL xml:lang="pt-br">http://www.unicentro.br/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>Mauricio Adriano Teixeira</SurName>
+ <EmailAddress>madriano@unicentro.br</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/capuccino.iff.edu.br.xml b/swamid-interfederations-2.0/capuccino.iff.edu.br.xml
new file mode 100644
index 00000000..182a3440
--- /dev/null
+++ b/swamid-interfederations-2.0/capuccino.iff.edu.br.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://capuccino.iff.edu.br/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">IFF - Instituto Federal Fluminense</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IFF - Instituto Federal Fluminense</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IFF - Instituto Federal Fluminense</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IFF - Instituto Federal Fluminense</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.iff.edu.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.iff.edu.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xJTAjBgNVBAoTHEluc3RpdHV0
+byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsTBERHVEkxHjAcBgkqhkiG9w0B
+CQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMVQ2FtcG9zIGRvcyBHb3l0YWNh
+emVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFGNhcHVjY2lu
+by5pZmYuZWR1LmJyMB4XDTEzMDkxNjE1MTYwOVoXDTE2MDkxNTE1MTYwOVowga8x
+JTAjBgNVBAoTHEluc3RpdHV0byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsT
+BERHVEkxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMV
+Q2FtcG9zIGRvcyBHb3l0YWNhemVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIx
+HTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA431WPAuMFmglDx3WLpMiABB+eHn4ZUPsWUhrJf7MGwqw
+aqYprX9m+k99Nr9hGxoZjTUoMg1nb7W9PzfGYaGbOO1CtpJS/bWTgarmPkgcIJGJ
+BOJettHZKofoYUAGXPlR4cUplSNHQTlzBT/3kY6tsi02rSm/uXVM1I5LShK2kyTR
+thQlymdN9nVSZ9F0HGVscJUGdCip59rYSFIvy0je/5b/PFpolo1MuhG8ZOMsVPXR
+M5eIV0hDbTKDseywnNSg0P3vomDv0GPeux2wIWu7Gi6l0j/4ZZhBh8FKli6GDJ3Q
+FxceHeOaPbGvwlqkRXBYfShnSFJ9D/mKWC1iXh6FIQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQAQssTx+Cr7FqJnSamgY54FSF72p7zXgWQKiiCvvYQnvEaP2DdjPO65
+HLZqtlC7c1a6+pnVC8TdYTMM4+tATfg3mEY7bxii5/32GD83gbTGRkR95Nm7qmgw
+WkWJEtiXSLSVvOfRGVq8HlzxJOw+W1BhHCqL14iRvZByTHR28RfurqQMsu0/IwTA
+qjrKzntjUYCnLXTB5McIDBPeXE1wMM0zP2iAZsRFMNTF6cpIcG5Mh996fcupuD4Y
+DSFiby5bFAiwBelbWYbhvm8MIz+5a8sr4guW+0pxZ34KOpW+ClKLr3zICgzXvyLy
+sn8e6pyt/AvyYnHJixd8dGbvtIV1LOs5
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://capuccino.iff.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://capuccino.iff.edu.br/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://capuccino.iff.edu.br/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://capuccino.iff.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xJTAjBgNVBAoTHEluc3RpdHV0
+byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsTBERHVEkxHjAcBgkqhkiG9w0B
+CQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMVQ2FtcG9zIGRvcyBHb3l0YWNh
+emVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFGNhcHVjY2lu
+by5pZmYuZWR1LmJyMB4XDTEzMDkxNjE1MTYwOVoXDTE2MDkxNTE1MTYwOVowga8x
+JTAjBgNVBAoTHEluc3RpdHV0byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsT
+BERHVEkxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMV
+Q2FtcG9zIGRvcyBHb3l0YWNhemVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIx
+HTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA431WPAuMFmglDx3WLpMiABB+eHn4ZUPsWUhrJf7MGwqw
+aqYprX9m+k99Nr9hGxoZjTUoMg1nb7W9PzfGYaGbOO1CtpJS/bWTgarmPkgcIJGJ
+BOJettHZKofoYUAGXPlR4cUplSNHQTlzBT/3kY6tsi02rSm/uXVM1I5LShK2kyTR
+thQlymdN9nVSZ9F0HGVscJUGdCip59rYSFIvy0je/5b/PFpolo1MuhG8ZOMsVPXR
+M5eIV0hDbTKDseywnNSg0P3vomDv0GPeux2wIWu7Gi6l0j/4ZZhBh8FKli6GDJ3Q
+FxceHeOaPbGvwlqkRXBYfShnSFJ9D/mKWC1iXh6FIQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQAQssTx+Cr7FqJnSamgY54FSF72p7zXgWQKiiCvvYQnvEaP2DdjPO65
+HLZqtlC7c1a6+pnVC8TdYTMM4+tATfg3mEY7bxii5/32GD83gbTGRkR95Nm7qmgw
+WkWJEtiXSLSVvOfRGVq8HlzxJOw+W1BhHCqL14iRvZByTHR28RfurqQMsu0/IwTA
+qjrKzntjUYCnLXTB5McIDBPeXE1wMM0zP2iAZsRFMNTF6cpIcG5Mh996fcupuD4Y
+DSFiby5bFAiwBelbWYbhvm8MIz+5a8sr4guW+0pxZ34KOpW+ClKLr3zICgzXvyLy
+sn8e6pyt/AvyYnHJixd8dGbvtIV1LOs5
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">IFF - Instituto Federal Fluminense</OrganizationName>
+ <OrganizationName xml:lang="pt-br">IFF - Instituto Federal Fluminense</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">IFF - Instituto Federal Fluminense</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">IFF - Instituto Federal Fluminense</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.iff.edu.br/</OrganizationURL>
+ <OrganizationURL xml:lang="pt-br">http://www.iff.edu.br/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>Andre de Azevedo Cunha</SurName>
+ <EmailAddress>acunha@iff.edu.br</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml b/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
index 1c3f419a..ef5c0ea6 100644
--- a/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.ids-mannheim.de/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-10-15T08:56:14Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-24T13:14:25Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
@@ -137,8 +137,8 @@ Ew==
<EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
- <GivenName>Oliver</GivenName>
- <SurName>Schonefeld</SurName>
- <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
+ <GivenName>AAI</GivenName>
+ <SurName>Team</SurName>
+ <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/community.ja.net.xml b/swamid-interfederations-2.0/community.ja.net.xml
index 1bd9eebb..538bffd8 100644
--- a/swamid-interfederations-2.0/community.ja.net.xml
+++ b/swamid-interfederations-2.0/community.ja.net.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://community.ja.net/shibboleth">
- <!--
- This is a Janet Community Shibboleth 2 SP for JISC Collections and Janet Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-14T17:37:40Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/core.uwap.org.xml b/swamid-interfederations-2.0/core.uwap.org.xml
index ac7aacde..8039d387 100644
--- a/swamid-interfederations-2.0/core.uwap.org.xml
+++ b/swamid-interfederations-2.0/core.uwap.org.xml
@@ -1,27 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+ <md:Extensions>
+ <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 xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-10-17T11:25:00Z">
+ <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:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
- <mdui:UIInfo>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">UWAP</mdui:DisplayName>
<mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
<mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
<mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</mdui:Description>
</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">norway</saml:AttributeValue>
- </saml:Attribute>
</md:Extensions>
<md:KeyDescriptor use="signing">
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
index 803bf9de..c8444be0 100644
--- a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.emeraldinsight.com/entity">
- <!--
- This is a Shibboleth SP for Emerald Group Publishing Ltd.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-09T12:25:06Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
index 6416d90b..56d2736a 100644
--- a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
+++ b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://engine.jacson.jiscadvance.biz/authentication/sp/metadata">
- <!--
- This is a JACSoN OpenConext SP for the JISC Services Management Company Ltd.
- -->
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-16T10:06:35Z"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-16T10:06:35Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
diff --git a/swamid-interfederations-2.0/filesender.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index 89dde5db..d2b0aca2 100644
--- a/swamid-interfederations-2.0/filesender.funet.fi.xml
+++ b/swamid-interfederations-2.0/filesender.funet.fi.xml
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
+<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.geant.net/uri/dataprotection-code-of-conduct/v1</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">
<mdui:DisplayName xml:lang="en">Funet FileSender</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Funet FileSender</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Funet FileSender</mdui:DisplayName>
@@ -13,13 +23,9 @@
<mdui:PrivacyStatementURL xml:lang="en">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="fi">https://filesender.funet.fi/privacypolicy.html</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>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -49,47 +55,47 @@ NuSoiRuRqUwvjh1crrpK3aEPzrhwALKEQo0tIKOpSHjVUwvGXWtoljY7JJJt94y1
o9pAScnCYOeqNoQ//wrcSVQcwozZLhGlymlLAyDI0rx/hM9v+8PL1E0iFmf/</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://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>
+ </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>mailto:funyht@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Tomi</GivenName>
+ <SurName>Salmi</SurName>
+ <EmailAddress>mailto:noc@funet.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Tomi</GivenName>
+ <SurName>Salmi</SurName>
+ <EmailAddress>mailto:noc@funet.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/foodl.org.xml b/swamid-interfederations-2.0/foodl.org.xml
index 91edbfcc..1cf3fb1c 100644
--- a/swamid-interfederations-2.0/foodl.org.xml
+++ b/swamid-interfederations-2.0/foodl.org.xml
@@ -1,15 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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: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>
+ <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.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <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:PrivacyStatementURL xml:lang="en">https://rnd.feide.no/software/foodle/foodle-privacy-policy/</mdui:PrivacyStatementURL>
+ <mdui:Logo height="58" width="187">https://foodl.org/res/foodle_logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
<md:KeyDescriptor use="signing">
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
</ds:X509Data>
@@ -22,20 +44,26 @@
<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:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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="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"/>
+ <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: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:GivenName>Feide Support</md:GivenName>
+ <md:EmailAddress>support@feide.no</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iam.cf.ac.uk.xml b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
index e3f54037..123d41e3 100644
--- a/swamid-interfederations-2.0/iam.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iam.cf.ac.uk/sp/shibboleth">
- <!--
- This is a IAM@Cardiff Shibboleth SP for Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-22T13:42:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
index 59b543d0..6139f822 100644
--- a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dev.cardiff.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth 2 test IdP for Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-20T15:18:56.122159Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
index 546b3910..348badbd 100644
--- a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-preprod.cardiff.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth test IdP (clustered with Terracotta 3.0) for Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-25T18:02:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si.xml b/swamid-interfederations-2.0/idp.aai.arnes.si.xml
new file mode 100644
index 00000000..67644a75
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aai.arnes.si/idp/20090116">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2009-01-16T14:05:41Z">
+ <mdrpi:RegistrationPolicy xml:lang="sl">http://aai.arnes.si/fed/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.arnes.si/fed/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">^(.+\.)?arnes\.si$</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Academic and Research Network of Slovenia</mdui:Description>
+ <mdui:Description xml:lang="sl">Akademska in raziskovalna mreža Slovenije</mdui:Description>
+ <mdui:Keywords xml:lang="en">arnes academic arnesaai aai</mdui:Keywords>
+ <mdui:Keywords xml:lang="sl">arnes akademska arnesaai aai</mdui:Keywords>
+ <mdui:Logo height="67" width="64">data:image/png;base64,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
+ </mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://www.arnes.si/en</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sl">http://www.arnes.si</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.arnes.si/pomoc-uporabnikom/pravila-uporabe-omrezja-arnes.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sl">http://www.arnes.si/pomoc-uporabnikom/pravila-uporabe-omrezja-arnes.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDEzCCAnygAwIBAgIJAMxgJo23GoaPMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYDVQQGEwJTSTESMBAGA1UEBxMJTGp1YmxqYW5hMQ4wDAYDVQQKEwVBUk5FUzEMMAoGA1UECxMDQUFJMSwwKgYDVQQDDCNBcm5lcyBGZWRlcmF0aW9uIC0gUHJpbWFyeSBJZFAgJiBEUzEjMCEGCSqGSIb3DQEJARYUYWFhLXBvZHBvcmFAYXJuZXMuc2kwHhcNMDkwMjE4MDcyNzAyWhcNMTkwMjE2MDcyNzAyWjCBkjELMAkGA1UEBhMCU0kxEjAQBgNVBAcTCUxqdWJsamFuYTEOMAwGA1UEChMFQVJORVMxDDAKBgNVBAsTA0FBSTEsMCoGA1UEAwwjQXJuZXMgRmVkZXJhdGlvbiAtIFByaW1hcnkgSWRQICYgRFMxIzAhBgkqhkiG9w0BCQEWFGFhYS1wb2Rwb3JhQGFybmVzLnNpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgs61n1RVSUtLLu22gSg2f1+hJpoPvI1OkLNltFJJDpaeoLQ4sLirEfnnfNHk0J/VaGP+MmYg1+/OXSSFBTGdJ97xfNFslhqQTwMgsjLXKhESMT+JX9rW1wotJ9Wd2hSlbz1VHWnBgLrDWHOwjIXewyzoMpQxt5qHonqvoInZaBwIDAQABo28wbTATBgNVHSUEDDAKBggrBgEFBQcDATBWBgNVHREETzBNhwTBAgF5ghB3ZWJhYWkxLmFybmVzLnNpghBpZHAuYWFpLmFybmVzLnNpgg9kcy5hYWkuYXJuZXMuc2mCEGlkbS5hYWkuYXJuZXMuc2kwDQYJKoZIhvcNAQEFBQADgYEAIkzjQYMOZ6O4XjBPw1FdjfrDJbB90wHBJ/7E/++9KuNHUPar2ltyyg3mdrj3XNX4W8RtuzmG5IttqdJDJCE2geaZw5j8/u13nxEScJoYWIhA1vHBWciwLhswUKP0teYXhaczT27+cQarDoIqiKEsFFRfRESy2f1XNFflAYcZxrw=</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>MIIDEzCCAnygAwIBAgIJAMxgJo23GoaPMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYDVQQGEwJTSTESMBAGA1UEBxMJTGp1YmxqYW5hMQ4wDAYDVQQKEwVBUk5FUzEMMAoGA1UECxMDQUFJMSwwKgYDVQQDDCNBcm5lcyBGZWRlcmF0aW9uIC0gUHJpbWFyeSBJZFAgJiBEUzEjMCEGCSqGSIb3DQEJARYUYWFhLXBvZHBvcmFAYXJuZXMuc2kwHhcNMDkwMjE4MDcyNzAyWhcNMTkwMjE2MDcyNzAyWjCBkjELMAkGA1UEBhMCU0kxEjAQBgNVBAcTCUxqdWJsamFuYTEOMAwGA1UEChMFQVJORVMxDDAKBgNVBAsTA0FBSTEsMCoGA1UEAwwjQXJuZXMgRmVkZXJhdGlvbiAtIFByaW1hcnkgSWRQICYgRFMxIzAhBgkqhkiG9w0BCQEWFGFhYS1wb2Rwb3JhQGFybmVzLnNpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgs61n1RVSUtLLu22gSg2f1+hJpoPvI1OkLNltFJJDpaeoLQ4sLirEfnnfNHk0J/VaGP+MmYg1+/OXSSFBTGdJ97xfNFslhqQTwMgsjLXKhESMT+JX9rW1wotJ9Wd2hSlbz1VHWnBgLrDWHOwjIXewyzoMpQxt5qHonqvoInZaBwIDAQABo28wbTATBgNVHSUEDDAKBggrBgEFBQcDATBWBgNVHREETzBNhwTBAgF5ghB3ZWJhYWkxLmFybmVzLnNpghBpZHAuYWFpLmFybmVzLnNpgg9kcy5hYWkuYXJuZXMuc2mCEGlkbS5hYWkuYXJuZXMuc2kwDQYJKoZIhvcNAQEFBQADgYEAIkzjQYMOZ6O4XjBPw1FdjfrDJbB90wHBJ/7E/++9KuNHUPar2ltyyg3mdrj3XNX4W8RtuzmG5IttqdJDJCE2geaZw5j8/u13nxEScJoYWIhA1vHBWciwLhswUKP0teYXhaczT27+cQarDoIqiKEsFFRfRESy2f1XNFflAYcZxrw=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/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://idp.aai.arnes.si/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Academic and Research Network of Slovenia</md:OrganizationName>
+ <md:OrganizationName xml:lang="sl">Akademska in raziskovalna mreža Slovenije</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">ARNES</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sl">Arnes</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.arnes.si</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sl">http://www.arnes.si/en/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>ARNES Helpdesk</md:GivenName>
+ <md:SurName>ARNES Helpdesk</md:SurName>
+ <md:EmailAddress>helpdesk@arnes.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>ARNES AAI</md:GivenName>
+ <md:SurName>ARNES AAI</md:SurName>
+ <md:EmailAddress>aaa-podpora@arnes.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>ARNES AAI</md:GivenName>
+ <md:SurName>ARNES AAI</md:SurName>
+ <md:EmailAddress>aaa-podpora@arnes.si</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
index decb0880..424c4360 100644
--- a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
+++ b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
@@ -127,7 +127,7 @@
<Company>Greek Research and Technology Network</Company>
<EmailAddress>helpdesk@grnet.gr</EmailAddress>
<TelephoneNumber>800-11-47638</TelephoneNumber>
- <TelephoneNumber>+30-210-9569181</TelephoneNumber>
+ <TelephoneNumber>+30-2109569181</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Greek Research and Technology Network</Company>
diff --git a/swamid-interfederations-2.0/idp.company.ja.net.xml b/swamid-interfederations-2.0/idp.company.ja.net.xml
index 7f61c336..6863a333 100644
--- a/swamid-interfederations-2.0/idp.company.ja.net.xml
+++ b/swamid-interfederations-2.0/idp.company.ja.net.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.company.ja.net/idp/shibboleth">
- <!--
- This is a Janet Shibboleth IdP for JISC Collections and Janet Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-30T16:21:51Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index e0ff75b4..77fca8e0 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi.xml
@@ -1,10 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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://idp.csc.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
- <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
- <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csc.fi/idp/shibboleth">
+ <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>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csc.fi</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">funet.fi</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
@@ -15,16 +20,12 @@
<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:UIInfo>
- <mdui:DiscoHints>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DomainHint>csc.fi</mdui:DomainHint>
</mdui:DiscoHints>
- <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>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEfTCCA2WgAwIBAgIQUB8GAq0UqrSAF/D1Yq57fDANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -53,27 +54,27 @@ H3YX4fNdibt18KEE5w7rXmwJTJwwDxw3UHR3rAcu+PxREwAl22zTk2oSc7DLUMib
Iw==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <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://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <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>Janne</md:GivenName>
- <md:SurName>Lauros</md:SurName>
- <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <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>Janne</GivenName>
+ <SurName>Lauros</SurName>
+ <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index dd7b6a1d..3b2e3e45 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,305 +1,314 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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: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>
- <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">askvoll.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">austevoll.kommune.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">betanien.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">diakonova.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">dvm.iktsenteret.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">eidsberg.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">evenes.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.holtalen.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.nesodden.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.nlm.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.osloskolen.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">fjaler.kommune.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">forde.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">gaular.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">gulen.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">hamar.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">haraldsplass.no</shibmd:Scope>
- <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hbv.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">holeskolen.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">hoyanger.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">hyllestad.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
- <shibmd:Scope regexp="false">jolster.kommune.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">klepp.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">lier.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">lybskole.no</shibmd:Scope>
- <shibmd:Scope regexp="false">lyngdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">malselv.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">naustdal.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">nmbu.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">rennesoy.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">saltdal.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">skoler.alta.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">solund.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">stange.kommune.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">t-fk.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">vaga.kommune.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>
+ <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">arendal.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">askvoll.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnes.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">austevoll.kommune.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">betanien.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">diakonova.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">dvm.iktsenteret.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">eidsberg.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">evenes.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.holtalen.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.lorenskog-skole.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.nesodden.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nlm.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.oknett.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.osloskolen.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">fjaler.kommune.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">forde.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">froland.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">gaular.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">grimstad.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">gulen.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">hamar.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haraldsplass.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">hbv.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">holeskolen.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">hoyanger.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">hyllestad.kommune.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">jolster.kommune.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">klepp.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">kvn.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">lier.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">lybskole.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">malselv.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">naustdal.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">nith.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">nmbu.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">randaberg.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">rennesoy.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">saltdal.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">skoler.alta.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">snillfjord.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">solund.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">stange.kommune.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">t-fk.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">vaga.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagan.kommune.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>
+ <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>
@@ -309,10 +318,10 @@
<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: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>
@@ -320,8 +329,4 @@
<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.heanet.ie.xml b/swamid-interfederations-2.0/idp.heanet.ie.xml
new file mode 100644
index 00000000..68a3f5fe
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.heanet.ie.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.heanet.ie/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z"/>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">heanet.ie</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:Logo height="82" width="200">https://edugate.heanet.ie/rr3/logos/heanet.png</mdui:Logo>
+ <mdui:DisplayName xml:lang="en">HEAnet</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">https://idp.heanet.ie/support.htm</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:GeolocationHint>geo:53.34964831237833,-6.246660947799683</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDHzCCAgegAwIBAgIUGqvc4DxR6ZObzP+9tjmx/JHShXIwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmhlYW5ldC5pZTAeFw0xMDA0MzAxMDU0MzZaFw0z
+MDA0MzAxMDU0MzZaMBgxFjAUBgNVBAMTDWlkcC5oZWFuZXQuaWUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzASQpsLEEYKVuaK9JiA66mzcCkx1X50SO
+uEtaPBejFzRZ3i5j7rgE7m+2ku+kjt8JJg9JUOrdnKJ0S/9aVggpKQvDAo9rNvjO
+/dyNge4OfUliuSUHw+LOiyxH0ELMW7DTVknLimzZNlHewmunUD/c/uI54Zb8XGYd
+MpmmfPq7LBeurCxBDZ101ujdj94lvtGTPY2WcnBj3ILoyAd1CquGU4o66ws333Ht
+7vA/NTLIO40qQSvEsMR9Lyb/ZQR+XmcssoJ8TqC6lWf2FfAt4phX904FBB9CHapZ
+dtHRRl6r1AifH9NZ/uh24+ct736MY5eqLyy5C5Wp0GmGac33+Iq5AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5oZWFuZXQuaWWGJGh0dHBzOi8vaWRwLmhlYW5ldC5p
+ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhEdkRl4cvkY8kAeuxgl0TK1i61Mw
+DQYJKoZIhvcNAQEFBQADggEBAKk1EPv3OYkfuvz8js6xl7fI31jPJhDao2yExaeZ
+8P3joqz4YwGmI/Ahm+HNGtqYEXvP8MUpO8yPkkiuJl7L9pHu0Wk2v026XO1B2fZX
+z/4PHuTzo+cpPkcJewzDMKQuNMINzx0gOTpXH2WsSVaHEFBXm0g2OUkk8p4vnY5o
+O1D15tXmi7abFTXObJbvnNrQZJ4+wZAk+wGIfjEd5uKGIMgxET35RJLoUcgQnVxe
+Z0nveWuA2Iu/d6B+48I2J+I0vto6XneJrsVIt8MovKtbjFRs0fAZoD+UtthT+ZVz
+rbgeIIersVLLyLj9SIJrC+FVbLzD3jRnEI4r+mqAxzVNprk=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/logout.jsp"/>
+ <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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.heanet.ie/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/profile/SAML2/POST/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">HEAnet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">https://idp.heanet.ie/support.htm</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:SurName>Glenn Wearen</md:SurName>
+ <md:EmailAddress>glenn.wearen@heanet.ie</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Janusz Ulanowski</md:SurName>
+ <md:EmailAddress>janusz.ulanowski@heanet.ie</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:SurName>NOC</md:SurName>
+ <md:EmailAddress>noc-middleware@heanet.ie</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 8e44ef54..ea2e29e0 100644
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
@@ -1,16 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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://idp.ids-mannheim.de/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://idp.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
- <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>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ids-mannheim.de/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-22T10:22:36Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ids-mannheim.de</saml1md:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity-Provider des Institut für Deutsche Sprache</mdui:Description>
+ <mdui:Description xml:lang="en">Identity-Provider of the Institut für Deutsche Sprache</mdui:Description>
+ <mdui:Logo height="16" width="16">https://idp.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
+ <mdui:Logo height="63" width="318">https://idp.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.ids-mannheim.de</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
<ds:X509Data>
+ <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
@@ -37,37 +51,86 @@ bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-99YJ9IIzYQ==</ds:X509Certificate>
+99YJ9IIzYQ==
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Institut für Deutsche Sprache - Test SP</md:ServiceName>
- <md:ServiceName xml:lang="en">Institut für Deutsche Sprache - Test SP</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Interface to the Corpus Search, Management and Analysis System COSMAS-II, which offers various possibilities to access the German Reference Corpus DeReKo and other corpora hosted at the IDS. For Humanities and Social Sciences researchers.</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.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Oliver</md:GivenName>
- <md:SurName>Schonefeld</md:SurName>
- <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ids-mannheim.de/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ids-mannheim.de</saml1md:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
+MTgxNDI4MTVaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRwwGgYDVQQDExNpZHAuaWRzLW1hbm5oZWltLmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt7L/7N+17/v7lajOiMdvThxk
+NoiCwy2RDzaDi7IEvJtXmT1CkKXVg84uxCneoixdPwO9EZAyphOGfXyvIWiWOEkB
+8135pYTbKNYPuG0+fIYXPvHE1+oFMca3K21GgssvoOZYJfi/wrORLx77iQXRgGYF
+mRllzaspZriQNbIvCwVsKsoL8zt9TeVa0Ltv6A7dRg/36u8XppG4glE4xuuXQgNI
+mj0qpJ9pV76bgzPKUNm2/aXDiyqoI4qvp2h4vM2sFv2MAguPkHI7PPcVXn1L2q3h
+WpylL+gjjNfZm1TdDww+r1HFdeQDORmjSh+Cd4bbdEeA2bWH3NHjSR6xWwCj/wID
+AQABo4IBvDCCAbgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSg5wzZdnXH5hJRlkFfkCXU0cFr
+4TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zCBkQYDVR0fBIGJMIGG
+MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
+YS9wdWIvY3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUF
+BwEBBIGdMIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2ds
+b2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUH
+MAKGP2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAB1uluFS88lYI
+QPiuEvlALX1GYfNZTNCJogeflb5E59zdd49Y7L5zs9IXbYLUMqSQrbLyv4i4nK4e
+bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
+HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
+xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
+VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
+99YJ9IIzYQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="de">e217</OrganizationName>
+ <OrganizationName xml:lang="en">e217</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.ids-mannheim.de</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Oliver</GivenName>
+ <SurName>Schonefeld</SurName>
+ <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Andreas</GivenName>
+ <SurName>Witt</SurName>
+ <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>AAI</GivenName>
+ <SurName>Team</SurName>
+ <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml b/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
index 1ff91bca..367186d1 100644
--- a/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
+++ b/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
@@ -1,43 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.its.fz-juelich.de/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-13T10:04:08Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fz-juelich.de</saml1md:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Forschungszentrum Jülich GmbH</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Forschungszentrum Jülich GmbH</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
+ <mdui:Description xml:lang="en">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
+ <mdui:InformationURL xml:lang="de">http://www.fz-juelich.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.fz-juelich.de</mdui:InformationURL>
+ </mdui:UIInfo>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
<ds:X509Data>
- <ds:X509SubjectName>CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIFWzCCBEOgAwIBAgIED6HU3DANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-REUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEqMCgG
-A1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJKoZI
-hvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEwMDIyMjEwMDcwOFoXDTEzMDIy
-MTEwMDcwOFowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4tV2Vz
-dGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdzemVu
-dHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGljaC5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfMWbVl7AvMbD+BfKDh
-HMdNgoG1fMJw6/g9biZnFKY6Ey4tBfgpYY0pjA1tShXcFO6oBf0QIcuHlLeBjEhA
-0Oa+D+MBLI59Mtdt+qP4Vnb19U+b2eOKzWTzIPzv2YouUF7vWTVZ0zfvrBcz2v0n
-t3NcC+pT5eym+j0g6FkNSU1A56CPUE3As8Kct1MvQvPmzYpOdMqQgiZ2sJbdTHS0
-pDLbycEAqu3+io5W+MG/6dtljXGk7liYirZAeWEiLWlz0lrFU50FlFtwnVDCQr0L
-LIh6MNSawg4zvv8YsT/599OWbOJB0svrPbIpPH7dVZFpESZynns9j//13q/t+kXM
-F0cCAwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQt
-MCsGCCsGAQUFBwMCBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0G
-A1UdDgQWBBTqWpf+8Fn95qfWILim5B9Quq6KKDAfBgNVHSMEGDAWgBQgvXGJpckq
-My8R4B/llCZWDxECJTAmBgNVHREEHzAdgRtqLmhlaWRidWVjaGVsQGZ6LWp1ZWxp
-Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBlgYIKwYBBQUHAQEE
-gYkwgYYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNh
-L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEAOFrB/uQdtRVoT2Sy+lMN6cf7eeASn9xOSvqJzuiHkEN2
-rPsjzAxzCjRw0FmhsCAyub1f3dfaAc0HBxuCWoX1BBt81MQE4bae+gJ8V9P+aE49
-45PBub7vjB0FDMNpFOMHU8n02nR2Kfy0fiQwoLkq7P75pjKcN7FuKAZU4Q/FEHM+
-VGER1Mfxr5AxLqDkeOJHlaUN7Won1+UA/FKakoQ3gLCQdWT+8dc3Km1YVDNrsqJk
-NNx585kM4ZBHDCe1JLeGC2SUqiIQXIdpjO1fQFEb9xZiifS/xRod28uXwFy2cPzG
-sHHG41oCYI2nl5gfLE7CWL9I2fqXJdCANgc5PavIug==
+ <ds:X509SubjectName>CN=idp.its.fz-juelich.de,OU=ITS,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFzzCCBLegAwIBAgIHFSIFRQ92ezANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
+BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
+MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
+KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEzMDEyNTEzMjUwOVoXDTE4
+MDEyNDEzMjUwOVowgZQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
+V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
+emVudHJ1bSBKdWVsaWNoIEdtYkgxDDAKBgNVBAsTA0lUUzEeMBwGA1UEAxMVaWRw
+Lml0cy5mei1qdWVsaWNoLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA7kqAIZgzj8l8CoExRFQudG0K6+1Rq82IcP8x2qixcpM2+FQUwKfg3ZKEKrzu
+FMMesVzyhyxIol/mp9jQodr5wIdX0/dJZcTPTSwcteWho/nw4xUhFHAJhe1TXmgR
+jNSjj82SEOCF3518xUcGtD8oitgVP5dJZBqsYJxsQY9hj2aOkCblbmBhypqjV+jX
+T4x6fO+5B5cWHEwV8UZDEeugmTIoPacOw0W0YGUJSnDdJ+2XryLQuPXdq8luA3E1
+6BDIzM2IwTZObT+9m3fCIpyVrupebvNHIvrDl4NxzdHUjBpT4y3WN7NNIqjzTuzh
+ubmnwyqnyH3Va/WkYmZGlmH9OwIDAQABo4ICMzCCAi8wOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUpLW/S0BSgTYQGYu2dwI7NQ0f0Y4wHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
+5ZQmVg8RAiUwOgYDVR0RBDMwMYIVaWRwLml0cy5mei1qdWVsaWNoLmRlgRhzLmhl
+aW5yaWNoQGZ6LWp1ZWxpY2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4Yx
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNy
+bDCBywYIKwYBBQUHAQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBj
+YS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYI
+KwYBBQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNl
+cnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeSJx3gmSpN4y/Xhv/
+I0+fHVmzRy6xA9zkd/vfDVAG1a1a6U0jkuTkuoN2ObXGgPIRpV61joKDruFNWNml
+chVIORDUNE24M27JcLmxBitHrbTJZ4nrVaE57jFqM6Ll4ne4yLcJNKX1k6pOMreD
+ddTOhykyujKnlcLTb2gUgwPiFU9tpCv3aNiTFoiX/XkvHn2MHIZ82sBVEsFRdFxR
+Kxi4CCebueajXrTt7Vptou9vy5anuOI8eymx2+8hcHrDz7up57CI88c+WsvTKE0j
+GY7013lX39RPwVqufTJb1rMq3Aas6tCvKZG4kshC15lWOBZcou2rLUfkABgkC40L
+mqPg
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -59,36 +76,39 @@ sHHG41oCYI2nl5gfLE7CWL9I2fqXJdCANgc5PavIug==
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
<ds:X509Data>
- <ds:X509SubjectName>CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIFWzCCBEOgAwIBAgIED6HU3DANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-REUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEqMCgG
-A1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJKoZI
-hvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEwMDIyMjEwMDcwOFoXDTEzMDIy
-MTEwMDcwOFowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4tV2Vz
-dGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdzemVu
-dHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGljaC5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfMWbVl7AvMbD+BfKDh
-HMdNgoG1fMJw6/g9biZnFKY6Ey4tBfgpYY0pjA1tShXcFO6oBf0QIcuHlLeBjEhA
-0Oa+D+MBLI59Mtdt+qP4Vnb19U+b2eOKzWTzIPzv2YouUF7vWTVZ0zfvrBcz2v0n
-t3NcC+pT5eym+j0g6FkNSU1A56CPUE3As8Kct1MvQvPmzYpOdMqQgiZ2sJbdTHS0
-pDLbycEAqu3+io5W+MG/6dtljXGk7liYirZAeWEiLWlz0lrFU50FlFtwnVDCQr0L
-LIh6MNSawg4zvv8YsT/599OWbOJB0svrPbIpPH7dVZFpESZynns9j//13q/t+kXM
-F0cCAwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQt
-MCsGCCsGAQUFBwMCBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0G
-A1UdDgQWBBTqWpf+8Fn95qfWILim5B9Quq6KKDAfBgNVHSMEGDAWgBQgvXGJpckq
-My8R4B/llCZWDxECJTAmBgNVHREEHzAdgRtqLmhlaWRidWVjaGVsQGZ6LWp1ZWxp
-Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBlgYIKwYBBQUHAQEE
-gYkwgYYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNh
-L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEAOFrB/uQdtRVoT2Sy+lMN6cf7eeASn9xOSvqJzuiHkEN2
-rPsjzAxzCjRw0FmhsCAyub1f3dfaAc0HBxuCWoX1BBt81MQE4bae+gJ8V9P+aE49
-45PBub7vjB0FDMNpFOMHU8n02nR2Kfy0fiQwoLkq7P75pjKcN7FuKAZU4Q/FEHM+
-VGER1Mfxr5AxLqDkeOJHlaUN7Won1+UA/FKakoQ3gLCQdWT+8dc3Km1YVDNrsqJk
-NNx585kM4ZBHDCe1JLeGC2SUqiIQXIdpjO1fQFEb9xZiifS/xRod28uXwFy2cPzG
-sHHG41oCYI2nl5gfLE7CWL9I2fqXJdCANgc5PavIug==
+ <ds:X509SubjectName>CN=idp.its.fz-juelich.de,OU=ITS,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFzzCCBLegAwIBAgIHFSIFRQ92ezANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
+BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
+MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
+KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEzMDEyNTEzMjUwOVoXDTE4
+MDEyNDEzMjUwOVowgZQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
+V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
+emVudHJ1bSBKdWVsaWNoIEdtYkgxDDAKBgNVBAsTA0lUUzEeMBwGA1UEAxMVaWRw
+Lml0cy5mei1qdWVsaWNoLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA7kqAIZgzj8l8CoExRFQudG0K6+1Rq82IcP8x2qixcpM2+FQUwKfg3ZKEKrzu
+FMMesVzyhyxIol/mp9jQodr5wIdX0/dJZcTPTSwcteWho/nw4xUhFHAJhe1TXmgR
+jNSjj82SEOCF3518xUcGtD8oitgVP5dJZBqsYJxsQY9hj2aOkCblbmBhypqjV+jX
+T4x6fO+5B5cWHEwV8UZDEeugmTIoPacOw0W0YGUJSnDdJ+2XryLQuPXdq8luA3E1
+6BDIzM2IwTZObT+9m3fCIpyVrupebvNHIvrDl4NxzdHUjBpT4y3WN7NNIqjzTuzh
+ubmnwyqnyH3Va/WkYmZGlmH9OwIDAQABo4ICMzCCAi8wOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUpLW/S0BSgTYQGYu2dwI7NQ0f0Y4wHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
+5ZQmVg8RAiUwOgYDVR0RBDMwMYIVaWRwLml0cy5mei1qdWVsaWNoLmRlgRhzLmhl
+aW5yaWNoQGZ6LWp1ZWxpY2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4Yx
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNy
+bDCBywYIKwYBBQUHAQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBj
+YS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYI
+KwYBBQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNl
+cnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeSJx3gmSpN4y/Xhv/
+I0+fHVmzRy6xA9zkd/vfDVAG1a1a6U0jkuTkuoN2ObXGgPIRpV61joKDruFNWNml
+chVIORDUNE24M27JcLmxBitHrbTJZ4nrVaE57jFqM6Ll4ne4yLcJNKX1k6pOMreD
+ddTOhykyujKnlcLTb2gUgwPiFU9tpCv3aNiTFoiX/XkvHn2MHIZ82sBVEsFRdFxR
+Kxi4CCebueajXrTt7Vptou9vy5anuOI8eymx2+8hcHrDz7up57CI88c+WsvTKE0j
+GY7013lX39RPwVqufTJb1rMq3Aas6tCvKZG4kshC15lWOBZcou2rLUfkABgkC40L
+mqPg
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -99,18 +119,26 @@ sHHG41oCYI2nl5gfLE7CWL9I2fqXJdCANgc5PavIug==
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
- <OrganizationName xml:lang="de">Forschungszentrum Jülich GmbH</OrganizationName>
+ <OrganizationName xml:lang="de">e234</OrganizationName>
+ <OrganizationName xml:lang="en">e234</OrganizationName>
<OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
<OrganizationURL xml:lang="de">http://www.fz-juelich.de</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.fz-juelich.de</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
<GivenName>Jens</GivenName>
<SurName>Heidbüchel</SurName>
- <EmailAddress>j.heidbuechel@fz-juelich.de</EmailAddress>
+ <EmailAddress>mailto:j.heidbuechel@fz-juelich.de</EmailAddress>
</ContactPerson>
<ContactPerson contactType="administrative">
<GivenName>Jens</GivenName>
<SurName>Heidbüchel</SurName>
- <EmailAddress>j.heidbuechel@fz-juelich.de</EmailAddress>
+ <EmailAddress>mailto:j.heidbuechel@fz-juelich.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>ITS Service Desk</GivenName>
+ <SurName>Forschungszentrum Jülich GmbH</SurName>
+ <EmailAddress>mailto:it-services@fz-juelich.de</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
index 32c71a1b..6853c2a6 100644
--- a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nesc.gla.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for the National e-Science Centre, University of Glasgow.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-29T14:17:30Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.niif.hu.xml b/swamid-interfederations-2.0/idp.niif.hu.xml
index 88e6a86b..11b96eef 100644
--- a/swamid-interfederations-2.0/idp.niif.hu.xml
+++ b/swamid-interfederations-2.0/idp.niif.hu.xml
@@ -27,13 +27,9 @@
<ds:KeyName>idp.niif.hu</ds:KeyName>
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.niif.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/idp/profile/SAML2/Redirect/SLO"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.niif.hu/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.niif.hu/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.niif.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/idp/profile/SAML2/Redirect/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SSOService.php"/>
</IDPSSODescriptor>
<Organization>
<OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationName>
diff --git a/swamid-interfederations-2.0/idp.renater.fr.xml b/swamid-interfederations-2.0/idp.renater.fr.xml
index 11072bd8..1a459b2d 100644
--- a/swamid-interfederations-2.0/idp.renater.fr.xml
+++ b/swamid-interfederations-2.0/idp.renater.fr.xml
@@ -49,7 +49,7 @@ JA+a0emlAOfEnZeRkpSunkghdezhsTvs0DB3QVZyrFRKmxA5IiORVg==
<Organization>
<OrganizationName xml:lang="en">RENATER</OrganizationName>
<OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://www.renater.fr</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
<EmailAddress>support-federation@support.renater.fr</EmailAddress>
diff --git a/swamid-interfederations-2.0/idp.reuna.cl.xml b/swamid-interfederations-2.0/idp.reuna.cl.xml
new file mode 100644
index 00000000..b0b03247
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.reuna.cl.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.reuna.cl/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="es">
+ http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">reuna.cl</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">REUNA</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="es">REUNA</mdui:DisplayName>
+ <mdui:Description xml:lang="en">REUNA</mdui:Description>
+ <mdui:Description xml:lang="es">REUNA</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.reuna.cl</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="es">http://www.reuna.cl</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAMgGajMxYcuCX0BjnEL1yGAy4iHvMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDAeFw0xMTExMjkxNjA3MjJaFw0z
+MTExMjkxNjA3MjJaMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAI1sVrn6YL3ric9ZdLHAMumsbxnB/nMk/8Qm
+pyV+0io8aygQ/tFz3spUbuRbo8y5spj60kyod1037mQc/MbHsEkSlWN7Mssx/+uE
+6wPaJFHZ0SGx+wlJC41k7jty7r2/72l3NhZJo5L6sDQuUz30PKYbcpANIPxo+LE6
+lgbGYoJTkKpOfnFCoI+GLXKLrJU5Dyu084iq+Xu4Z9qssEkck/FccimMoGvFBt4T
+LTNSz2AuLcK+H4/thu+TrNkKqH881zZHqqcjTApFNMWd+XMaQ/rUnToKRMqtREBU
+bUCFQIthnEvvuTZXXbx7LwTMQ7m6xjyU5BUAGGywFHlq1HI76QECAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnJldW5hLmNshiNodHRwczovL2lkcC5yZXVuYS5jbC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUsmYmPyA4OX063eSXo0a8l2n13oUwDQYJ
+KoZIhvcNAQEFBQADggEBAHABa/rRLuijB1iSCWCcKx2hxAjUQswnZWCkEoxKExbB
+kxcDEKIB9EjIGMtyZasmiZwfqxZB83+EuaUqqow8Ztc4+2HSo61zwXkAT6qq3UMR
+f6O1UG9P2hb+4JejmjbH+Cl0AnaZGEapFQD3tnNlYtiv4JMmCHjrB5lt1aOkXTgX
+fEfClN1s9KYi6m7dTrEDmEyz3ua2QlwB/mOzTxQiWWX3ERwgsj8QDQ078U/X619h
+i2RT2URIEGnc0EleBMFqvGFjoZzobqlNjgataFzLccu0RKf6MRFfLjjgx/9iGvZa
+BlWcNruQPt+UBJhIBmEmwcJotRH49VLn8PyDPGBea1M=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reuna.cl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reuna.cl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reuna.cl/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reuna.cl/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reuna.cl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reuna.cl/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">reuna.cl</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAMgGajMxYcuCX0BjnEL1yGAy4iHvMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDAeFw0xMTExMjkxNjA3MjJaFw0z
+MTExMjkxNjA3MjJaMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAI1sVrn6YL3ric9ZdLHAMumsbxnB/nMk/8Qm
+pyV+0io8aygQ/tFz3spUbuRbo8y5spj60kyod1037mQc/MbHsEkSlWN7Mssx/+uE
+6wPaJFHZ0SGx+wlJC41k7jty7r2/72l3NhZJo5L6sDQuUz30PKYbcpANIPxo+LE6
+lgbGYoJTkKpOfnFCoI+GLXKLrJU5Dyu084iq+Xu4Z9qssEkck/FccimMoGvFBt4T
+LTNSz2AuLcK+H4/thu+TrNkKqH881zZHqqcjTApFNMWd+XMaQ/rUnToKRMqtREBU
+bUCFQIthnEvvuTZXXbx7LwTMQ7m6xjyU5BUAGGywFHlq1HI76QECAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnJldW5hLmNshiNodHRwczovL2lkcC5yZXVuYS5jbC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUsmYmPyA4OX063eSXo0a8l2n13oUwDQYJ
+KoZIhvcNAQEFBQADggEBAHABa/rRLuijB1iSCWCcKx2hxAjUQswnZWCkEoxKExbB
+kxcDEKIB9EjIGMtyZasmiZwfqxZB83+EuaUqqow8Ztc4+2HSo61zwXkAT6qq3UMR
+f6O1UG9P2hb+4JejmjbH+Cl0AnaZGEapFQD3tnNlYtiv4JMmCHjrB5lt1aOkXTgX
+fEfClN1s9KYi6m7dTrEDmEyz3ua2QlwB/mOzTxQiWWX3ERwgsj8QDQ078U/X619h
+i2RT2URIEGnc0EleBMFqvGFjoZzobqlNjgataFzLccu0RKf6MRFfLjjgx/9iGvZa
+BlWcNruQPt+UBJhIBmEmwcJotRH49VLn8PyDPGBea1M=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reuna.cl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reuna.cl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">REUNA</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">REUNA IdP</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.reuna.cl</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>REUNA NOC</md:GivenName>
+ <md:EmailAddress>operaciones@reuna.cl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Alejandro</md:GivenName>
+ <md:SurName>Lara</md:SurName>
+ <md:EmailAddress>cofre@reuna.cl</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.net.xml b/swamid-interfederations-2.0/idp.shibboleth.net.xml
index 9172b5d3..bec0386e 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.net.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.net/idp/shibboleth">
- <!--
- This is a shibboleth.net Shibboleth IdP for JISC Collections and Janet Limited.
- -->
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -13,6 +9,9 @@
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:22:29Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
diff --git a/swamid-interfederations-2.0/idp.uqam.ca.xml b/swamid-interfederations-2.0/idp.uqam.ca.xml
index d8f8dc8f..454362a6 100644
--- a/swamid-interfederations-2.0/idp.uqam.ca.xml
+++ b/swamid-interfederations-2.0/idp.uqam.ca.xml
@@ -1,15 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.uqam.ca/idp/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://uqam.ca" registrationInstant="2013-07-22T00:00:00Z">
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.canarie.ca" registrationInstant="2013-07-22T00:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="fr">http://www.canarie.ca/templates/services/docs/CAF_join_fr.pdf</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
- <mdrpi:PublicationInfo publisher="eduGAIN">
- <mdrpi:UsagePolicy xml:lang="en">
- http://www.edugain.org/policy/metadata-tou_1_0.txt
- </mdrpi:UsagePolicy>
- </mdrpi:PublicationInfo>
</Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
diff --git a/swamid-interfederations-2.0/idp2.iay.org.uk.xml b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
index 53517cb3..2926376b 100644
--- a/swamid-interfederations-2.0/idp2.iay.org.uk.xml
+++ b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.iay.org.uk/idp/shibboleth">
- <!--
- This is a SDSS project test IdP running outside the University environment.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-30T16:36:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
new file mode 100644
index 00000000..f5041740
--- /dev/null
+++ b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idpcafe.ifsc.edu.br/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ifsc.edu.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ifsc.edu.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xQTA/BgNVBAoTOEluc3RpdHV0
+byBGZWRlcmFsIGRlIEVkdWNhY2FvIENpZW5jaWEgZSBUZWNub2xvZ2lhIGRlIFND
+MQ0wCwYDVQQLEwREVElDMR8wHQYJKoZIhvcNAQkBFhBkdGljQGlmc2MuZWR1LmJy
+MRYwFAYDVQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmlu
+YTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcN
+MTMxMDEwMTM0NjAzWhcNMTYxMDA5MTM0NjAzWjCBzzFBMD8GA1UEChM4SW5zdGl0
+dXRvIEZlZGVyYWwgZGUgRWR1Y2FjYW8gQ2llbmNpYSBlIFRlY25vbG9naWEgZGUg
+U0MxDTALBgNVBAsTBERUSUMxHzAdBgkqhkiG9w0BCQEWEGR0aWNAaWZzYy5lZHUu
+YnIxFjAUBgNVBAcTDUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFy
+aW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8de
+KLY8l4j2LLmbN/PEDDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFx
+zAgTFyB8GKJU3E4L7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIP
+EakOzSOMWfvsl54EVgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed
+7xqj4AHA49SljpbrTOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4Y
+I9HkE599xiNjK19qXrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEADl6dRbiBovMwfbnOON9x5RMFWOaSvo3j
+KiRS9eHIH//FqS21Mqepm4QWskW+cFXqWwHdJYYq2XiZJfEqd3TezjTthnNTavxZ
+hVHif/6Sfn16I4XfRQ6aVRcIjtNJKI34t7gbLhtyqnVlIe2OqDoZl+ibbbOQBR7K
+BmFZqTQtixfYfLtvbQAPhBVzdUAStBKlzfYgwmvQDehzAlQX4C9aA6rKgH8RVUB9
+TuvmGGw96Boogf2JJ/fJVONTc0td5H23h09kn4wQsolCGHhsb4iRPXDW1yE99AGN
+Pal6a5saoI4UZ9QKbpYyCxOU/jzZGkGuD4qE5O1x5+3IpIfKs1E1Lg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ifsc.edu.br/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xQTA/BgNVBAoTOEluc3RpdHV0
+byBGZWRlcmFsIGRlIEVkdWNhY2FvIENpZW5jaWEgZSBUZWNub2xvZ2lhIGRlIFND
+MQ0wCwYDVQQLEwREVElDMR8wHQYJKoZIhvcNAQkBFhBkdGljQGlmc2MuZWR1LmJy
+MRYwFAYDVQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmlu
+YTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcN
+MTMxMDEwMTM0NjAzWhcNMTYxMDA5MTM0NjAzWjCBzzFBMD8GA1UEChM4SW5zdGl0
+dXRvIEZlZGVyYWwgZGUgRWR1Y2FjYW8gQ2llbmNpYSBlIFRlY25vbG9naWEgZGUg
+U0MxDTALBgNVBAsTBERUSUMxHzAdBgkqhkiG9w0BCQEWEGR0aWNAaWZzYy5lZHUu
+YnIxFjAUBgNVBAcTDUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFy
+aW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8de
+KLY8l4j2LLmbN/PEDDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFx
+zAgTFyB8GKJU3E4L7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIP
+EakOzSOMWfvsl54EVgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed
+7xqj4AHA49SljpbrTOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4Y
+I9HkE599xiNjK19qXrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEADl6dRbiBovMwfbnOON9x5RMFWOaSvo3j
+KiRS9eHIH//FqS21Mqepm4QWskW+cFXqWwHdJYYq2XiZJfEqd3TezjTthnNTavxZ
+hVHif/6Sfn16I4XfRQ6aVRcIjtNJKI34t7gbLhtyqnVlIe2OqDoZl+ibbbOQBR7K
+BmFZqTQtixfYfLtvbQAPhBVzdUAStBKlzfYgwmvQDehzAlQX4C9aA6rKgH8RVUB9
+TuvmGGw96Boogf2JJ/fJVONTc0td5H23h09kn4wQsolCGHhsb4iRPXDW1yE99AGN
+Pal6a5saoI4UZ9QKbpYyCxOU/jzZGkGuD4qE5O1x5+3IpIfKs1E1Lg==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</OrganizationName>
+ <OrganizationName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ifsc.edu.br/</OrganizationURL>
+ <OrganizationURL xml:lang="pt-br">http://www.ifsc.edu.br/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>Diretoria de TIC - IFSC</SurName>
+ <EmailAddress>suporte.reitoria@ifsc.edu.br</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml b/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml
new file mode 100644
index 00000000..e1f69a35
--- /dev/null
+++ b/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ifs00sv056.ifsul.edu.br/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ifsul.edu.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ifsul.edu.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
+SUMgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29t
+dW5pY2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYD
+VQQHEwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UE
+BhMCQlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMB4XDTEzMDkx
+MDE0MDUxOFoXDTE2MDkwOTE0MDUxOFowgfoxNDAyBgNVBAoTK0lGU3VsIC0gSW5z
+dGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRUSUMg
+LSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29tdW5p
+Y2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYDVQQH
+EwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuz4oD/NvC0Hwk0WhnCSYP29C98DOVwJ8sjOT
+1tfcOSkYq2DfXvI9macZLWi6PY8moeOGRlUCquo+w3Y1PJpwj0Hck0+HNN3JchyA
+iKr5LqnS/Ukx5M/CSvrwaeu7uA2Mpqv5PtfnUaU4ytDGBtWX/w1TgxbOTLFQ47UN
+69+359uqqHTvUFiRSPYGE7xGrpu6lq5A5Q/E6mkCMtypRAHH9Ld6fFH7AAWiExJH
+SGJq5rRoml2GTzm786NeM4rc4hIBkE9GuUyTtix6VJumm9PkF3HctGQZRYT/Iwi+
+PyISeGuDy2JWQy+VYgLBuyGsXo3O9LVMVe/sTUPr+2gU52AD1QIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQB1yTZ5bnXiK5+4mMT6NSQvkxnBn6KAu5hau+MREI3WM3CL
++3udcHBNFkxSEL1BVJjfrg40IzSic5rVQ8pK9EWyhey4AcD9BBkrdem0P7Z+0+PJ
+pV6SV+n0MoAGf7VJxxXaX4JcJmrwQOXhj0v+YhOoBmmm3ccCrmzWvWpKPO/NgUYR
+mXkx/UZzoIc8si4G4f0tdrteQMtpq3p31STZAX7kIr7Ih2GwQXWRqvyRmd0CtAwE
+0YO4sFwtY/JBMQIwBDQNYFv6H/+6wo24inxILDSj/jHX60t/tSKPBRdkN0JXnv1A
+2EfD1BzA7Hv6BsAWRmUYnsxjtSsQc4LJizwpTTvp
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
+SUMgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29t
+dW5pY2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYD
+VQQHEwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UE
+BhMCQlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMB4XDTEzMDkx
+MDE0MDUxOFoXDTE2MDkwOTE0MDUxOFowgfoxNDAyBgNVBAoTK0lGU3VsIC0gSW5z
+dGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRUSUMg
+LSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29tdW5p
+Y2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYDVQQH
+EwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuz4oD/NvC0Hwk0WhnCSYP29C98DOVwJ8sjOT
+1tfcOSkYq2DfXvI9macZLWi6PY8moeOGRlUCquo+w3Y1PJpwj0Hck0+HNN3JchyA
+iKr5LqnS/Ukx5M/CSvrwaeu7uA2Mpqv5PtfnUaU4ytDGBtWX/w1TgxbOTLFQ47UN
+69+359uqqHTvUFiRSPYGE7xGrpu6lq5A5Q/E6mkCMtypRAHH9Ld6fFH7AAWiExJH
+SGJq5rRoml2GTzm786NeM4rc4hIBkE9GuUyTtix6VJumm9PkF3HctGQZRYT/Iwi+
+PyISeGuDy2JWQy+VYgLBuyGsXo3O9LVMVe/sTUPr+2gU52AD1QIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQB1yTZ5bnXiK5+4mMT6NSQvkxnBn6KAu5hau+MREI3WM3CL
++3udcHBNFkxSEL1BVJjfrg40IzSic5rVQ8pK9EWyhey4AcD9BBkrdem0P7Z+0+PJ
+pV6SV+n0MoAGf7VJxxXaX4JcJmrwQOXhj0v+YhOoBmmm3ccCrmzWvWpKPO/NgUYR
+mXkx/UZzoIc8si4G4f0tdrteQMtpq3p31STZAX7kIr7Ih2GwQXWRqvyRmd0CtAwE
+0YO4sFwtY/JBMQIwBDQNYFv6H/+6wo24inxILDSj/jHX60t/tSKPBRdkN0JXnv1A
+2EfD1BzA7Hv6BsAWRmUYnsxjtSsQc4LJizwpTTvp
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</OrganizationName>
+ <OrganizationName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ifsul.edu.br/</OrganizationURL>
+ <OrganizationURL xml:lang="pt-br">http://www.ifsul.edu.br/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>Maicon Anca dos Santos</SurName>
+ <EmailAddress>dtic@ifsul.edu.br</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/issues.shibboleth.net.xml b/swamid-interfederations-2.0/issues.shibboleth.net.xml
index 7a89c6ea..7ac7acc4 100644
--- a/swamid-interfederations-2.0/issues.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/issues.shibboleth.net.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://issues.shibboleth.net/shibboleth">
- <!--
- This is a Shibboleth Federated Issue Tracking Shibboleth SP for JISC Collections and Janet Limited.
- -->
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -16,6 +12,9 @@
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:23:40Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
@@ -37,10 +36,10 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDRjCCAi6gAwIBAgIJAPpEsjMpUtq9MA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
+ MIIDRjCCAi6gAwIBAgIJAPjZ6g1hwfvPMA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
- VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTEwMTA3MTg0MTQ4WhcNMTQw
- MTA2MTg0MTQ4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
+ VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTMxMTI1MTQ1ODA4WhcNMzcw
+ MzA0MTQ1ODA4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB
IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA
+hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP
@@ -49,12 +48,12 @@
y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP
3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID
AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN
- AQEFBQADggEBAEzcImXrjUNZF/8AbpcDOqlBO/neTxE0Lcnv4HevHmjqVaemxXK5
- E2pAIJexcyCnp4EV7EK+5hpkr5J26iESHr3w4u/BvUvgSLNjlrIFw58mpBM9f+Qe
- q5bQWff+dmkhrxdhaIVraH70bsuxVKwycmUS0L11nOTxAQbh85wJbIwqH4fKAzQm
- jPp4VbLesRmUyDV+fY4YrZXHYosfuZLEexJgmgcRgZFug6NbWTclKnxKPhquYjem
- oHlA8E0OvkQswalMPLfSzhgftYNHohjdQ2oMBUC4uMk9T+r7ZeKkeCiXIzUzEh8M
- uQfWf/K4Fj4CqCzMOU3mmvy7ricwz/4Kzas=
+ AQEFBQADggEBAI0BSqXoyw5bUVQJKNCnxB3hUwHIOXeoS77jqgv2lesyTqz5U4NV
+ v4Cdz7icwYzt+c6ZSZqem4pqmi3/6COZnf/+l29J/XwWkva32P6tfoO4af3qywF+
+ TvuZiRMXdt1KE7GTlYOSxOsnxaRmXVc6MWfxPT6oTOt5z15aTdfEzK+wVfeUkIf1
+ 1soEmMHgjDaa/HQdGgXGq/fStDc0Mcm2W7y50+aNwqIMNiQQiwQYSUgpBatSfKy1
+ umh6DHEyznDZAAHBtatzvQu1YAJHUg6AeimuhminaM5tyBCW6Y6YMywFYSP+VqPU
+ PxCBrPWcCAwOw80Ey/FLVlAdW1FuwUmMejA=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/lu-idp.lu.lv.xml b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
index 61005d3f..4a8357d9 100644
--- a/swamid-interfederations-2.0/lu-idp.lu.lv.xml
+++ b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
@@ -40,7 +40,7 @@ oZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQyOWlzJ0viw82thKw8EOzYCZZMFDK
</md:IDPSSODescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">LAIFE - LU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Latvian Identity Federation LAIFE - LU IDP</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">University of Latvia - LU IDP</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
<OrganizationURL xml:lang="lv">http://www.lu.lv/</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml
new file mode 100644
index 00000000..11b6587d
--- /dev/null
+++ b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://marte.ifsertao-pe.edu.br/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ifsertao-pe.edu.br</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExPzA9BgNVBAoTNklGU0VSVEFP
+LVBFIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8gU2VydGFvIFBlcm5hbWJ1Y2FubzEN
+MAsGA1UECxMEREdUSTEmMCQGCSqGSIb3DQEJARYXY2FmZUBpZnNlcnRhby1wZS5l
+ZHUuYnIxEjAQBgNVBAcTCVBldHJvbGluYTETMBEGA1UECBMKUGVybmFtYnVjbzEL
+MAkGA1UEBhMCQlIxITAfBgNVBAMTGG1hcnRlLmlmc2VydGFvLXBlLmVkdS5icjAe
+Fw0xMzExMDcyMjAxMjNaFw0xNjExMDYyMjAxMjNaMIHRMT8wPQYDVQQKEzZJRlNF
+UlRBTy1QRSAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFNlcnRhbyBQZXJuYW1idWNh
+bm8xDTALBgNVBAsTBERHVEkxJjAkBgkqhkiG9w0BCQEWF2NhZmVAaWZzZXJ0YW8t
+cGUuZWR1LmJyMRIwEAYDVQQHEwlQZXRyb2xpbmExEzARBgNVBAgTClBlcm5hbWJ1
+Y28xCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhtYXJ0ZS5pZnNlcnRhby1wZS5lZHUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0XjYgQ3i0/lnuTWPm
+72+rOSLwsV4f7EHdO64F7+u1EZt+oVOsMpBy3XbYBgwPlnNbb9aFJr85Z/YzEz5h
+f4WxdMBkvPWx+cLkrqT+2RezY8rYAcRAwdSzAyeBj1MYpBqOM9rt81jmKMZmqUpJ
+67LgspIM9jGjzLmBKgJn6XF2J+p+0KoiEJacp06FtvZ/Yk+Qyi7oAvb0lOWk1vmm
+odEU5nPkgk6bJQvXn0+mmeuXsI9tRsdnjx2YFKt7EMDv3jim7B7tV+yi4IXNm7gw
+y1l8vWI49FO6hyCMf6n5RxtOi+iigHUD59DcvqRaHIVb3IDKGoSCbS0T1KsS68ea
+TK2BAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAERb5Q9f6FAAky4YOyhcUWKq6mYp
+CCuySwWySQ4qlDbEGW0WcMciyMAtwIHQQM9+AO5vV0ONnDNoPIXihU68as60CC4R
+VnP4NL7BM/whl8vpWpVtlCttrI/S7YLHmaTpQ7X8ncPlDqdO7hrjG/L5TViNnhhO
+YUAy6pOD0EfhHMLhBBYUZ5a9VlD+Oc+0oly55w+96OgMi2wmJyXWyEhtziwjmkJJ
+duGfVseh8yfame8Or1oBl/b3Z6cREKxO88xMbWRBAvPAkbBL9viFnV/HGhEjL35m
+hTgbWNwA4WPcsuB6dnJek24EPtMJYAR88eiNtijmGZP+23mUoIpOTvOhGUo=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marte.ifsertao-pe.edu.br/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExPzA9BgNVBAoTNklGU0VSVEFP
+LVBFIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8gU2VydGFvIFBlcm5hbWJ1Y2FubzEN
+MAsGA1UECxMEREdUSTEmMCQGCSqGSIb3DQEJARYXY2FmZUBpZnNlcnRhby1wZS5l
+ZHUuYnIxEjAQBgNVBAcTCVBldHJvbGluYTETMBEGA1UECBMKUGVybmFtYnVjbzEL
+MAkGA1UEBhMCQlIxITAfBgNVBAMTGG1hcnRlLmlmc2VydGFvLXBlLmVkdS5icjAe
+Fw0xMzExMDcyMjAxMjNaFw0xNjExMDYyMjAxMjNaMIHRMT8wPQYDVQQKEzZJRlNF
+UlRBTy1QRSAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFNlcnRhbyBQZXJuYW1idWNh
+bm8xDTALBgNVBAsTBERHVEkxJjAkBgkqhkiG9w0BCQEWF2NhZmVAaWZzZXJ0YW8t
+cGUuZWR1LmJyMRIwEAYDVQQHEwlQZXRyb2xpbmExEzARBgNVBAgTClBlcm5hbWJ1
+Y28xCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhtYXJ0ZS5pZnNlcnRhby1wZS5lZHUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0XjYgQ3i0/lnuTWPm
+72+rOSLwsV4f7EHdO64F7+u1EZt+oVOsMpBy3XbYBgwPlnNbb9aFJr85Z/YzEz5h
+f4WxdMBkvPWx+cLkrqT+2RezY8rYAcRAwdSzAyeBj1MYpBqOM9rt81jmKMZmqUpJ
+67LgspIM9jGjzLmBKgJn6XF2J+p+0KoiEJacp06FtvZ/Yk+Qyi7oAvb0lOWk1vmm
+odEU5nPkgk6bJQvXn0+mmeuXsI9tRsdnjx2YFKt7EMDv3jim7B7tV+yi4IXNm7gw
+y1l8vWI49FO6hyCMf6n5RxtOi+iigHUD59DcvqRaHIVb3IDKGoSCbS0T1KsS68ea
+TK2BAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAERb5Q9f6FAAky4YOyhcUWKq6mYp
+CCuySwWySQ4qlDbEGW0WcMciyMAtwIHQQM9+AO5vV0ONnDNoPIXihU68as60CC4R
+VnP4NL7BM/whl8vpWpVtlCttrI/S7YLHmaTpQ7X8ncPlDqdO7hrjG/L5TViNnhhO
+YUAy6pOD0EfhHMLhBBYUZ5a9VlD+Oc+0oly55w+96OgMi2wmJyXWyEhtziwjmkJJ
+duGfVseh8yfame8Or1oBl/b3Z6cREKxO88xMbWRBAvPAkbBL9viFnV/HGhEjL35m
+hTgbWNwA4WPcsuB6dnJek24EPtMJYAR88eiNtijmGZP+23mUoIpOTvOhGUo=
+
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationName>
+ <OrganizationName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ifsertao-pe.edu.br</OrganizationURL>
+ <OrganizationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>Francisco Hamilton</SurName>
+ <EmailAddress>cafe@ifsertao-pe.edu.br</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no.xml b/swamid-interfederations-2.0/openwiki.uninett.no.xml
index 8e67777f..0d66e714 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no.xml
@@ -1,8 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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: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:KeyDescriptor>
- <ds:KeyInfo>
+ <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>
@@ -12,24 +32,27 @@
<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: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" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <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: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:GivenName>Feide Support</md:GivenName>
+ <md:EmailAddress>support@feide.no</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qub.ac.uk.xml b/swamid-interfederations-2.0/qub.ac.uk.xml
new file mode 100644
index 00000000..7b9c5700
--- /dev/null
+++ b/swamid-interfederations-2.0/qub.ac.uk.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qub.ac.uk/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T10:26:41Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qub.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDKDCCAhCgAwIBAgIVAJycK9QeBfR7eEXzFTRCeXgxyljUMA0GCSqGSIb3DQEB
+ BQUAMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azAeFw0xMjAzMjcxMzE4NTha
+ Fw0zMjAzMjcxNDE4NThaMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azCCASIw
+ DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIreX13KY2pe43eXfxccSvl/4f3N
+ QD5HtQfUY7tjkMyT+og8bDiavnHm5puyoO8hsIOOV0Hqv4nrF8cKhu895IcnstWY
+ sd9vLjSRhSKXa8w3VcRhpWDMLaxd21jgi/32tofMCWodFx38cGyuINI2Wuv2ME05
+ r03JMVnwWmjFCzGWsdUTHSffi0GlW6bo1X/3jzx+5VMkKRobbLzCvMSzTmyCFEn8
+ rZQhhFtShz3JZAajnOsRLiiJmYi2ep70Ub3aE8ZB3HOizWYsgPulmMTUm3nacr50
+ x9P+tWxKdtd4qU/m4v9wYsRJhJpA6yljZmtrQMsoKMdpgKkHhd1WGdwQt1MCAwEA
+ AaNlMGMwQgYDVR0RBDswOYIPc2hpYjMucXViLmFjLnVrhiZodHRwczovL3NoaWIz
+ LnF1Yi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXmiIagkYVllQI5LM
+ BnzS+VAh5EAwDQYJKoZIhvcNAQEFBQADggEBADuA54YASAFyW/RVKg44Aktj/bGe
+ aYcuOfGcv48TNIOeS/NHRqlQeyjiyvPGlc8ul3mMYv8Q9MoB7DxpCJa7BbbXSVQC
+ n5jkx70rmbc7WOrSH5uNjQP34rbRMK56yOGdlUEAKf4V3raGWHOs5V+Q4n9gE4FG
+ bHqn90pt5kR9L7VZW8D1dPpMA3YDbDj2anX0zM8VQxiqipUWeoISWX0P6cEhQzsz
+ j5jG9uXwrdLwsmzHImL6Xc4K41lVaxXoZydYzmu6nougbKa+XdIRiRLqJDeId6ZA
+ iEW6gm81phqOuQXOIMVz4Qbd0M3RhcskYsYaZW08gG/vBOLNZEyqmtph6/0=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib3.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qub.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDKDCCAhCgAwIBAgIVAJycK9QeBfR7eEXzFTRCeXgxyljUMA0GCSqGSIb3DQEB
+ BQUAMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azAeFw0xMjAzMjcxMzE4NTha
+ Fw0zMjAzMjcxNDE4NThaMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azCCASIw
+ DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIreX13KY2pe43eXfxccSvl/4f3N
+ QD5HtQfUY7tjkMyT+og8bDiavnHm5puyoO8hsIOOV0Hqv4nrF8cKhu895IcnstWY
+ sd9vLjSRhSKXa8w3VcRhpWDMLaxd21jgi/32tofMCWodFx38cGyuINI2Wuv2ME05
+ r03JMVnwWmjFCzGWsdUTHSffi0GlW6bo1X/3jzx+5VMkKRobbLzCvMSzTmyCFEn8
+ rZQhhFtShz3JZAajnOsRLiiJmYi2ep70Ub3aE8ZB3HOizWYsgPulmMTUm3nacr50
+ x9P+tWxKdtd4qU/m4v9wYsRJhJpA6yljZmtrQMsoKMdpgKkHhd1WGdwQt1MCAwEA
+ AaNlMGMwQgYDVR0RBDswOYIPc2hpYjMucXViLmFjLnVrhiZodHRwczovL3NoaWIz
+ LnF1Yi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXmiIagkYVllQI5LM
+ BnzS+VAh5EAwDQYJKoZIhvcNAQEFBQADggEBADuA54YASAFyW/RVKg44Aktj/bGe
+ aYcuOfGcv48TNIOeS/NHRqlQeyjiyvPGlc8ul3mMYv8Q9MoB7DxpCJa7BbbXSVQC
+ n5jkx70rmbc7WOrSH5uNjQP34rbRMK56yOGdlUEAKf4V3raGWHOs5V+Q4n9gE4FG
+ bHqn90pt5kR9L7VZW8D1dPpMA3YDbDj2anX0zM8VQxiqipUWeoISWX0P6cEhQzsz
+ j5jG9uXwrdLwsmzHImL6Xc4K41lVaxXoZydYzmu6nougbKa+XdIRiRLqJDeId6ZA
+ iEW6gm81phqOuQXOIMVz4Qbd0M3RhcskYsYaZW08gG/vBOLNZEyqmtph6/0=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">The Queen's University of Belfast</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Queen's University Belfast</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.qub.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Karen</GivenName>
+ <SurName>Murphy</SurName>
+ <EmailAddress>mailto:eresources@qub.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Karen</GivenName>
+ <SurName>Murphy</SurName>
+ <EmailAddress>mailto:k.l.murphy@qub.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repos.ids-mannheim.de.xml b/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
index 9dfc7dfc..fbef3e5f 100644
--- a/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
@@ -80,7 +80,7 @@ hoWgvpRdJLO3MqO0sMEedQE=
<ServiceDescription xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</ServiceDescription>
<ServiceDescription xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</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"/>
- <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="false"/>
+ <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"/>
<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="false"/>
</AttributeConsumingService>
</SPSSODescriptor>
@@ -103,8 +103,8 @@ hoWgvpRdJLO3MqO0sMEedQE=
<EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
- <GivenName>Oliver</GivenName>
- <SurName>Schonefeld</SurName>
- <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
+ <GivenName>AAI</GivenName>
+ <SurName>Team</SurName>
+ <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rr.funet.fi.xml b/swamid-interfederations-2.0/rr.funet.fi.xml
index e18fbed2..96517c6b 100644
--- a/swamid-interfederations-2.0/rr.funet.fi.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi.xml
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
+<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>
+ <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.geant.net/uri/dataprotection-code-of-conduct/v1</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://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<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>
@@ -12,13 +22,9 @@
<mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</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>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEzDCCA7SgAwIBAgIRANkuMGk/HlexnQRYLfLoQaEwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -48,104 +54,104 @@ rpMTlKYf36DnHsyERNItnzU02J686VAecWTuNgUwHHI3LzZCWVncQm+I6veK43Ct
PahX4Y7zrHlQEDDBvQM0uwFM4Dgy07Qk3EwVXCs+46U=</ds:X509Certificate>
</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>Kari</md:GivenName>
- <md:SurName>Laalo</md:SurName>
- <md:EmailAddress>mailto:kari.laalo@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>
+ </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" isRequired="true"/>
+ <RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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="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" isRequired="true"/>
+ <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" 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="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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" 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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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" isRequired="true"/>
+ <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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" 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"/>
+ <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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" isRequired="true"/>
+ <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" isRequired="true"/>
+ <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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" 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="technical">
+ <GivenName>Kari</GivenName>
+ <SurName>Laalo</SurName>
+ <EmailAddress>mailto:kari.laalo@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Timo</GivenName>
+ <SurName>Mustonen</SurName>
+ <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
index 5164f2a5..e2963802 100644
--- a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp-dev.cf.ac.uk/shibboleth">
- <!--
- This is a Shib Test SP owned by Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-23T14:26:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
index d9b4bb4d..4a14e4df 100644
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
- <!--
- This is a Shibboleth IdP for The University of Manchester.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-04T15:35:56.421696Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/sourcesup.cru.fr.xml b/swamid-interfederations-2.0/sourcesup.cru.fr.xml
index ced15849..9c23ae4e 100644
--- a/swamid-interfederations-2.0/sourcesup.cru.fr.xml
+++ b/swamid-interfederations-2.0/sourcesup.cru.fr.xml
@@ -18,21 +18,24 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIICwTCCAiqgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJGUjEm
-MCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5pdmVyc2l0ZXMxGTAXBgNVBAMT
-EHNvdXJjZXN1cC5jcnUuZnIwHhcNMDgwOTE1MTIwMzQ5WhcNMjgwOTEwMTIwMzQ5
-WjBQMQswCQYDVQQGEwJGUjEmMCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5p
-dmVyc2l0ZXMxGTAXBgNVBAMTEHNvdXJjZXN1cC5jcnUuZnIwgZ8wDQYJKoZIhvcN
-AQEBBQADgY0AMIGJAoGBAKoHgRHVnwdX+iQIvIu2/z5I2g2ljqlYJzp74p2HYslf
-xnndqD7YodHihtoLDLIkPrGJ6Y0vtOJceb6XjoFr8k+MP41hs59s4p3qQ1M0lbY4
-6yEqLXednj00mJkz4XciB0h812bJifjH/rhYx25PdLlnp7Y9xCkq7+2BR1AFWZmZ
-AgMBAAGjgaowgacwHQYDVR0OBBYEFDgGBRQ5LF28lBPNjNWLu8YCDtxhMHgGA1Ud
-IwRxMG+AFDgGBRQ5LF28lBPNjNWLu8YCDtxhoVSkUjBQMQswCQYDVQQGEwJGUjEm
-MCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5pdmVyc2l0ZXMxGTAXBgNVBAMT
-EHNvdXJjZXN1cC5jcnUuZnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-AAOBgQB05YFzaYIRKF0JL9Br0U0mCdSyyP3N9Unm2jG7yRrGXCR+2tnj16fwhQlk
-QIGLfHDFFpfBeBoWozJFBcCmFRCawnK8RYqrApvpy1M/k/Y+yIAhq8G8XfZqzU1G
-HaaOGqD8nCkO3t3qaIPP4CTmE+GS72ooHHntvoGy/RDn32aVVg==
+ MIIDAzCCAeugAwIBAgIJAKuk6oRKZz4uMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTEyMTIxMDE1MDMyMloXDTIyMTIw
+ODE1MDMyMlowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlfCY6MZquL5Lk6KBnaT4pItD6AQKr
+T2GY8CwNhFeCqbeg1UbUvYo/a/4uGq7S+HeDK+/AIoapC5AzG4E+0Ca+uVkiWRld
+dpaQx5rPPCfdoI6WtutWrlkNYmmMFzoxOEaOv9YIa0sVHy6zJyghHAhK/PiSqt26
+sYCJRW2vTWJ5PKGhLG3UunQxPfa9N2GO19g/pKyPvX19bi43HgZEGj8GvmcEgAVu
+eJeeGlSXxTzPOLuyvDzt9zvRTIHirHp++K5+l8vhkDTJza7ODcTsiS8SOEP5v5Fk
+BJS6a+HNJm/N22xhrBcshwXfvXMmESsdaUEtIMzQf66r1OTmbgeAeHZZAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQx
+TfD1M0AVI4lWqvsJdklkJv1INTANBgkqhkiG9w0BAQUFAAOCAQEAOMr0aTllYChc
+I3nffrxNj6xyWlI35AlzWmgQqLwScSDDWPwgHD81Maazbq0SSo+4A42/x7P3Jz1u
+R5t73qphmBgzLmX3HA/FGUhbyevzr0zsLf5b+LDi0ncIZ0PM5L8ZMZDTv/k7DVZE
+JwoA1/fFU4st7EU0NjemkE9SCgzqyZc8GRuEs8As7mK7p4slpaZo6kXG9A2dKsmZ
+s0R+Iuj8q0ccUHFb1n92kS4gqSxJCKmbtcIcFk3QdC2o+IXdaDB8RHxKaS8kfFS1
+Am6Gl2+CfY5FrK1p9pIYU0YoTIqma1498HOq3f82/aO61mxzfUMu2vH/Fds0BhM8
+WVDj2hrySg==
+
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -41,6 +44,32 @@ HaaOGqD8nCkO3t3qaIPP4CTmE+GS72ooHHntvoGy/RDn32aVVg==
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDAzCCAeugAwIBAgIJAKuk6oRKZz4uMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTEyMTIxMDE1MDMyMloXDTIyMTIw
+ODE1MDMyMlowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlfCY6MZquL5Lk6KBnaT4pItD6AQKr
+T2GY8CwNhFeCqbeg1UbUvYo/a/4uGq7S+HeDK+/AIoapC5AzG4E+0Ca+uVkiWRld
+dpaQx5rPPCfdoI6WtutWrlkNYmmMFzoxOEaOv9YIa0sVHy6zJyghHAhK/PiSqt26
+sYCJRW2vTWJ5PKGhLG3UunQxPfa9N2GO19g/pKyPvX19bi43HgZEGj8GvmcEgAVu
+eJeeGlSXxTzPOLuyvDzt9zvRTIHirHp++K5+l8vhkDTJza7ODcTsiS8SOEP5v5Fk
+BJS6a+HNJm/N22xhrBcshwXfvXMmESsdaUEtIMzQf66r1OTmbgeAeHZZAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQx
+TfD1M0AVI4lWqvsJdklkJv1INTANBgkqhkiG9w0BAQUFAAOCAQEAOMr0aTllYChc
+I3nffrxNj6xyWlI35AlzWmgQqLwScSDDWPwgHD81Maazbq0SSo+4A42/x7P3Jz1u
+R5t73qphmBgzLmX3HA/FGUhbyevzr0zsLf5b+LDi0ncIZ0PM5L8ZMZDTv/k7DVZE
+JwoA1/fFU4st7EU0NjemkE9SCgzqyZc8GRuEs8As7mK7p4slpaZo6kXG9A2dKsmZ
+s0R+Iuj8q0ccUHFb1n92kS4gqSxJCKmbtcIcFk3QdC2o+IXdaDB8RHxKaS8kfFS1
+Am6Gl2+CfY5FrK1p9pIYU0YoTIqma1498HOq3f82/aO61mxzfUMu2vH/Fds0BhM8
+WVDj2hrySg==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIICwTCCAiqgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJGUjEm
MCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5pdmVyc2l0ZXMxGTAXBgNVBAMT
EHNvdXJjZXN1cC5jcnUuZnIwHhcNMDgwOTE1MTIwMzQ5WhcNMjgwOTEwMTIwMzQ5
@@ -60,26 +89,25 @@ HaaOGqD8nCkO3t3qaIPP4CTmE+GS72ooHHntvoGy/RDn32aVVg==
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML2/POST" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
<AttributeConsumingService index="0">
<ServiceName xml:lang="fr">RENATER - la plateforme SourceSup</ServiceName>
<ServiceName xml:lang="en">RENATER - software forge for RENATER community</ServiceName>
<ServiceDescription xml:lang="fr">SourceSup est un site d'hébergement de projets de développement logiciel pour la communauté enseignement supérieur et recherche française.</ServiceDescription>
<ServiceDescription xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</ServiceDescription>
- <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
<RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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="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="givenName" Name="urn:oid:2.5.4.42" 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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">RENATER</OrganizationName>
<OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://www.renater.fr</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
<SurName>Olivier Lumineau</SurName>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index b80de835..a6452c31 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,9 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.catalog.clarin.eu">
- <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:KeyDescriptor>
- <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.catalog.clarin.eu">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-29T11:20:42Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</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.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol 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://catalog.clarin.eu/Shibboleth.sso/DS" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Clarin Catalog Service Provider</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Clarin Catalog Service Provider</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</mdui:Description>
+ <mdui:Description xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
+ <mdui:InformationURL xml:lang="de">http://www.clarin.eu</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.clarin.eu</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>catalog.clarin.eu</ds:KeyName>
<ds:X509Data>
+ <ds:X509SubjectName>CN=catalog.clarin.eu,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
<ds:X509Certificate>MIIE3DCCA8SgAwIBAgIED+aV9jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMDA0MTUxMzQ1
@@ -29,37 +54,91 @@ s6fNqdPrhNcEN8KweZh9HyOgNpTEJPJpfwb4XR3pzfSRyPotr2GL80NVXTDA+YQs
fPO0WLU0KduZtyfl1QGnYZcIpBAN53M+EvMk0Q9ruOP3FZazLPscULJnqW8Ks8/v
ijthUt3XZFCR66qbNf7HeyS7zzYYMkyRDJN9PixRyiEAWHifqXJQzNI9dlqcy+Aq
nnDbttGYLUyhuuT+CqcBRWJButW9x4BFUDNHrgfcPWwFhUGx3hqI2U6zqrTgesWg
-hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI</ds:X509Certificate>
+hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Catalog Clarin</md:ServiceName>
- <md:ServiceName xml:lang="en">Catalog Clarin</md:ServiceName>
- <md:ServiceName xml:lang="sv">Catalog Clarin</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Catalog Clarin</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">CMDI Component Registry - web application for managing, creating and editing metadata components.</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">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Tobias</md:GivenName>
- <md:SurName>Vanvalkenhoef</md:SurName>
- <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>catalog.clarin.eu</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=catalog.clarin.eu,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
+ <ds:X509Certificate>MIIE3DCCA8SgAwIBAgIED+aV9jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMDA0MTUxMzQ1
+MTFaFw0xNTA0MTQxMzQ1MTFaMH8xCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
+dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxGjAYBgNVBAMTEWNhdGFsb2cuY2xhcmlu
+LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0SxoF+pHBBTzECbn
+IK3k+WuiRpZCv/ECHgUqSq5mw+5x1ZOrP3qW1c/BL+mh8rPM3twPw1zh7faycCzb
+Wg6xjkzbvfnidFq394JdJ8OYHHd4629vF/QQlDiPU/WXNL1PWqh+JNoVbBeZI8Uz
++xglMyPaLn2rOTcVm5fqk6Do8DrubkZ7fxZ/4CkzJ8rTlFNOCcN8x5G2rWtcJYHa
+xS0ZBhmMt1AmqzWh7ZJCvgS9Wma4ZOhuh3xZSlaEB8o3HWAYprR6g7L+HFvmKdfK
+8oGbBViHUqsslr80Mtli15ZzxkkBH95fzYPdJTCAMccaqLhvQfjuChy7FsDYI5cV
+fvhaJQIDAQABo4IBfzCCAXswCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPV/s0egKEIbVq/6uW/GqGNX3RInMB8G
+A1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMHcGA1UdHwRwMG4wNaAzoDGG
+L2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/Bggr
+BgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCyMBGsYojEQdaSJnym2OQQ
+s6fNqdPrhNcEN8KweZh9HyOgNpTEJPJpfwb4XR3pzfSRyPotr2GL80NVXTDA+YQs
+fPO0WLU0KduZtyfl1QGnYZcIpBAN53M+EvMk0Q9ruOP3FZazLPscULJnqW8Ks8/v
+ijthUt3XZFCR66qbNf7HeyS7zzYYMkyRDJN9PixRyiEAWHifqXJQzNI9dlqcy+Aq
+nnDbttGYLUyhuuT+CqcBRWJButW9x4BFUDNHrgfcPWwFhUGx3hqI2U6zqrTgesWg
+hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="de">Clarin Catalog Service Provider</ServiceName>
+ <ServiceName xml:lang="en">Clarin Catalog Service Provider</ServiceName>
+ <ServiceDescription xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</ServiceDescription>
+ <ServiceDescription xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</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"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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="de">e235</OrganizationName>
+ <OrganizationName xml:lang="en">e235</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <GivenName>Daan</GivenName>
+ <SurName>Broeder</SurName>
+ <EmailAddress>mailto:Daan.Broeder@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Tobias</GivenName>
+ <SurName>van Valkenhoef</SurName>
+ <EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Dieter</GivenName>
+ <SurName>Van Uytvanck</SurName>
+ <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.ebrary.com.xml b/swamid-interfederations-2.0/sp.ebrary.com.xml
new file mode 100644
index 00000000..798594fc
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.ebrary.com.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.ebrary.com/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-09-25T14:15:53Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol 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://sp.ebrary.com/Shibboleth.sso/DS/Edugate" index="1"/>
+ <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://sp.ebrary.com/Shibboleth.sso/DS" index="2"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">ebrary ebooks</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">ebrary ebooks</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Um Bibliotheken mit strategischen ebook Akquisition unterstützen, bietet eine Reihe von ebrary Pakete unter Abonnement und ewigen Archiv-Modelle, die von Hand durch unsere on-Bibliothekare ausgewählt sind. Diese abgepackte Produkte können miteinander kombiniert, sowie einzelne Titel unter Modelle wie Patron driven Erwerb und kurzfristige Darlehen für den größten Wert erworben werden.</mdui:Description>
+ <mdui:Description xml:lang="en">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>shibb01.ebrary.com</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=shibb01.ebrary.com</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAJ7CVX1opkHyMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTAeFw0xMjAzMDYxNTEzNDFaFw0yMjAzMDQx
+NTEzNDFaMB0xGzAZBgNVBAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALuIVAFYCaz6nqWxxN9tMxXk+aXzCN0eAyG0
+HIRrO2trVL6ypFzofTm8f2+G95PRXVxzx8E8+9XOo3EpOnU8g/kVP7qT7IrUtZXD
+Vzy2iGgdgwMWrttFC+lOGCwO+bbYUAwYoXtfBh0LkG0Q4gf0TLMg3j61C36ceKLV
+dIOqDdU07YPgRls4eOpYltJjcqa52mODEO+KFJ9FWc8dmVaBRVZgaGDsoZlXhsSo
+tDTHJirO+F14ODi9FL258jF2/lodHD1irsZEGQBQatJE3zJuJ9XfTD3lFGdWq+ZR
+WF/qIMYiTvQN69b1UV5zgoGBsn2S90nEtfA98BC4JirJ5qUzy9sCAwEAAaNAMD4w
+HQYDVR0RBBYwFIISc2hpYmIwMS5lYnJhcnkuY29tMB0GA1UdDgQWBBQayHM3e6AN
+AKKlRKtofjjdfLQdFDANBgkqhkiG9w0BAQUFAAOCAQEAixoxwjRIM1LyByB/9jm0
+UEQQsDIkIYByMdLGSKmhTWNbd6aKOP3We5br6uH544XL2HlsSRQ48QHJLRBtRwvR
+2drWZgfJfUQP6iGs2rZQUjCk7EWW/cVGc0DxJef2nbvwtibk2TVZfLpjrso9T32W
+C5fDoiy5vcwBBRPdhH7xJpgBSzx71lAiYjpUZqkt3URWaPYA3RWEnP5dlRZ1SuY6
+3Nob3XeM7KrmF+lL8P1x0wKpXJo9/mHT9AURPFdgyqkIeGpJRSuOXZrp9rMtBexk
+qXS98sBULfKabCh9PFamzMzeaerLQAKf3ZGcK0f47tLo2fp4GlFUTE9EyIn9sixR
+Dw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/Artifact" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/ECP" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="de">e65</OrganizationName>
+ <OrganizationName xml:lang="en">e65</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">ProQuest</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">ProQuest</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.proquest.com</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.proquest.com</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>jingwen</GivenName>
+ <SurName>wang</SurName>
+ <EmailAddress>mailto:jingwen@ebrary.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>rob</GivenName>
+ <SurName>wright</SurName>
+ <EmailAddress>mailto:rob@ebrary.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>jingwen</GivenName>
+ <SurName>wang</SurName>
+ <EmailAddress>mailto:jingwen@ebrary.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk.xml b/swamid-interfederations-2.0/sp.edina.ac.uk.xml
index 6093be4b..8430879b 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/kbplus">
- <!--
- This is a Shibboleth "Knowledge Base+" SP for EDINA at the University of Edinburgh.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-27T15:54:52Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
@@ -20,11 +17,6 @@
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/EDINASchools"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKFederation"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKall"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/Login"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/UKDA"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/EDINASchools"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKFederation"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKall"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Login"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/UKDA"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/EDINASchools"/>
@@ -63,16 +55,11 @@
</ds:KeyInfo>
</KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="2"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="3"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="2"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
@@ -81,10 +68,6 @@
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
@@ -95,18 +78,12 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="9"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="10"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="12"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="13"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="14"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="15"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="16"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2a.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="18"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="19"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="20"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="21"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="22"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="12"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="13"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="14"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="15"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="16"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
diff --git a/swamid-interfederations-2.0/sp.lat.csc.fi.xml b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
index 5bcd4bc3..009d2e7b 100644
--- a/swamid-interfederations-2.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
+<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.geant.net/uri/dataprotection-code-of-conduct/v1</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="en">LAT – Language Archive Tools</mdui:DisplayName>
<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>
@@ -16,13 +26,9 @@
<mdui:PrivacyStatementURL xml:lang="sv">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>
- <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>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -50,42 +56,42 @@ CiBkuiUynwqLsQKjfkcSZa5W9a8spV7y8LmCAEtDk8l03p45TKRvWIgMAexg/60h
TE5WJb+s+lUOs3IoVL33fpbG+Aor</ds:X509Certificate>
</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>
+ </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>
+ <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>
+ <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>mailto:ling@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Martin</GivenName>
+ <SurName>Matthiesen</SurName>
+ <EmailAddress>mailto:martin.matthiesen@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Tero</GivenName>
+ <SurName>Aalto</SurName>
+ <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index 62c8e7de..7f9a49b4 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,9 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.lux17.mpi.nl">
- <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:KeyDescriptor>
- <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lux17.mpi.nl">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-04-27T09:05:42Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</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.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol 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://lux17.mpi.nl/Shibboleth.sso/DS" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</mdui:Description>
+ <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</mdui:Description>
+ <mdui:Logo height="90" width="90">https://lux17.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>lux17.mpi.nl</ds:KeyName>
<ds:X509Data>
+ <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
<ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxMzQ4
@@ -29,37 +55,91 @@ LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
-0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==</ds:X509Certificate>
+0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">IMDI Browsable Corpus</md:ServiceName>
- <md:ServiceName xml:lang="en">IMDI Browsable Corpus</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Repository of Linguistic Resources. For Humanities and Social Sciences researchers.</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.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Tobias</md:GivenName>
- <md:SurName>van Valkenhoef</md:SurName>
- <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>lux17.mpi.nl</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
+ <ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxMzQ4
+MTBaFw0xNDAzMTcxMzQ4MTBaMHoxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
+dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0wTdnMTgPC8/x6+0reirYB
+bifyQwbOLHE0bOtHD6et5oT9WPRosJFpFxnxs2aF/SqR7Kar4Z/7lMBFbL3vdgrJ
+h6fCNVofBI/Zs7d8aCwfcc6aMJORJPlTtFElmNvZD8TE035qzRNfkwqPOYkmwqlC
+CP9pJwebt3kEJSHHOVngydBJaVzSDayJLp1WzQ2FyEVfbPyUaQ2z2RyPGG0C1yX4
+Thin64YaRlBH78INIlCf8NpQwc+CCG7SgVSuDq1DEZXbm7z789kUJtqnlNe2Nahj
+inYfMr4Jtc27TwD+We9cs14LjSst4L3gd0kT511Wycs53+BpMWRWVKD4tFMva+EC
+AwEAAaOCAX8wggF7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBRY3hAzheVZXJug0vL3ndQWl8CAjTAfBgNVHSME
+GDAWgBQC1h5uCau/WGWnCjxIM2HRzn3DWzB3BgNVHR8EcDBuMDWgM6Axhi9odHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOg
+MYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NybC9jYWNybC5j
+cmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPwYIKwYBBQUH
+MAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbTiXJjoL5ulDq6yP3g2cBE4tpXN/
+LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
+3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
+A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
+7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
+0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</ServiceName>
+ <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</ServiceName>
+ <ServiceDescription xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</ServiceDescription>
+ <ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</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"/>
+ <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <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="false"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="de">e235</OrganizationName>
+ <OrganizationName xml:lang="en">e235</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Tobias</GivenName>
+ <SurName>van Valkenhoef</SurName>
+ <EmailAddress>mailto:Tobias.vanValkenhoef@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Dieter</GivenName>
+ <SurName>Van Uytvanck</SurName>
+ <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Dieter</GivenName>
+ <SurName>Van Uytvanck</SurName>
+ <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.utu.fi.xml b/swamid-interfederations-2.0/sso.utu.fi.xml
index 7802e846..5b0e1c1b 100644
--- a/swamid-interfederations-2.0/sso.utu.fi.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi.xml
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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://sso.utu.fi/sso-idp">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
- <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.utu.fi/sso-idp">
+ <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>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utu.fi</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
</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>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
@@ -56,30 +57,30 @@ njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
8MIAfW66Oc6zKMOf26tiwK0/jhtn</ds:X509Certificate>
</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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Abo universitet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Abo universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Petri</md:GivenName>
- <md:SurName>Teraspuro</md:SurName>
- <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Elina</md:GivenName>
- <md:SurName>Toivanen</md:SurName>
- <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </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>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="fi">Turun yliopisto</OrganizationName>
+ <OrganizationName xml:lang="en">University of Turku</OrganizationName>
+ <OrganizationName xml:lang="sv">Abo universitet</OrganizationName>
+ <OrganizationDisplayName xml:lang="fi">Turun yliopisto</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">University of Turku</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Abo universitet</OrganizationDisplayName>
+ <OrganizationURL xml:lang="fi">http://www.utu.fi/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.utu.fi/</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.utu.fi/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Petri</GivenName>
+ <SurName>Teraspuro</SurName>
+ <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Elina</GivenName>
+ <SurName>Toivanen</SurName>
+ <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swamid.user.uu.se.xml b/swamid-interfederations-2.0/swamid.user.uu.se.xml
index 2b484779..3b4257a9 100644
--- a/swamid-interfederations-2.0/swamid.user.uu.se.xml
+++ b/swamid-interfederations-2.0/swamid.user.uu.se.xml
@@ -1,13 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://swamid.user.uu.se/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid.user.uu.se/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Uppsala Universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
+ <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://cas.user.uu.se/cas/om.html</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://cas.user.uu.se/cas/about.html</mdui:InformationURL>
+ <mdui:Logo height="125" width="125">https://cas.user.uu.se/cas/uu_img/125_uu_logo_white.gif</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>uu.se</mdui:DomainHint>
+ <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
+ <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
+ <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
+ <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
+ <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
+ <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
+ <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -24,27 +52,56 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==</ds:X509Certificate>
+2DlT+A==
+
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+ <ds:X509Certificate>
+MIIDLzCCAhegAwIBAgIUNUPiQemS9gt9uEtcjg7LzGzpAE0wDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2UwHhcNMTMxMDAzMTQ1NzM4
+WhcNMzMxMDAzMTQ1NzM4WjAcMRowGAYDVQQDExFzd2FtaWQudXNlci51dS5zZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSNBRhfSDpWel0cB5BhM3mH
+C3sFFXbGKWWhPxloLtDEGjc3vK14FLXjy0oft0QbELIevGeJkMaFQGU73iCjdkjo
+5isUccGwJEIV/q/DpxlMs+CeROFPRIQhn+IfxA9/xFvH5roc1XY+Vpuo7fuKJJ+r
+Wwm0Vf4jBMGdtvaLZp85Pkd1x0scXapFZub9Dv/jrPpsoz7IK4olQvudfcew0k4v
+8H1eNV0bNiGmJ4c5AELhNdtmLdYgdzz2sxpkxwSQpGoFoB7oaz2n0efhrWYjPGnH
+j7MpH4UCWoF9MGROV9sjee2tIrUdd08a//kx5TlMnPQVB2+lf1g1/PfGfA575nEC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRc3dhbWlkLnVzZXIudXUuc2WGKGh0dHBzOi8v
+c3dhbWlkLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEmxaqhH
+E6O+XLfObHbNKAQfzSnLMA0GCSqGSIb3DQEBBQUAA4IBAQCn1xxkIwx4Tz1R0jSA
+482BHLA3Z/Hny61+4Pe3kYrudzGyCRbgplPc8JkpnsaC4nvcEOVDeywz1sbVRcGj
+0i93GY3OqYrFWfyipP9dWIww4FgLbgmhA+XZ34/np4uRbDdIYbUZ8Ts/5a0DcsSw
+z7cBR8v69ISF+1qKoNjeFdNTrLIAzc0cDQMcgWObmZRTPVd2nby9/NcJ3P1WCFf/
+IAZ52kMSTkRjnek7DL7XM7m1PCi/dsyVPJTLdVOqpIXov787qV4o2MC28Ff3ttsj
+bFbyDFjmEF99CIb4dJ+HEYnxIWJzX+zzZoHkzpS4qDTM3nrq6GKak/Qoagyyn+z6
+GP8s
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -61,23 +118,52 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==</ds:X509Certificate>
+2DlT+A==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLzCCAhegAwIBAgIUNUPiQemS9gt9uEtcjg7LzGzpAE0wDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2UwHhcNMTMxMDAzMTQ1NzM4
+WhcNMzMxMDAzMTQ1NzM4WjAcMRowGAYDVQQDExFzd2FtaWQudXNlci51dS5zZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSNBRhfSDpWel0cB5BhM3mH
+C3sFFXbGKWWhPxloLtDEGjc3vK14FLXjy0oft0QbELIevGeJkMaFQGU73iCjdkjo
+5isUccGwJEIV/q/DpxlMs+CeROFPRIQhn+IfxA9/xFvH5roc1XY+Vpuo7fuKJJ+r
+Wwm0Vf4jBMGdtvaLZp85Pkd1x0scXapFZub9Dv/jrPpsoz7IK4olQvudfcew0k4v
+8H1eNV0bNiGmJ4c5AELhNdtmLdYgdzz2sxpkxwSQpGoFoB7oaz2n0efhrWYjPGnH
+j7MpH4UCWoF9MGROV9sjee2tIrUdd08a//kx5TlMnPQVB2+lf1g1/PfGfA575nEC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRc3dhbWlkLnVzZXIudXUuc2WGKGh0dHBzOi8v
+c3dhbWlkLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEmxaqhH
+E6O+XLfObHbNKAQfzSnLMA0GCSqGSIb3DQEBBQUAA4IBAQCn1xxkIwx4Tz1R0jSA
+482BHLA3Z/Hny61+4Pe3kYrudzGyCRbgplPc8JkpnsaC4nvcEOVDeywz1sbVRcGj
+0i93GY3OqYrFWfyipP9dWIww4FgLbgmhA+XZ34/np4uRbDdIYbUZ8Ts/5a0DcsSw
+z7cBR8v69ISF+1qKoNjeFdNTrLIAzc0cDQMcgWObmZRTPVd2nby9/NcJ3P1WCFf/
+IAZ52kMSTkRjnek7DL7XM7m1PCi/dsyVPJTLdVOqpIXov787qV4o2MC28Ff3ttsj
+bFbyDFjmEF99CIb4dJ+HEYnxIWJzX+zzZoHkzpS4qDTM3nrq6GKak/Qoagyyn+z6
+GP8s
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Uppsala universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:Company>Uppsala universitet</md:Company>
- <md:SurName>AKKA SAML2</md:SurName>
- <md:EmailAddress>akka-datordrift@its.uu.se</md:EmailAddress>
- </md:ContactPerson>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">UU</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Uppsala Universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <Company>Uppsala universitet</Company>
+ <SurName>AKKA SAML2</SurName>
+ <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+ </ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml b/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
index 7a5e0dda..f0ef7722 100644
--- a/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
+++ b/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
<Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-05-03T16:37:26Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
@@ -7,26 +7,19 @@
</Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEdzCCA1+gAwIBAgIRALU7cnfbLc1oJeZ3jRMsuAswDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDAxMjIwMDAwMDBaFw0xMzAxMjEyMzU5NTlaMEUxCzAJBgNVBAYTAk5MMQ8wDQYDVQQKEwZURVJFTkExJTAjBgNVBAMTHHRjcy1lc2NpZW5jZS1zYW1sLnRlcmVuYS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSe/BpU3VSa/KtSlrHIzeARGMIGg0M6ZH5eYNHSfyNV4YEYrdUhWNUHLujB4KWiCQnqZMHax3g1yiY/7f0sFzng7sMKsGECMx1RXhrBtH15IabwPQHtO25+kpUKsaeprJXh1PneKBmZ61DnDlcsJw5AGjDFL3p1iuNn/6AXMn9GibhZbe2b2gSb+e/89i9NhEpEJQgR90dzRre+xrAQjV3ahrGGs9AV4ENVP9uaH5i/h3MZG7QRZTnxSn57UTEiSWd/6LILH5IcfvhEkPPDmlXQtF9VhGXKYZBY83f0Lo8TUVtcZVxK1YU7Sb1/OY2EsKENB5dmjtZRe6rp3RgWGDrAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIcdGNzLWVzY2llbmNlLXNhbWwudGVyZW5hLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEApwOOAu4LUJgYdO2/sgtszmDD7aePHEgWZ7aTYKj7qVXM33TOJmqvNE2DvPmccuPt5lRHUXt1Zac4HAHaK/r6LTQRf9O9z8+T/pjqbiZD8FfZkYaCBHGU4uPXakyEgyAzUmPh5zQOIxbdoKEd9NsRmomDaZLnMn0Vc+dDxexVlDpnGzK7Du68qIS9EyzyiEHYRF6lsnwuwTAN+XYf+c8lS64H82Z3tBuFknMiI1AjV6hbJzvv3D/YBrDGehrumCtg0aKi5EFIgXg4lGj3lV4Q1Y/p0FiuosTZpIyIjTLzJ05Hvp3If6mXlxXGAWXuHYx22FwQ7v8cOCkTfmGwheeKjg==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org.xml
index 7b64359e..430368fb 100644
--- a/swamid-interfederations-2.0/terena.org.xml
+++ b/swamid-interfederations-2.0/terena.org.xml
@@ -1,32 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <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 Service Provider Proxy</mdui:DisplayName>
+ <mdui:Description xml:lang="en">A service provider proxy for all TERENA federated services</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="94" width="350">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
<md:KeyDescriptor use="signing">
- <ds:KeyInfo>
+ <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>
+ <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: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: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: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:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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" isRequired="true"/>
+ <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"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" 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: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">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>
diff --git a/swamid-interfederations-2.0/test-adfs.geant.net.xml b/swamid-interfederations-2.0/test-adfs.geant.net.xml
new file mode 100644
index 00000000..6ca45221
--- /dev/null
+++ b/swamid-interfederations-2.0/test-adfs.geant.net.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://test-adfs.geant.net/adfs/services/trust" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">GÉANT Intranet Test Instance</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Provides access to GÉANT project documents and internas. Test instance.</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIEcjCCA1qgAwIBAgIHFoCBhVY+iTANBgkqhkiG9w0BAQsFADA3MQswCQYDVQQG
+EwJERTEPMA0GA1UEChMGZWR1UEtJMRcwFQYDVQQDEw5lZHVQS0kgVGVzdCBDQTAe
+Fw0xMzEwMTgwOTQ4MzdaFw0xODEwMTcwOTQ4MzdaMG0xCzAJBgNVBAYTAkRFMTEw
+LwYDVQQKEyhUaGlzIGlzIGEgVGVzdCBhbmQgRGVtbyBDZXJ0aWZpY2F0ZSBvbmx5
+MQ0wCwYDVQQLEwRUZXN0MRwwGgYDVQQDExN0ZXN0LWFkZnMuZ2VhbnQubmV0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ZgGj3cbCZgNNTCY0P2g8jov
+74KFsNXtaPPM0vNT+RlmdfmqLVNFkCz90HHx+1ZFF98YYF3kNqvtipEYhv8AplU+
+j/UR9I6rPTEvHtM2BFrCv3fvsvLitkcYQVi4NDjI8Qzv4ugVGzfeC3vlPPOwNdsA
+wLsKrIKG5QbnDkgaJMuIKorsUD0QBOb/bema0x77jXWyo7Zsrz3EWE6x9VreBLde
+4bzWdvig79oYBCvYbzckS77qweOY4oDB2oxF96wf0UlyC26u40cyGBkWuwke3DX+
+mypM86il05F5gxbMq0iOt1e+rv4ewqzyLdCEEyrG1Iez9qYIZTqiKoCKCZNlcQID
+AQABo4IBSzCCAUcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRsZ/2CP8ljz4lbwswK7TlU+wvn
+uTAfBgNVHSMEGDAWgBSod7exoyNlktqfxGUUmz5e7PjKIDAtBgNVHREEJjAkghN0
+ZXN0LWFkZnMuZ2VhbnQubmV0gQ1zeXNAZ2VhbnQubmV0MEcGA1UdHwRAMD4wPKA6
+oDiGNmh0dHA6Ly9jZHAuZWR1cGtpLm9yZy9lZHVwa2ktdGVzdC1jYS9wdWIvY3Js
+L2NhY3JsLmNybDBWBggrBgEFBQcBAQRKMEgwRgYIKwYBBQUHMAKGOmh0dHA6Ly9j
+ZHAuZWR1cGtpLm9yZy9lZHVwa2ktdGVzdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwDQYJKoZIhvcNAQELBQADggEBAEgQ/IltN/cqHX76ne//6A3sHGdPmc37aIwF
+8x+9d7XrKMp/OPuU7B+rrIAw0NTh8lI6jtjksSJ+ONnTvMmNChpbyGt/MoCpzN96
+43SCBG69g9p65YQRbsjbk+F29ddyxbNMGMRRHmU3y/5PuaKT/kxwhI2qdG8jYos7
+OVRy4URr0xxsk41aMJbyW8G9g8TmHMUwY+SwfvYXziQ4Jf67MMMf4a8c2ywZJXTz
+8Yu/S/of6N7uF5SXxIAsTqBWPsFm5Fs9MbAjqH5+itfgPbvh2OsigzD5yODRBfDV
++i8UK1ae+ilwPcADJEuc04gZiy3dz1a4rhRmDg+bleNBtH2J/JQ=
+ </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>
+ <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-adfs.geant.net/adfs/ls/" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-adfs.geant.net/adfs/ls/" index="2"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">GÉANT Intranet Test Instance</ServiceName>
+ <ServiceDescription xml:lang="en">Provides access to GÉANT project documents and internas.</ServiceDescription>
+ <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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" isRequired="true"/>
+ <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" 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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">geant.net</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">GÉANT</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ <GivenName>eduGAIN</GivenName>
+ <SurName>Integration</SurName>
+ <EmailAddress>mailto:edugain-integration@geant.net</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <GivenName>eduGAIN</GivenName>
+ <SurName>Operation</SurName>
+ <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
+ </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.federation.renater.fr.xml b/swamid-interfederations-2.0/test.federation.renater.fr.xml
new file mode 100644
index 00000000..3efd3959
--- /dev/null
+++ b/swamid-interfederations-2.0/test.federation.renater.fr.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.federation.renater.fr/validation/ressource">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-09T15:20:50Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">RENATER - ressource de validation de la fédération Education-Recherche</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Fédération Éducation-Recherche - Ressource de validation</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
+Il faut configurer manuellement les filtres d'attributs pour cette ressource.</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
+MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLeEy6JlbrAPEwxBrnvwcx2fN5WtZ9Eq
+lZHBgQFocnfxEtHpf7KGSll+LNu3AgqF10Ymljoa1+Gn6E2SbsmKFmXzOs31aB5t
+eu79nAGci1abkuius628KO33o4Cjc3rJ/M7Rk7Px4t9kH7R01bXn3z3UGTvmPNyo
+mfa8LAX8epaD4haoar3ymF0hFHFB57d2HzWC/2HW/OT0Y5CO7T+dJd3TxI/soiK1
+pdw75LYAOdW6MT+ozrw3vY53B4um7jBZK2OhsrKIjrG2e4s0CzWFPs7jCUGnuvaY
+21nAd/kR666LjvmJcoVq/vErOSKksvMS9SxiuKpxjQNkj9lB9klqvQIDAQABo0Ew
+PzAeBgNVHREEFzAVghNmZWR0b29scy5yZW5hdGVyLmZyMB0GA1UdDgQWBBSglPv7
+4KwzHQSzBtZphKPBskiQ5TANBgkqhkiG9w0BAQUFAAOCAQEArYVUgbOsV3U+/Xb/
+NPPYIYdej09vWmdwOQjCjJc/DHiEkDPHQ4R/zbTEXPcW+t0CpYET2t/5MskmKNU7
+vgkZLdw9GrRbXuJarzZZ1ZSdMDNKvMjgujOJfcgQ6KnbSi/KLniU7hagAsvzQkYQ
+CXZqh5Jo6zGSJZIPTx3EpRuT82WFoFpcoccWeTSsda/A5nTQnq/1SpwBnfGz+xtE
+alqV781u8dMtyty6cbwPSg3sYisSoXQRdl+4b7U3vGXQvbHM6PNEAljhkeX0+1Tk
+aCoF678JhADPvQCtWTWZsbIFhV7bOsG+8UFqdH6z+yPMWUCPx6WbbTkkusi23Tbe
+PbS4vQ==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
+MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLeEy6JlbrAPEwxBrnvwcx2fN5WtZ9Eq
+lZHBgQFocnfxEtHpf7KGSll+LNu3AgqF10Ymljoa1+Gn6E2SbsmKFmXzOs31aB5t
+eu79nAGci1abkuius628KO33o4Cjc3rJ/M7Rk7Px4t9kH7R01bXn3z3UGTvmPNyo
+mfa8LAX8epaD4haoar3ymF0hFHFB57d2HzWC/2HW/OT0Y5CO7T+dJd3TxI/soiK1
+pdw75LYAOdW6MT+ozrw3vY53B4um7jBZK2OhsrKIjrG2e4s0CzWFPs7jCUGnuvaY
+21nAd/kR666LjvmJcoVq/vErOSKksvMS9SxiuKpxjQNkj9lB9klqvQIDAQABo0Ew
+PzAeBgNVHREEFzAVghNmZWR0b29scy5yZW5hdGVyLmZyMB0GA1UdDgQWBBSglPv7
+4KwzHQSzBtZphKPBskiQ5TANBgkqhkiG9w0BAQUFAAOCAQEArYVUgbOsV3U+/Xb/
+NPPYIYdej09vWmdwOQjCjJc/DHiEkDPHQ4R/zbTEXPcW+t0CpYET2t/5MskmKNU7
+vgkZLdw9GrRbXuJarzZZ1ZSdMDNKvMjgujOJfcgQ6KnbSi/KLniU7hagAsvzQkYQ
+CXZqh5Jo6zGSJZIPTx3EpRuT82WFoFpcoccWeTSsda/A5nTQnq/1SpwBnfGz+xtE
+alqV781u8dMtyty6cbwPSg3sYisSoXQRdl+4b7U3vGXQvbHM6PNEAljhkeX0+1Tk
+aCoF678JhADPvQCtWTWZsbIFhV7bOsG+8UFqdH6z+yPMWUCPx6WbbTkkusi23Tbe
+PbS4vQ==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML/POST" index="5"/>
+ <AttributeConsumingService index="0">
+ <ServiceName xml:lang="fr">Fédération Éducation-Recherche - Ressource de validation</ServiceName>
+ <ServiceName xml:lang="en">RENATER - ressource de validation de la fédération Education-Recherche</ServiceName>
+ <ServiceDescription xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
+Il faut configurer manuellement les filtres d'attributs pour cette ressource.</ServiceDescription>
+ <ServiceDescription xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</ServiceDescription>
+ <RequestedAttribute FriendlyName="supannAutreMail" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.34" 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="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannEtuEtape" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.29" 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="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannEtuId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannEtuRegimeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.31" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannMailPerso" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.15" 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="supannAutreTelephone" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.12" 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="commonName" Name="urn:oid:2.5.4.3" 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="supannEtuDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.27" 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="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="supannEmpId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="mailForwardingAddress" Name="urn:oid:2.16.840.1.113730.3.1.17" 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="supannEtuElementPedagogique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.28" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannRole" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannRoleEntite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannCivilite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.4" 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="email" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="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="supannActivite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannCodeINE" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.5" 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="surname" Name="urn:oid:2.5.4.4" 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="title" Name="urn:oid:2.5.4.12" 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="eduPersonNickname" 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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannEtuAnneeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.25" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannEntiteAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannEtuSecteurDisciplinaire" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.32" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannEntiteAffectationPrincipale" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannListeRouge" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannEtuCursusAnnee" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannEtablissement" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannRoleGenerique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannEtuInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.30" 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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" 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="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="supannEtuTypeDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.33" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" 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"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">RENATER</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <EmailAddress>support-federation@support.renater.fr</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
index f2627d6f..3acfb604 100644
--- a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
+++ b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ukfederation.org.uk/entity">
- <!--
- This is a UK federation Shibboleth 2 test SP.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T11:19:55Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
index 8d1fdc15..4301e427 100644
--- a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.leeds1.emeraldinsight.com/entity">
- <!--
- This is an 'Emerald UAT Site' Shibboleth SP for Emerald Group Publishing Ltd.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-06T16:03:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index b8a0696b..a3b0c536 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,173 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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: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: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">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">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">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">handelsskolen.com</shibmd:Scope>
- <shibmd:Scope regexp="false">cphbusiness.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">kea.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">eadania.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>
@@ -194,4 +32,9 @@
<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 14fee192..5fa87a74 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,19 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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://weblicht.sfs.uni-tuebingen.de">
- <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://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">weblicht</mdui:DisplayName>
- </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>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-06-11T09:42:51Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</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.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
</saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">WebLicht</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">WebLicht</mdui:DisplayName>
+ <mdui:Description xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+ <mdui:Description xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+ <mdui:InformationURL xml:lang="de">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>emailAddress=eh@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=WebLicht,OU=DSPIN,OU=Seminar fuer Sprachwissenschaft,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMTAwNDE5MTMyNjA3WhcNMTUwNDE4MTMyNjA3WjCByzEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xKDAm
+BgNVBAsTH1NlbWluYXIgZnVlciBTcHJhY2h3aXNzZW5zY2hhZnQxDjAMBgNVBAsT
+BURTUElOMREwDwYDVQQLEwhXZWJMaWNodDEmMCQGA1UEAxMdd2VibGljaHQuc2Zz
+LnVuaS10dWViaW5nZW4uZGUxJjAkBgkqhkiG9w0BCQEWF2VoQHNmcy51bmktdHVl
+YmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJJ+lISL
+liCGHMdtC5EKdkSPkZIEfGf6u0I2YT+u/bX37XL4yOvmMxJxRLQM4oEvnE67n8k8
+4qe06B8xErFh3KqgC5Q5keUlQmXJu4wvABnk9AuxlwJKuGXI3PetBYfhid10A7Iu
+3Ki0s3j7+7yYTG6xXJt4qrE7rV/v79zBQcoKOwu1AMdfV9q8GRShEXCQ82P4IITT
+Q4z513p1e0mscDdBIunH6aThNCJA9rUBwEVX90HX5KHaOPSksHISylhjl/++XJFy
+/0wBpiZ4+7pN2S/go9J8A153NZSPhF2M5deyWgjT/K2LSudLnegIlRFTq1Kv89eE
+bF/ZaHuNvakbqQIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRmWkIAb3Vr
+zkTtELxvwSx4nngcUDAfBgNVHSMEGDAWgBSwwbtoNX/i1kGcGnGv4PxBNM3DqDAi
+BgNVHREEGzAZgRdlaEBzZnMudW5pLXR1ZWJpbmdlbi5kZTCBkwYDVR0fBIGLMIGI
+MEKgQKA+hjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVlLWNh
+L3B1Yi9jcmwvZ19jYWNybC5jcmwwQqBAoD6GPGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBrAYIKwYB
+BQUHAQEEgZ8wgZwwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+Y2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYB
+BQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2Ev
+cHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGxJyokA
+uUwUFzvszzutQNicSlWWHmrB6g63cRkbgBMsNGFwIyhrizCJtPYTDAbJ1lG2PrYj
+YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
++Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
+kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
+NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
+wN2yHSwHNNMiiGY=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
<ds:X509Data>
+ <ds:X509SubjectName>emailAddress=eh@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=WebLicht,OU=DSPIN,OU=Seminar fuer Sprachwissenschaft,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
@@ -44,41 +98,38 @@ YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
+Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
-wN2yHSwHNNMiiGY=</ds:X509Certificate>
+wN2yHSwHNNMiiGY=
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <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://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">WebLicht</md:ServiceName>
- <md:ServiceName xml:lang="en">WebLicht</md:ServiceName>
- <md:ServiceName xml:lang="sv">WebLicht</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Web-based linguistic chaining tool.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Web-based linguistic chaining tool.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="sv">Web-based linguistic chaining tool.</md:ServiceDescription>
- <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:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Thomas</md:GivenName>
- <md:SurName>Zastrow</md:SurName>
- <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>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="de">WebLicht</ServiceName>
+ <ServiceName xml:lang="en">WebLicht</ServiceName>
+ <ServiceDescription xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</ServiceDescription>
+ <ServiceDescription xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</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"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="de">e60</OrganizationName>
+ <OrganizationName xml:lang="en">e60</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Universität Tübingen</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">University of Tuebingen</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.uni-tuebingen.de/en/landingpage.html</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Thomas</GivenName>
+ <SurName>Zastrow</SurName>
+ <EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Department of Linguistics, General and Computational Linguistics</GivenName>
+ <SurName>Support</SurName>
+ <EmailAddress>mailto:webapplications@sfs.uni-tuebingen.de</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.shibboleth.net.xml b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
index b25c5caf..5785126d 100644
--- a/swamid-interfederations-2.0/wiki.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.shibboleth.net/shibboleth">
- <!--
- This is a Shibboleth.net Wiki Shibboleth SP for JISC Collections and Janet Limited.
- -->
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -16,6 +12,9 @@
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:23:40Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
@@ -25,7 +24,7 @@
<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://wiki.shibboleth.net/confluence/Shibboleth.sso/Login" index="2"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
- <mdui:Description xml:lang="en"> The wiki hosting the documentation for Shibboleth.
+ <mdui:Description xml:lang="en">The wiki hosting the documentation for Shibboleth.
Unauthenticated users may view the existing documentation. Authenticated users
may create new documentation pages and edit existing ones.
</mdui:Description>
@@ -36,10 +35,10 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDQjCCAiqgAwIBAgIJAKMO1kGnu43yMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
+ MIIDQjCCAiqgAwIBAgIJAMI1r/DZzTEJMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
- VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTExMDEwNzE4NDIzN1oXDTE0MDEw
- NjE4NDIzN1owTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
+ VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTEzMTEyNTE0NTcyOFoXDTM3MDMw
+ NDE0NTcyOFowTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G
CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n
r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s
@@ -48,12 +47,12 @@
KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF
m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj
ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF
- AAOCAQEAEv6zwotAweOLEfibTXm5d6odE2o/+rHdeEW+IEAspAvmCK7nAPFkuV47
- WMn7JmOd7BWnoXmqFwefJFf3mZtadHnCXReSd8ehGA8/KerSxz9yClMaoanRTEb3
- chT+n5Oh2+WgjzR/v5RbChihoOES+Z2mcvbDm9wn3uSBdxbAoG0/YZihaY9LeoNW
- /CVXv0HYfDw5csol6zwz6dgUDXpfXSXLLKnrjVwARM6lVh00i5i2nfmrWnI41bRh
- NtrvvBkq2tvnd6wm1DJNDzZQB/nRpCadwp4a64Qa0XJiGCoxFUvkd1+RSHqbBsEF
- 6w3nDMcYq/BKnF30KZ0Q274eVyQolg==
+ AAOCAQEADCGhWJ+oZ8ltcjJ7D66rMg1HOZT6GFCVeZ7MfhY/KFrvsnITNbTA+SgZ
+ tCJt/BLlZXxpzmix19bD9bNwqEMo7WSqBy77X7SS97ZXti6y6vwAz8h78vzQopOd
+ rnn8XXyWxtrtRRCK4RMpZGrVm3sfBPW68j9hiPHZqewE4nLavjCki/I9rCMe5dJE
+ 3+ZRf4Ip/9hYqM+a5Chcvbo2zJEOtw+EUQqNTZ51j33H/2qF9UoSpt74UFh+Jd5y
+ L2GoFSt/gCld78j/7cU3ObGQEme+hVVZ8/uGa/cCYvFt75vNBdnlj4icZ6fgFe9R
+ 9h5hlBTGD3PULSFmCdkgxtwIyd855Q==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com.xml b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
index 912d6501..9182934b 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
@@ -1,32 +1,152 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/entity">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/entity">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-28T12:31:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation"/>
+ <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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" index="1"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2"/>
+ <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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" index="2"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
+ <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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" index="3"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/UKFederation"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
+ <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://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" index="4"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
+ <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://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" index="5"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
+ <ds:X509Certificate>
+ MIIDUTCCAjmgAwIBAgIJANuHp/m5TCXsMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
+ BAMTIWVtLWwxLXJoLXN2cjAxLmVtZXJhbGRpbnNpZ2h0LmNvbTAeFw0xMTA4MTEw
+ ODM1MTJaFw0yMTA4MDgwODM1MTJaMCwxKjAoBgNVBAMTIWVtLWwxLXJoLXN2cjAx
+ LmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ ggEBAL7nJHjWMmZxHtjdwAYdXKCZwObQn8nDKWS71kULyYRgcxkVxULE+Q8sazuA
+ 0bsX3Q4PQUeP6C+xuyBXzHi9XZy6Ef4hoIHo6p9qI7EboB7Qu1MebGROWca0Dtd9
+ zyadDe4y61J8BlE5euVCvbpGkHSSuFVvz0ThhTdC61vAPzvl71R5sqWxUm8xIPDT
+ 0TryzRgOA0LsOH3tXsaxQ5Jb5d6G+X6+6K2flFCY8QKbrnxcMKXvTbPpMprTIa1N
+ bUT+XFONWmplOvyjHQH1GdIDQCPKc4aT3WyIA3MxnWfzpPsP8Sdi7Z+QyhXGEgOP
+ obM+cagbqe/E/Om1gUgI3a6F/z0CAwEAAaN2MHQwUwYDVR0RBEwwSoIhZW0tbDEt
+ cmgtc3ZyMDEuZW1lcmFsZGluc2lnaHQuY29thiVodHRwczovL3d3dy5lbWVyYWxk
+ aW5zaWdodC5jb20vZW50aXR5MB0GA1UdDgQWBBT8iPZbLVpj12PDMabI7c5IEAQ0
+ +zANBgkqhkiG9w0BAQUFAAOCAQEAVMg4wyJ1FHeFYIuJ/zBzqPgZRD/dRQ/P64Bg
+ lkM/XKtTEkDL5nizTdMcm5qUB8sSLUpZIyuPUSy8AmYZ+FgvU6SqjW1WIhRzlnYG
+ yl3bKyl0Ji8r7We5lAhLgLnr1FTo3r9ROVd+S/BC3J7CZVE8Jcqo6AS66gTtGBja
+ xwoQYnowMJKcoCFqPkRlPL25ystxifcSpgaaRnVJMik/JHO2IwLLti+WAUj6kwCM
+ uCbrLPgzpR6W8YOkDzUH3rvANVZ5GKgqWNA/u8NfC6WRcA1Sktx2nLnK8Mw3d14g
+ MvgwMr/rwl/SPLLZ0KDGqJ8iSYjIZQKsJ/JXP9xmaeEQW6v35w==
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">EmeraldInsight</md:ServiceName>
- <md:ServiceName xml:lang="da">EmeraldInsight</md:ServiceName>
- <md:ServiceDescription xml:lang="en">provide personalized access to journals and papers on social sciences</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">give adgang til EmeraldInsights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Emerald Live Site</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.emeraldinsight.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Rob</GivenName>
+ <SurName>Wood</SurName>
+ <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Laurence</GivenName>
+ <SurName>Parkin</SurName>
+ <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.knodium.com.xml b/swamid-interfederations-2.0/www.knodium.com.xml
new file mode 100644
index 00000000..09b5958c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.knodium.com.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.knodium.com/Shibboleth.sso/Metadata">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-11T08:57:13Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.knodium.com/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.knodium.com/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Knodium</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Knodium is an online platform for collaboration.</mdui:Description>
+ <mdui:Logo height="158" width="350">https://www.knodium.com/images/logo-shib.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC9DCCAdygAwIBAgIJAMLknMjt03SjMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+ BAMTD3d3dy5rbm9kaXVtLmNvbTAeFw0xMjA5MTAxNTI2NTZaFw0yMjA5MDgxNTI2
+ NTZaMBoxGDAWBgNVBAMTD3d3dy5rbm9kaXVtLmNvbTCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBAMS5B0GMXiaYkvtJDFNsrRNMfFF5WZOTdOdFh4VK2G1C
+ c4Jo+WInPbjfB+l3gNji634Qc06ke0A74GyRTf19pIcKpmB6pyEtjt/0vgInT3Ax
+ ZI38HVgCk1WHwpg5LLzRI4FkzpIIX/SfB7KYB6WDA0AXbE8id2KXaxuCNrGYvoU6
+ orz7Gt+FERDUooNli1Z97ZQ6o6MogAeHizRTpWhWVqIVLKxvAZ42+OXw2OwGzOeL
+ OkefcJ5l/AwJbmEM+19yqdSB4e6VqF+ApsR/NbJaE5kz7GhvitK0FWkrP31bVj5t
+ 0pFmyFwYRohge0FFw0wX/vojPZqqBjOM5HafUmDB4PUCAwEAAaM9MDswGgYDVR0R
+ BBMwEYIPd3d3Lmtub2RpdW0uY29tMB0GA1UdDgQWBBQysHs0AHbWoM4U7GlNVirq
+ 6w1N4DANBgkqhkiG9w0BAQUFAAOCAQEAY9843vk3HlJssWlGnq5djjjzOeMZ6qPa
+ GXNZBZGi9LI3P4xAkW0fCnUygcb5MZaHdB+RuINEdXj+npITszfLtnj2m4BCq2IN
+ evmRUQRc7F27b9aoUuhYl0q6/Z9MFOjdjzQb6LT1duCDPq83kFp0gS57fqQP97F0
+ 8Hbzw5ZdLWALzsDuxU9FGRU5gdZNDmXkzymluKMZRchLuJrJhsRDPb34xmcH7RKF
+ Msv4N8MBOk9nESf3jQTPgkCvZee2t6h9xijoRP+IH5VD3hfq+H3lNKX7w7DkRqlR
+ dB55/ggB6okN6t5L8d+FUbKU3qI8VQmR8V4/NJ/F0EFmLzEklMUxsw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.knodium.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.knodium.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.knodium.com/Shibboleth.sso/SAML/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.knodium.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Knodium Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Knodium</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://www.knodium.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Web Support</GivenName>
+ <EmailAddress>mailto:webmaster@knodium.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Web Support</GivenName>
+ <EmailAddress>mailto:webmaster@knodium.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.videotorium.hu.xml b/swamid-interfederations-2.0/www.videotorium.hu.xml
index fc5fb219..b796c735 100644
--- a/swamid-interfederations-2.0/www.videotorium.hu.xml
+++ b/swamid-interfederations-2.0/www.videotorium.hu.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.videotorium.hu/shibboleth">
<Extensions>
+ <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
<ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
<ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
@@ -8,8 +9,9 @@
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <mdui:InformationURL xml:lang="hu">http://www.videotorium.hu</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="hu">http://www.niif.hu/</mdui:PrivacyStatementURL>
+ <mdui:Logo height="86" width="100">https://metadata.eduid.hu/logos/videotorium.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="hu">http://videotorium.hu</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="hu">http://videotorium.hu/hu/contents/userstos</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
@@ -20,23 +22,23 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="5"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST" index="6"/>
<AttributeConsumingService index="1" isDefault="true">
<ServiceName xml:lang="hu">Videotorium</ServiceName>
- <ServiceName xml:lang="en">VideoPortal</ServiceName>
- <ServiceDescription xml:lang="hu">Videotorium videóportál </ServiceDescription>
- <ServiceDescription xml:lang="en">VideoPortal</ServiceDescription>
+ <ServiceName xml:lang="en">Videotorium</ServiceName>
+ <ServiceDescription xml:lang="hu">A Videotorium a felsőoktatás és kutatás szereplői számára létrehozott videó/audió megosztó portál, amely helyet és professzionális megjelenési formát biztosít a felsőoktatási intézményekben, kutatóintézetekben és közgyűjteményekben készített videó-tartalom számára. </ServiceDescription>
+ <ServiceDescription xml:lang="en">Videotorium is a video/audio sharing portal created for the players of research and education. Videotorium provides professional presentation of video content recorded at higher-education organisations, research institutions and public collections.</ServiceDescription>
<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="surname" Name="urn:oid:2.5.4.4" 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"/>