summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2013-05-30 23:10:25 +0200
committerLeif Johansson <leifj@sunet.se>2013-05-30 23:10:25 +0200
commit48c9d38649ccc3832bef23bf1c7be6d34bc28417 (patch)
tree554b6fa31a1b4998ce62025ce53b43d2fb71d0e8
parentcc47377a225df779948ff97317548a0962dde940 (diff)
http://mds.edugain.org into swamid-interfederations-2.0
-rw-r--r--swamid-interfederations-2.0.mxml29
-rw-r--r--swamid-interfederations-2.0/.xml136
-rw-r--r--swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml31
-rw-r--r--swamid-interfederations-2.0/adfs.tue.nl.xml59
-rw-r--r--swamid-interfederations-2.0/cas.cuni.cz.xml4
-rw-r--r--swamid-interfederations-2.0/clarin.ids-mannheim.de.xml10
-rw-r--r--swamid-interfederations-2.0/cloudidp1.canarie.ca.xml3
-rw-r--r--swamid-interfederations-2.0/du-idp.lanet.lv.xml49
-rw-r--r--swamid-interfederations-2.0/engine.surfconext.nl.xml91
-rw-r--r--swamid-interfederations-2.0/filesender.funet.fi.xml126
-rw-r--r--swamid-interfederations-2.0/foodl.org.xml86
-rw-r--r--swamid-interfederations-2.0/halfback.cnaf.infn.it.xml2
-rw-r--r--swamid-interfederations-2.0/idem.ced.inaf.it.xml6
-rw-r--r--swamid-interfederations-2.0/idp-cafe.unir.br.xml135
-rw-r--r--swamid-interfederations-2.0/idp.admin.grnet.gr.xml10
-rw-r--r--swamid-interfederations-2.0/idp.bth.se.xml113
-rw-r--r--swamid-interfederations-2.0/idp.csc.fi.xml85
-rw-r--r--swamid-interfederations-2.0/idp.dfn.de.xml111
-rw-r--r--swamid-interfederations-2.0/idp.feide.no.xml597
-rw-r--r--swamid-interfederations-2.0/idp.georgikon.hu.xml1
-rw-r--r--swamid-interfederations-2.0/idp.ids-mannheim.de.xml155
-rw-r--r--swamid-interfederations-2.0/idp.lrz.de.xml29
-rw-r--r--swamid-interfederations-2.0/idp.nordu.net.xml2
-rw-r--r--swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml124
-rw-r--r--swamid-interfederations-2.0/idp.renater.fr.xml34
-rw-r--r--swamid-interfederations-2.0/idp.student.bth.se.xml108
-rw-r--r--swamid-interfederations-2.0/idp.surfnet.nl.xml9
-rw-r--r--swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml115
-rw-r--r--swamid-interfederations-2.0/idp2.civ.cvut.cz.xml6
-rw-r--r--swamid-interfederations-2.0/laife-idp.lanet.lv.xml90
-rw-r--r--swamid-interfederations-2.0/lanet-idp.lanet.lv.xml49
-rw-r--r--swamid-interfederations-2.0/liepu-idp.lanet.lv.xml49
-rw-r--r--swamid-interfederations-2.0/lma-idp.lanet.lv.xml49
-rw-r--r--swamid-interfederations-2.0/lmuidp.lrz.de.xml26
-rw-r--r--swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml49
-rw-r--r--swamid-interfederations-2.0/login-idp.auth.gr.xml170
-rw-r--r--swamid-interfederations-2.0/login.athena-innovation.gr.xml10
-rw-r--r--swamid-interfederations-2.0/login.du.se.xml107
-rw-r--r--swamid-interfederations-2.0/login.ntua.gr.xml10
-rw-r--r--swamid-interfederations-2.0/login.terena.org.xml5
-rw-r--r--swamid-interfederations-2.0/lu-idp.lu.lv.xml51
-rw-r--r--swamid-interfederations-2.0/lu-idp1.lu.lv.xml75
-rw-r--r--swamid-interfederations-2.0/openwiki.uninett.no.xml89
-rw-r--r--swamid-interfederations-2.0/ra-idp.lanet.lv.xml49
-rw-r--r--swamid-interfederations-2.0/repos.ids-mannheim.de.xml16
-rw-r--r--swamid-interfederations-2.0/rja-idp.lanet.lv.xml49
-rw-r--r--swamid-interfederations-2.0/rr.funet.fi.xml235
-rw-r--r--swamid-interfederations-2.0/services-federation.renater.fr.xml2
-rw-r--r--swamid-interfederations-2.0/sgw.africa-grid.org.xml118
-rw-r--r--swamid-interfederations-2.0/sgw.garr.it.xml123
-rw-r--r--swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml135
-rw-r--r--swamid-interfederations-2.0/shibboleth.nkp.cz.xml5
-rw-r--r--swamid-interfederations-2.0/sourcesup.cru.fr.xml2
-rw-r--r--swamid-interfederations-2.0/sp.catalog.clarin.eu.xml159
-rw-r--r--swamid-interfederations-2.0/sp.lat.csc.fi.xml130
-rw-r--r--swamid-interfederations-2.0/sp.lux17.mpi.nl.xml160
-rw-r--r--swamid-interfederations-2.0/sse-idp.lanet.lv.xml49
-rw-r--r--swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml90
-rw-r--r--swamid-interfederations-2.0/swamid.user.uu.se.xml150
-rw-r--r--swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml47
-rw-r--r--swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml47
-rw-r--r--swamid-interfederations-2.0/terena.org.xml78
-rw-r--r--swamid-interfederations-2.0/tumidp.lrz.de.xml21
-rw-r--r--swamid-interfederations-2.0/va-idp.lanet.lv.xml49
-rw-r--r--swamid-interfederations-2.0/via-idp.lanet.lv.xml49
-rw-r--r--swamid-interfederations-2.0/wayf.wayf.dk.xml179
-rw-r--r--swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml157
-rw-r--r--swamid-interfederations-2.0/whoami.cesnet.cz.xml2
-rw-r--r--swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml115
-rw-r--r--swamid-interfederations-2.0/www.rediris.es.xml103
-rw-r--r--swamid-interfederations-2.0/www2.eduid.cz.xml98
71 files changed, 4110 insertions, 1402 deletions
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 52fe2e64..b6cdfb71 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -7,6 +7,7 @@
<xi:include href="swamid-interfederations-2.0/aai.sztaki.hu.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-viewer.switch.ch.xml"/>
<xi:include href="swamid-interfederations-2.0/abstimmung.dfn.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/adfs.tue.nl.xml"/>
<xi:include href="swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml"/>
<xi:include href="swamid-interfederations-2.0/agw-sparknet.utu.fi.xml"/>
<xi:include href="swamid-interfederations-2.0/applications.eu-decide.eu.xml"/>
@@ -54,6 +55,7 @@
<xi:include href="swamid-interfederations-2.0/db.ub.uni-stuttgart.de.xml"/>
<xi:include href="swamid-interfederations-2.0/doit.swisdom.org.xml"/>
<xi:include href="swamid-interfederations-2.0/downloads.channel8.msdn.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/du-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/e5.onthehub.com.xml"/>
<xi:include href="swamid-interfederations-2.0/eaa.uspnet.usp.br.xml"/>
<xi:include href="swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml"/>
@@ -62,6 +64,7 @@
<xi:include href="swamid-interfederations-2.0/elegitimation2.inloggning.se.xml"/>
<xi:include href="swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml"/>
<xi:include href="swamid-interfederations-2.0/encecafe.ibge.gov.br.xml"/>
+<xi:include href="swamid-interfederations-2.0/engine.surfconext.nl.xml"/>
<xi:include href="swamid-interfederations-2.0/ephraim.tu-berlin.de.xml"/>
<xi:include href="swamid-interfederations-2.0/erf.sbb.spk-berlin.de.xml"/>
<xi:include href="swamid-interfederations-2.0/febe.ufpe.br.xml"/>
@@ -94,6 +97,8 @@
<xi:include href="swamid-interfederations-2.0/idp.abo.fi.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/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"/>
<xi:include href="swamid-interfederations-2.0/idp.csc.fi.xml"/>
@@ -137,6 +142,7 @@
<xi:include href="swamid-interfederations-2.0/idp.ph-karlsruhe.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ph-ludwigsburg.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ppke.hu.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.reutlingen-university.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.rnp.br.xml"/>
@@ -147,6 +153,7 @@
<xi:include href="swamid-interfederations-2.0/idp.scc.kit.edu.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.shh.fi.xml"/>
<xi:include href="swamid-interfederations-2.0/idpstaff.belnet.be.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.student.bth.se.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.surfnet.nl.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.szie.hu.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.tu-clausthal.de.xml"/>
@@ -170,6 +177,7 @@
<xi:include href="swamid-interfederations-2.0/idp.uni-tuebingen.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uni-ulm.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uni-wuppertal.de.xml"/>
+<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/indicate-gw.consorzio-cometa.it.xml"/>
@@ -178,11 +186,17 @@
<xi:include href="swamid-interfederations-2.0/keybucket.app.nordu.net.xml"/>
<xi:include href="swamid-interfederations-2.0/kiidp.ki.se.xml"/>
<xi:include href="swamid-interfederations-2.0/kurse.vhb.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/laife-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/laife.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/lanet-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/liepu-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/lma-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/lmuidp.lrz.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/login2.hs-mittweida.de.xml"/>
<xi:include href="swamid-interfederations-2.0/login.athena-innovation.gr.xml"/>
<xi:include href="swamid-interfederations-2.0/login.bme.hu.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.du.se.xml"/>
<xi:include href="swamid-interfederations-2.0/login.feld.cvut.cz.xml"/>
<xi:include href="swamid-interfederations-2.0/login.hfwu.de.xml"/>
<xi:include href="swamid-interfederations-2.0/login.hs-ulm.de.xml"/>
@@ -194,6 +208,8 @@
<xi:include href="swamid-interfederations-2.0/login.slub-dresden.de.xml"/>
<xi:include href="swamid-interfederations-2.0/login.terena.org.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ufrgs.br.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/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"/>
@@ -207,8 +223,10 @@
<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/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"/>
+<xi:include href="swamid-interfederations-2.0/rja-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/rnd.feide.no.xml"/>
<xi:include href="swamid-interfederations-2.0/ross.impa.br.xml"/>
<xi:include href="swamid-interfederations-2.0/royalsocietypublishing.org.xml"/>
@@ -227,6 +245,8 @@
<xi:include href="swamid-interfederations-2.0/services.aai.mpg.de.xml"/>
<xi:include href="swamid-interfederations-2.0/services-federation.renater.fr.xml"/>
<xi:include href="swamid-interfederations-2.0/services.oxfordjournals.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/sgw.africa-grid.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/sgw.garr.it.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.alexanderstreet.com.xml"/>
<xi:include href="swamid-interfederations-2.0/shibb-idp.hs-weingarten.de.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth1.rz.hft-stuttgart.de.xml"/>
@@ -242,6 +262,7 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.genios.de.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.globaldata.com.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-wuerzburg.de.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.illumina.csa.com.xml"/>
@@ -281,11 +302,15 @@
<xi:include href="swamid-interfederations-2.0/sp.swamid.se.xml"/>
<xi:include href="swamid-interfederations-2.0/sp-test.swamid.se.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.tshhosting.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/sse-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.h-da.de.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.uni-passau.de.xml"/>
<xi:include href="swamid-interfederations-2.0/store.lu.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml"/>
<xi:include href="swamid-interfederations-2.0/swamid.user.uu.se.xml"/>
<xi:include href="swamid-interfederations-2.0/talli.funet.fi.xml"/>
+<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/theia.unifei.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/ticket.iop.org.xml"/>
@@ -294,6 +319,8 @@
<xi:include href="swamid-interfederations-2.0/tumidp.lrz.de.xml"/>
<xi:include href="swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml"/>
<xi:include href="swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml"/>
+<xi:include href="swamid-interfederations-2.0/va-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/via-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/vvc.niif.hu.xml"/>
<xi:include href="swamid-interfederations-2.0/wayf.ordbogen.com.xml"/>
<xi:include href="swamid-interfederations-2.0/wayf.wayf.dk.xml"/>
@@ -303,9 +330,11 @@
<xi:include href="swamid-interfederations-2.0/web.tut.fi.xml"/>
<xi:include href="swamid-interfederations-2.0/whoami.cesnet.cz.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml"/>
<xi:include href="swamid-interfederations-2.0/wiseflow.dk.xml"/>
<xi:include href="swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml"/>
<xi:include href="swamid-interfederations-2.0/wws.redi-bw.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/www2.eduid.cz.xml"/>
<xi:include href="swamid-interfederations-2.0/www2.eduroam.cz.xml"/>
<xi:include href="swamid-interfederations-2.0/www2.munzinger.de.xml"/>
<xi:include href="swamid-interfederations-2.0/www.ascopubs.org.xml"/>
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index 1f242bd3..b721b025 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,33 +1,105 @@
<?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-06-03T20: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>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</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>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:sac">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/gestion" registrationInstant="2011-02-21T13:53:59Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://federation.renater.fr/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sac.cru.fr</shibmd:Scope>
+
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">RENATER - CRU accounts</mdui:DisplayName>
+ <mdui:Description xml:lang="en">CRU accounts can be used by any user who has no identity provider.</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">RENATER - Comptes CRU</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Les comptes CRU (Comptes Réseau Universels) sont utilisables par tout utilisateur ne disposant pas d'un fournisseur d'identités.</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMDCCAhigAwIBAgIVAO9nQyxkmUi9OzdL/LKcD+nqPl9eMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWZlZGVyYXRpb24uY3J1LmZyMB4XDTA5MDQwMzEzMDYx
+NloXDTI5MDQwMzEzMDYxNlowHDEaMBgGA1UEAxMRZmVkZXJhdGlvbi5jcnUuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEDVBO3Sk9p89YMmMIf5iA
+EF0UslsnMndGaz926Z8rLLshI0rlQoRB3/tMb8g1M7p6MozqEpDNHQNGjnttWyJS
+ERu4v9ua/RCs6NjwgJX0n1GlgsC55PTd1nwM6X0PQI9Bcd6E//s1nqucMHdIz5eY
+LvuqPLqbVCAgbZwVzRNppR/vIcLBK/tACF99xAlXr/juDc3cgPw48CfEPxA8eNqh
+7LAqW00ZszLa2m2He7eLIxN5A6xuR0lmk33oHvJLBnMzFcu6jvOXZrbVB1qyJsR8
+oQbacbOMJCj1i66czJZIm8o0SN8JdkbhMwupNP9nVh6v+nw9hTr+9SW/TC16FJTR
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWZlZGVyYXRpb24uY3J1LmZyhihodHRwczov
+L2ZlZGVyYXRpb24uY3J1LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTcUWfB
+AyBNiUSksLBzQ+X7urliKDANBgkqhkiG9w0BAQUFAAOCAQEADsu1fpLAl7aewmba
+EFzSOxFwopus1PAa6DFqasvaukG2y4w4QcyXLVM7I2DIWF33+seEneUSHyc8RDm2
+4vuJSwXub7ST8aeUrV4snMNNGaxx8TyxUkpM6J1A6vt6veQMPIKVUaX9Kp1Ix6Oh
+ajenqYYaou1H9u90M38XMoQBVtJVL3vj9mnBtIh55ubhWLc1AOlLBDU5CBIz1zWU
+1GCi1FRIfzpWV+i5pLTHi8QLZhbDGYxsZ+L+tKAH6uE3gAG/pEzZv4JetIYMsadl
+kewpsUVGrsZm2zp8EnJHz+lV4bbtnRgmKho1dRBQccUKvvcJWlitFjByk+ZEwXoP
+Y6rjdw==
+ </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>
+ MIIDIzCCAgugAwIBAgIUGEidswuMXi6Jmc16GB0pC5lOEfgwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOY3J1LnJlbmF0ZXIuZnIwHhcNMTMwNTAzMTQ1MzE5WhcN
+MzMwNTAzMTQ1MzE5WjAZMRcwFQYDVQQDEw5jcnUucmVuYXRlci5mcjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJtlU/vZ/CzUpx2iLlUV8RVcASv5Oxsh
+x9FzeXSlgqi9yHNYm2K0A/oacdMZcUy2R8cttdY7wyBd6f1xruXHeGaRv0cLhOpk
+J/8w4FjkU1c3ASMsQ+Mf4u/luOARju6jTPmC8p9iEwtD9CHZ0tXClFxwslDF1BJf
+7cr/DbUfFSiU4nK36mq1HawKPI+m3c/apfcZByfo+B/dE736AkxXyvmga0ydNYma
+LmuSgfa4XSl+c7K3Mre+YAK5PAE5zlNVquIOp7VDl6zyMLfgi7Qb6Z8+3Gc0nCce
+ImEnEcR8ez7IRz4T+zqH5VL6qPud6cG65ZAs5vY1nuIsDn8aCNTTzicCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOY3J1LnJlbmF0ZXIuZnKGJWh0dHBzOi8vY3J1LnJlbmF0
+ZXIuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCmFBG0i8OaQFCIQePPfK+Hp
+XIDpMA0GCSqGSIb3DQEBBQUAA4IBAQCR4/luQITnk74Sr+FimNPEpSrudH6MmUS0
+gSWV4ncwZCh/Kksgpxp3fu3vGCj7iXLE4OX6HCfRSKxlB/4lt7KoeWNPopbf4EXq
+nM98cqsKao++vLy7p3cDyUNc42DExEK2yVbh4aN8d7IsppKxUUseaiQnOmme4HAW
+2Y+QreZN6s3EL/Hi+P7jHM1iIxHXgymcilTgGyCC7x6kNDeSOkXPNjsuud78QGE7
+La1dwmUrSMJG2AugUKoq2txNSxhOlZ85r0FGDmkg/Us69HnC4xFameCGtS6MlDHd
+UxyU+xLNIhDCqDzROFdtSNCDEXyhkwf2e2311p3o38MmAM9YopVo
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <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" Location="https://cru.renater.fr/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cru.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cru.renater.fr/idp/profile/Shibboleth/SSO"/>
+
+ </IDPSSODescriptor>
+
+
+
+ <Organization>
+
+ <OrganizationName xml:lang="en">RENATER, CRU accounts</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">RENATER, Comptes CRU</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://federation.renater.fr/sac/</OrganizationURL>
+
+
+ </Organization>
+
+
+
+ <ContactPerson contactType="technical">
+ <EmailAddress>fed-contact@listes.renater.fr</EmailAddress>
+ </ContactPerson>
+
+
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml b/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml
index acf7a847..0f79c7e7 100644
--- a/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml
+++ b/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.rz.uni-leipzig.de/idp/shibboleth">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-12T11:14:54Z">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-12T09:14:54Z">
<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>
@@ -9,15 +9,18 @@
<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">uni-leipzig.de</saml1md:Scope>
+ <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</saml1md:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="de">Universität Leipzig</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Leipzig</mdui:DisplayName>
- <mdui:Description xml:lang="de">Universität Leipzig</mdui:Description>
- <mdui:Description xml:lang="en">University of Leipzig</mdui:Description>
- <mdui:Logo height="37" width="233">http://www.zv.uni-leipzig.de/fileadmin/www.uni-leipzig.de/images/logo.jpg</mdui:Logo>
+ <mdui:DisplayName xml:lang="de">Universität Leipzig</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Leipzig</mdui:DisplayName>
+ <mdui:Description xml:lang="de">IdP der Uni Leipzig</mdui:Description>
+ <mdui:Description xml:lang="en">IdP University of Leipzig</mdui:Description>
+ <mdui:Logo height="37" width="233">https://www.zv.uni-leipzig.de/fileadmin/www.uni-leipzig.de/images/logo.jpg</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">https://www.uni-leipzig.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.uni-leipzig.de</mdui:InformationURL>
</mdui:UIInfo>
</Extensions>
- <KeyDescriptor>
+ <KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>aai.rz.uni-leipzig.de</ds:KeyName>
<ds:X509Data>
@@ -70,8 +73,9 @@ dJK6wmgTVaqH2u5BMKaDvRQ5oqgkgvhU
<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">uni-leipzig.de</saml1md:Scope>
+ <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</saml1md:Scope>
</Extensions>
- <KeyDescriptor>
+ <KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>aai.rz.uni-leipzig.de</ds:KeyName>
<ds:X509Data>
@@ -118,8 +122,8 @@ dJK6wmgTVaqH2u5BMKaDvRQ5oqgkgvhU
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
- <OrganizationName xml:lang="de">Universität Leipzig</OrganizationName>
- <OrganizationName xml:lang="en">University of Leipzig</OrganizationName>
+ <OrganizationName xml:lang="de">e256</OrganizationName>
+ <OrganizationName xml:lang="en">e256</OrganizationName>
<OrganizationDisplayName xml:lang="de">Universität Leipzig</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">University of Leipzig</OrganizationDisplayName>
<OrganizationURL xml:lang="de">https://www.uni-leipzig.de</OrganizationURL>
@@ -130,4 +134,9 @@ dJK6wmgTVaqH2u5BMKaDvRQ5oqgkgvhU
<SurName>Toenjes</SurName>
<EmailAddress>toenjes@rz.uni-leipzig.de</EmailAddress>
</ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Uwe</GivenName>
+ <SurName>Toenjes</SurName>
+ <EmailAddress>toenjes@rz.uni-leipzig.de</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.tue.nl.xml b/swamid-interfederations-2.0/adfs.tue.nl.xml
new file mode 100644
index 00000000..3e759d39
--- /dev/null
+++ b/swamid-interfederations-2.0/adfs.tue.nl.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.tue.nl/adfs/services/trust">
+ <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>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEVDCCAzygAwIBAgIJANm7yUGYaeG1MA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV
+BAYTAk5MMRAwDgYDVQQKEwdTVVJGbmV0MREwDwYDVQQLEwhTZXJ2aWNlczEZMBcG
+A1UEAxMQRmVkZXJhdGllIEJlaGVlcjEqMCgGCSqGSIb3DQEJARYbZmVkZXJhdGll
+LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTA4MDYwNTE1MDgyMVoXDTIzMDYwMjE1MDgy
+MVoweTELMAkGA1UEBhMCTkwxEDAOBgNVBAoTB1NVUkZuZXQxETAPBgNVBAsTCFNl
+cnZpY2VzMRkwFwYDVQQDExBGZWRlcmF0aWUgQmVoZWVyMSowKAYJKoZIhvcNAQkB
+FhtmZWRlcmF0aWUtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC/x+YuMaHyS3xeogfBB6hWrL4Frp+KzOuu4IixfhMHz3xI
+G5l7p2aNV8UrEXevOwMWCgMNxjfSLdZBgNhR14GBh2cVGCx9f/wUtB86scmkP3Pr
+RLoZWu/EIY6MEbgET3D3tkdGuVejQwwhJTlK2xxWHtEdEL5abjYLveDg6Lb6z9od
+ljFevylBMZO+5LwTjpa3+B+07oMZr2sV1yjsG2BEBwTFz4XZzJAabeK9UO836qhN
+ptktjffoCNen33tNCjzqci4wzgQef3CNA/Ef0tMKGotdldKC6FtHvXixmVY5RKUK
+Iutm8sRwne8XYqrD54BAgXZQ0ZovxFbvGhA77YXxAgMBAAGjgd4wgdswHQYDVR0O
+BBYEFJNoYjIYUrDN/h1+9BZYOTk7jQBNMIGrBgNVHSMEgaMwgaCAFJNoYjIYUrDN
+/h1+9BZYOTk7jQBNoX2kezB5MQswCQYDVQQGEwJOTDEQMA4GA1UEChMHU1VSRm5l
+dDERMA8GA1UECxMIU2VydmljZXMxGTAXBgNVBAMTEEZlZGVyYXRpZSBCZWhlZXIx
+KjAoBgkqhkiG9w0BCQEWG2ZlZGVyYXRpZS1iZWhlZXJAc3VyZm5ldC5ubIIJANm7
+yUGYaeG1MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAI4IxrYPwwjJ
+D9gO1Vzt8ByeQaRe+V0Mv5Ox9RlcXV33WX8Ny8hqUS4/kjs9v7JOuOw7TRop/4QJ
+IAv/LEXH9B+hQ96zdLGMCcHI2crWF8l0yZ/DtgkpdlcyS7dNbjLtedtmgrOMSQub
+LE02tqoSUR491mQbRuXD49+kJsHXZH8I1YZqOShzPZ7+ksvnBd64txhef8OBlCzE
+elT60nOC3Jm8k3i0HwPcCYfDrh6+MJfC2dvfgktAcyu8rm1Q/ZelxaaXok17wUKg
+D8nDrVCOfTND1RCGcqJ3YVjYDhBrMdK+5NSuC5KOJUpVZbKgTOilnOM7B/Os8HJC
+fxLkDyGV/oQ=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.surfnet.nl/federate/saml20"/>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <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://wayf.surfnet.nl/federate/saml20/http%253A%252F%252Fadfs.tue.nl%252Fadfs%252Fservices%252Ftrust"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.surfnet.nl/federate/saml20/http%253A%252F%252Fadfs.tue.nl%252Fadfs%252Fservices%252Ftrust"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Technische Universiteit Eindhoven</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Technische Universiteit Eindhoven</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.surffederatie.nl</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>AAI Beheer</SurName>
+ <EmailAddress>aai-beheer@surfnet.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>SURFfederatie Beheer</GivenName>
+ <EmailAddress>federatie-beheer@surfnet.nl</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.cuni.cz.xml b/swamid-interfederations-2.0/cas.cuni.cz.xml
index 9f236ca4..c4d498d8 100644
--- a/swamid-interfederations-2.0/cas.cuni.cz.xml
+++ b/swamid-interfederations-2.0/cas.cuni.cz.xml
@@ -12,8 +12,8 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Charles University in Prague</mdui:DisplayName>
<mdui:DisplayName xml:lang="cs">Univerzita Karlova v Praze</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for Charles University students and staff.</mdui:Description>
- <mdui:Description xml:lang="cs">Identity Provider pro studenty a zamšstance Univerzity Karlovy v Praze.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for Charles University students and staff</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro studenty a zaměstance Univerzity Karlovy v Praze</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.cuni.cz/UKENG-1.html</mdui:InformationURL>
<mdui:InformationURL xml:lang="cs">http://www.cuni.cz/</mdui:InformationURL>
<mdui:Logo height="40" width="41">https://ldap.cuni.cz/images/UK_logo_40.png</mdui:Logo>
diff --git a/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml b/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
index e62d37f4..69ffb3a1 100644
--- a/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<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-15T10:56:14Z">
- <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 xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-10-15T08:56:14Z">
+ <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">
@@ -109,12 +109,14 @@ Ew==
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="4"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="5"/>
<AttributeConsumingService index="1">
+ <ServiceName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</ServiceName>
<ServiceName xml:lang="en">Institut für Deutsche Sprache (IDS) - CLARIN services</ServiceName>
+ <ServiceDescription xml:lang="de">Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</ServiceDescription>
<ServiceDescription xml:lang="en">Servies provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</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="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>
+ </AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="de">e217</OrganizationName>
diff --git a/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml b/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml
index ff1f2765..ed77cd93 100644
--- a/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml
+++ b/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml
@@ -53,7 +53,6 @@ HOB2BJCb3Ue9NzqIlgXpyc2LpPt2RRlYaJm45zod</ds:X509Certificate>
<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:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cloudidp1.canarie.ca/idp/profile/Shibboleth/SSO"/>
-<SingleSignOnService Binding="urn:mace:shibboleth:2.0:profiles:AuthnRequest" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/Unsolicited/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/POST/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/Redirect/SSO"/>
@@ -94,7 +93,7 @@ HOB2BJCb3Ue9NzqIlgXpyc2LpPt2RRlYaJm45zod</ds:X509Certificate> </ds:X509Data>
<Organization>
<OrganizationName xml:lang="en">CANARIE</OrganizationName>
<OrganizationName xml:lang="fr">CANARIE</OrganizationName>
-<OrganizationDisplayName xml:lang="en">CANARIE - CAF Cloud IdP</OrganizationDisplayName>
+<OrganizationDisplayName xml:lang="en">CANARIE - CAF Cloud IdP - Canada's Advanced Research and Innovation Network</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="fr">
CANARIE - CAF-FCA - Fournisseur nuagique d'identité - Le réseau évolué de recherche et d'innovation du Canada
</OrganizationDisplayName>
diff --git a/swamid-interfederations-2.0/du-idp.lanet.lv.xml b/swamid-interfederations-2.0/du-idp.lanet.lv.xml
new file mode 100644
index 00000000..426631ae
--- /dev/null
+++ b/swamid-interfederations-2.0/du-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://du-idp.lanet.lv">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://du-idp.lanet.lv/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://du-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">LAIFE - DU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Daugavpils University - DU IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.du.lv/</OrganizationURL>
+ </Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engine.surfconext.nl.xml b/swamid-interfederations-2.0/engine.surfconext.nl.xml
new file mode 100644
index 00000000..0ea7cfc1
--- /dev/null
+++ b/swamid-interfederations-2.0/engine.surfconext.nl.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://engine.surfconext.nl/authentication/sp/metadata">
+ <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 WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="nl">SURFconext</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SURFconext</mdui:DisplayName>
+ <mdui:Description xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die
+ nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende
+ aanbieders te combineren.</mdui:Description>
+ <mdui:Description xml:lang="en">SURFconext is a collaboration infrastructure that
+ creates new opportunities to collaborate online based on a combination of
+ applications from different providers.</mdui:Description>
+ <mdui:Logo height="100" width="186">http://www.surfnet.nl/SURFnet%20imagebank/Logos/logo_surfconext_themasite.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDyzCCArOgAwIBAgIJAMzixtXMUH1NMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
+ BAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYD
+ VQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHTAbBgNVBAMM
+ FGVuZ2luZS5zdXJmY29uZXh0Lm5sMB4XDTExMDEyNDEwMTg1N1oXDTIxMDEyMzEw
+ MTg1N1owfDELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcM
+ B1V0cmVjaHQxFTATBgNVBAoMDFNVUkZuZXQgQi5WLjETMBEGA1UECwwKU1VSRmNv
+ bmV4dDEdMBsGA1UEAwwUZW5naW5lLnN1cmZjb25leHQubmwwggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDMJ6v+f3owS3KR5IXSil+3XFwGvCVeYx3jDOFK
+ AnwvXlDpTu+t730b8/spHtlopyJVAlb6qBIPN7R4TGTLqiu0zebYsYx/PtqCk5cb
+ u9qs3h+p2BBoTXVwXA/ZYi0tqtxp04hcNrRj1TAgLyC0S+KASTF+zzccAcjTBid5
+ EMioo+YllgSEobWJ4X33XVRqNrikAPDsNmDrdKUi257JSO2xhVIG5lbtmDaL5ORC
+ D56oRmVdp7VQTEQ3Yass8J5Rn+Ub6WmRBYeG+KzFBvtyBput2o0/gvtJn9L+NWeD
+ B0LyUPaUYG/X4GF14FcmFQfz7I5jBCNHtPcLJbPYbZKQNhz/AgMBAAGjUDBOMB0G
+ A1UdDgQWBBS9QqP8gtMM6nm4oYzNbgqhEDP1aDAfBgNVHSMEGDAWgBS9QqP8gtMM
+ 6nm4oYzNbgqhEDP1aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBH
+ 2qyYwLwesIOxUTj+NJ0VXRBDH8VecNLiUUs9Np4x8A0pxLvlNnv5TdJAruEg1LSV
+ mAqqPUdAB2m7CKDeUVM9cwOB7vqelV2GNgOfevXi+DZRMffyyE8qyIcnTqvDOgcR
+ 8qGTPSVT+SIsOkV9bYrjltrbnal7cJermsA8SC5w/pjLaOHI1xIZHquZzymWoN3Z
+ fz2CQg2r5o+AURYd74GrHhHqVa9VrdWtcimB+vTQQihoLt8YciehpJjOMpx2D66e
+ FfpC8ix31RRdjAVIo1y33h1yU3gEHePDbOthZE+lpXi2WJqO85H85LqJOtgn2WPI
+ 3P2Tx32Cq1WXCYkxLaPI </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.surfconext.nl/authentication/sp/consume-assertion" index="0"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="nl">SURFconext | SURFnet</md:ServiceName>
+ <md:ServiceName xml:lang="en">SURFconext | SURFnet</md:ServiceName>
+ <md:ServiceDescription xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende aanbieders te combineren.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">SURFconext is a collaboration infrastructure that creates new opportunities to collaborate online based on a combination of applications from different providers.</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="urn:mace:terena.org:attribute-def: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"/>
+ <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def: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"/>
+ <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def: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"/>
+ <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def: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="false"/>
+ <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def: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"/>
+ <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="nl">SURFnet BV</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">SURFnet BV</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="nl">http://www.surfnet.nl/nl/Pages/default.aspx</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en/Pages/default.aspx</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>SURFconext</md:GivenName>
+ <md:SurName>Helpdesk</md:SurName>
+ <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>SURFconext</md:GivenName>
+ <md:SurName>Technical Support</md:SurName>
+ <md:EmailAddress>surfconext-beheer@surfnet.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>SURFconext</md:GivenName>
+ <md:SurName>Administrative Contact</md:SurName>
+ <md:EmailAddress>surfconext-beheer@surfnet.nl</md:EmailAddress>
+ </md:ContactPerson>
+ </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index 297b43d4..2ee90328 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"?>
-<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.edugain.org/dataprotection/coc-eu-01-draft</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="fi">Funet FileSender</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Funet FileSender</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Funet FileSender</mdui:DisplayName>
@@ -13,15 +23,11 @@
<mdui:PrivacyStatementURL xml:lang="fi">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEyMDYyNjAwMDAwMFoXDTE1MDYyNjIzNTk1OVowgbAxCzAJBgNV
BAYTAkZJMQ4wDAYDVQQREwUwMjEwMTEQMA4GA1UECBMHdXVzaW1hYTEOMAwGA1UE
@@ -47,49 +53,49 @@ Fq9C5c4z3aH1DOpUaVDzRr3gKxEloP0iJfp/jR00cs8hNKw0Lzw/dXVIQ+ObT1B7
4Qm4RJUOIO/yHNqLvs0QRhYCnonyfUN5Hg5RA0hGwBXJzLZpVYG4yNVYEuSS47BA
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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="1" isDefault="true"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="2" isDefault="false"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="fi">Funet FileSender</ServiceName>
+ <ServiceName xml:lang="en">Funet FileSender</ServiceName>
+ <ServiceName xml:lang="sv">Funet FileSender</ServiceName>
+ <ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</ServiceDescription>
+ <ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</ServiceDescription>
+ <ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</ServiceDescription>
+ <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+ <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <GivenName>Harri</GivenName>
+ <SurName>Kuusisto</SurName>
+ <EmailAddress>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 41952b49..c57fbce8 100644
--- a/swamid-interfederations-2.0/foodl.org.xml
+++ b/swamid-interfederations-2.0/foodl.org.xml
@@ -1,34 +1,56 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIICLzCCAZgCCQDWeshLcjcICTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wHhcNMDkwMTMwMTIyMzI4WhcNMzYwNjE2MTIyMzI4WjBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMLZMDXYErToL/IAb8WcTYN4bGZtwnwc8RmsuFSo2Bu3q+27fQIjn5uF/OfC9D2Bs5nqy8PjHSfp4gTG2gL/+Vi8J1rLnTLgTCBl/DacPU1MhkKiw8+dqzsPm96ELoDRJH4+O0vML3rUizkpZidEN5CgWNcg72CyKE83vN7zijevAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAmw2o4gbWppGxd5Xleyyd+s2kJMVnuXlwjsLiXz8uzeqOifAG1RVTZQDCxIAw8lAse1nLKKGZYj5PyCVwAhVjaVYuATErfeJqyTft9xtbH6Qk5mV99u1GujO2Lx54uaZFOCiCahwQGPfAm+qlrCteDoE8gqo0RJWno/HQxXE6/ac=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">Foodle</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
- <md:Company>UNINETT AS</md:Company>
- <md:GivenName>Andreas</md:GivenName>
- <md:SurName>Solberg</md:SurName>
- <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
- <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
- </md:ContactPerson>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+<md:Extensions>
+<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-05-05T06:16:34Z">
+<mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+</mdrpi:RegistrationInfo>
+</md:Extensions>
+<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:Extensions>
+<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+<mdui:DisplayName xml:lang="en">Foodle</mdui:DisplayName>
+<mdui:DisplayName xml:lang="no">Foodle</mdui:DisplayName>
+<mdui:DisplayName xml:lang="nn">Foodle</mdui:DisplayName>
+<mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
+<mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
+<mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
+<mdui: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>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:X509Data>
+<ds:X509Certificate>MIICLzCCAZgCCQDWeshLcjcICTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wHhcNMDkwMTMwMTIyMzI4WhcNMzYwNjE2MTIyMzI4WjBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMLZMDXYErToL/IAb8WcTYN4bGZtwnwc8RmsuFSo2Bu3q+27fQIjn5uF/OfC9D2Bs5nqy8PjHSfp4gTG2gL/+Vi8J1rLnTLgTCBl/DacPU1MhkKiw8+dqzsPm96ELoDRJH4+O0vML3rUizkpZidEN5CgWNcg72CyKE83vN7zijevAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAmw2o4gbWppGxd5Xleyyd+s2kJMVnuXlwjsLiXz8uzeqOifAG1RVTZQDCxIAw8lAse1nLKKGZYj5PyCVwAhVjaVYuATErfeJqyTft9xtbH6Qk5mV99u1GujO2Lx54uaZFOCiCahwQGPfAm+qlrCteDoE8gqo0RJWno/HQxXE6/ac=</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
+<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
+<md:AttributeConsumingService index="0">
+<md:ServiceName xml:lang="en">Foodle</md:ServiceName>
+<md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
+<md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
+<md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
+<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+</md:AttributeConsumingService>
+</md:SPSSODescriptor>
+<md:Organization>
+<md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+<md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+<md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+<md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+<md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+<md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+</md:Organization>
+<md:ContactPerson contactType="technical">
+<md:GivenName>Feide Support</md:GivenName>
+<md:EmailAddress>support@feide.no</md:EmailAddress>
+</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml b/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml
index 17989e4f..30548bba 100644
--- a/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml
+++ b/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml
@@ -5,7 +5,7 @@
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
-
+
<md: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">
<md:Extensions>
<mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idem.ced.inaf.it.xml b/swamid-interfederations-2.0/idem.ced.inaf.it.xml
index db601144..a2731bec 100644
--- a/swamid-interfederations-2.0/idem.ced.inaf.it.xml
+++ b/swamid-interfederations-2.0/idem.ced.inaf.it.xml
@@ -20,12 +20,12 @@
<mdui:InformationURL xml:lang="it">https://www.ced.inaf.it/idem-info</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="it">https://www.ced.inaf.it/idem-info/idp-privacy.html</mdui:PrivacyStatementURL>
-
+
<mdui:Logo height="60" width="60" xml:lang="it">https://idem.ced.inaf.it/LogoINAF60.png</mdui:Logo>
<mdui:Logo height="100" width="100" xml:lang="it">https://idem.ced.inaf.it/LogoINAF100.png</mdui:Logo>
-
+
</mdui:UIInfo>
-
+
</Extensions>
<KeyDescriptor>
<ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp-cafe.unir.br.xml b/swamid-interfederations-2.0/idp-cafe.unir.br.xml
new file mode 100644
index 00000000..2953ec68
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-cafe.unir.br.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<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://idp-cafe.unir.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">unir.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.unir.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.unir.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxMDAuBgNVBAoTJ1VOSVIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kb25pYTE0MDIGA1UECxMrRFRJIC0g
+RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEaMBgGCSqGSIb3
+DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQI
+EwhSb25kb25pYTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGlkcC1jYWZlLnVuaXIu
+YnIwHhcNMTMwNTE3MTkyMzIxWhcNMTYwNTE2MTkyMzIxWjCB1TEwMC4GA1UEChMn
+VU5JUiAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFJvbmRvbmlhMTQwMgYDVQQL
+EytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMRow
+GAYJKoZIhvcNAQkBFgtkdGlAdW5pci5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8x
+ETAPBgNVBAgTCFJvbmRvbmlhMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRwLWNh
+ZmUudW5pci5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdrFEht
+Fvef4Bq9AceT1QYEv7KRfjEq9zZmYLyIo7+G1key90a+bLAsR5Pmx8W4JESIG1F6
+fe8sEgIM+4UgcIZktHbjZfypaSDYiqWgbS3CBf6b/8bu2hmwESLRjqt2Pb3k+HtY
+P1iyXEl+PrYE2AURXqgsDrlOSGjueD/77HnhruXvGO19b7XA9Da0ZjT7TYLcaZ0k
+XJmCt08+4VzgjWAE8YM8c568cGSlMa0u1qD8FzKU1JKx6jxDGuL5l6CaXq14AjhF
+PhzyYE1v0EnQ7TU78HkaWw7g9+ZTrYWapZNDu8HrsSLXSct1a9N21Khq75aIzXrj
+m/F1b1y5Ft4mI9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAxmg+k+tpOnQXgP8h
+HfJtEN2Ih1Gf7eJVj9Pe0DptNSK9S6lgs98uyl/a+n/pW/kJIJdP99L1RWNBVhgi
+1EGuLy6mSggvehvZd0vAKm2dXSBmDUdzVX3opk7lqFWRtP0W+cPcNCNSfzTqVolz
+V7gKZITYmiQXQPDLpldhYr0SqIfmmg9f4GzCbY9x7a2IeC+U31aZEQLXy+912sKa
+m49ny7xM0seNUS/2JhN2v1k/CkVjiAp03PeAS2XxOBWUPNqVS6rUwccLDKWgitzy
+YB++4eQ2xGpKsSArDNxQrqRPcxevz8S42GsZV1DGl6CYfJAKykVeTd/ipeMdcdqi
+9y9IHg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.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://idp-cafe.unir.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.unir.br/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.unir.br/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.unir.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">unir.br</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxMDAuBgNVBAoTJ1VOSVIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kb25pYTE0MDIGA1UECxMrRFRJIC0g
+RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEaMBgGCSqGSIb3
+DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQI
+EwhSb25kb25pYTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGlkcC1jYWZlLnVuaXIu
+YnIwHhcNMTMwNTE3MTkyMzIxWhcNMTYwNTE2MTkyMzIxWjCB1TEwMC4GA1UEChMn
+VU5JUiAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFJvbmRvbmlhMTQwMgYDVQQL
+EytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMRow
+GAYJKoZIhvcNAQkBFgtkdGlAdW5pci5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8x
+ETAPBgNVBAgTCFJvbmRvbmlhMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRwLWNh
+ZmUudW5pci5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdrFEht
+Fvef4Bq9AceT1QYEv7KRfjEq9zZmYLyIo7+G1key90a+bLAsR5Pmx8W4JESIG1F6
+fe8sEgIM+4UgcIZktHbjZfypaSDYiqWgbS3CBf6b/8bu2hmwESLRjqt2Pb3k+HtY
+P1iyXEl+PrYE2AURXqgsDrlOSGjueD/77HnhruXvGO19b7XA9Da0ZjT7TYLcaZ0k
+XJmCt08+4VzgjWAE8YM8c568cGSlMa0u1qD8FzKU1JKx6jxDGuL5l6CaXq14AjhF
+PhzyYE1v0EnQ7TU78HkaWw7g9+ZTrYWapZNDu8HrsSLXSct1a9N21Khq75aIzXrj
+m/F1b1y5Ft4mI9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAxmg+k+tpOnQXgP8h
+HfJtEN2Ih1Gf7eJVj9Pe0DptNSK9S6lgs98uyl/a+n/pW/kJIJdP99L1RWNBVhgi
+1EGuLy6mSggvehvZd0vAKm2dXSBmDUdzVX3opk7lqFWRtP0W+cPcNCNSfzTqVolz
+V7gKZITYmiQXQPDLpldhYr0SqIfmmg9f4GzCbY9x7a2IeC+U31aZEQLXy+912sKa
+m49ny7xM0seNUS/2JhN2v1k/CkVjiAp03PeAS2XxOBWUPNqVS6rUwccLDKWgitzy
+YB++4eQ2xGpKsSArDNxQrqRPcxevz8S42GsZV1DGl6CYfJAKykVeTd/ipeMdcdqi
+9y9IHg==
+
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.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">UNIR - Universidade Federal de Rondonia</OrganizationName>
+ <OrganizationName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.unir.br/</OrganizationURL>
+ <OrganizationURL xml:lang="pt-br">http://www.unir.br/</OrganizationURL>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <SurName>Fabio Leite Dias</SurName>
+ <EmailAddress>fabioleite@unir.br</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
index 7ad4ddbf..08e80319 100644
--- a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
+++ b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
@@ -1,5 +1,15 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.admin.grnet.gr/idp/shibboleth">
+ <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+ <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">
+ http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
+ </mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">
+ http://aai.grnet.gr/static/policy/policy-el-1.1.0.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grnet-hq.admin.grnet.gr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.bth.se.xml b/swamid-interfederations-2.0/idp.bth.se.xml
new file mode 100644
index 00000000..24a24797
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bth.se.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bth.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">bth.se</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
+MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCNOKwblSFiLSbItG/y118MRAXCguQJ4e7t+/e4bYhD
+fl9Qs5gTx3QJxXRgjISLrha44rc+awS6fr4In3N61ijS/X4Q0qrD5BszzCUw2Lni
+YITovYjH9wzZ3oOt5k67rtXoDL98B+Xqbh/M8lOXkcKba3Slsbz/QKg5Qf6ZCebc
+76rl3J3fM6ebYOyiCseCVTn+avpbqNKMi7sY6vfKDIo/zCkN3ZntH4ibGOi0j9z4
+5NlHLtWLShfwF/QLLKjd2alHTbyBjdDe22li9apxZB3LhZXFVGdYqBCJu0OBeFDP
+ZA4ZSWoxXMqxDbbJofMMbHysc7teqG3mJyDm/FL6hXH/AgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5idGguc2WGIWh0dHBzOi8vaWRwLmJ0aC5zZS9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUtNB3i29Xb36JeEa7RhFXM4OYTYYwDQYJKoZIhvcNAQEF
+BQADggEBAEGhHaZmmHhnfrsYc/trO15JWt5hU/UC9J7xhiF2iIk41ymeX+gvm6n5
+h2f4/xEgvmBwV6WM+BlQE+weK+nQNceV+aAO51xTM828O9SrmZ9ZPkw7+TxGiVdM
+SnxSTRcEWngxpJ+CGpgzy1SgV7WqO2NszSP+XRRJHjb0Aw39iKLP+yfvGdR71lu/
+2WPhhxaK7wun8loJJC2WI4ORwsh3mJoYZcVEIOXe/H2Kf+Hj1le8z9j1pxEG7ECY
+DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
+n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.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://idp.bth.se/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bth.se/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bth.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">bth.se</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
+MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCNOKwblSFiLSbItG/y118MRAXCguQJ4e7t+/e4bYhD
+fl9Qs5gTx3QJxXRgjISLrha44rc+awS6fr4In3N61ijS/X4Q0qrD5BszzCUw2Lni
+YITovYjH9wzZ3oOt5k67rtXoDL98B+Xqbh/M8lOXkcKba3Slsbz/QKg5Qf6ZCebc
+76rl3J3fM6ebYOyiCseCVTn+avpbqNKMi7sY6vfKDIo/zCkN3ZntH4ibGOi0j9z4
+5NlHLtWLShfwF/QLLKjd2alHTbyBjdDe22li9apxZB3LhZXFVGdYqBCJu0OBeFDP
+ZA4ZSWoxXMqxDbbJofMMbHysc7teqG3mJyDm/FL6hXH/AgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5idGguc2WGIWh0dHBzOi8vaWRwLmJ0aC5zZS9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUtNB3i29Xb36JeEa7RhFXM4OYTYYwDQYJKoZIhvcNAQEF
+BQADggEBAEGhHaZmmHhnfrsYc/trO15JWt5hU/UC9J7xhiF2iIk41ymeX+gvm6n5
+h2f4/xEgvmBwV6WM+BlQE+weK+nQNceV+aAO51xTM828O9SrmZ9ZPkw7+TxGiVdM
+SnxSTRcEWngxpJ+CGpgzy1SgV7WqO2NszSP+XRRJHjb0Aw39iKLP+yfvGdR71lu/
+2WPhhxaK7wun8loJJC2WI4ORwsh3mJoYZcVEIOXe/H2Kf+Hj1le8z9j1pxEG7ECY
+DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
+n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.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">BTH</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
+ </Organization>
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <GivenName>Tom</GivenName>
+ <SurName>Martinsson</SurName>
+ <EmailAddress>tom.martinsson@bth.se</EmailAddress>
+ </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index daddee88..b54149d4 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"?>
-<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="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
@@ -15,18 +20,14 @@
<mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
</mdui: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>
- <ds:X509Data>
- <ds:X509Certificate>MIIEvjCCA6agAwIBAgIRANzJo7X5SEmbvBstb88M+4kwDQYJKoZIhvcNAQEFBQAw
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEvjCCA6agAwIBAgIRANzJo7X5SEmbvBstb88M+4kwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMTEyMjEwMDAwMDBaFw0xMzEyMjAyMzU5NTlaMIGBMQswCQYD
VQQGEwJGSTEQMA4GA1UECBMHVXVzaW1hYTEOMAwGA1UEBxMFRXNwb28xKTAnBgNV
@@ -52,29 +53,29 @@ YNFbjK64dwCnMNGfVw1zepuRBVE0BLklgn8wqQf6yKj1HzOB6UT4UUABt71zrdcS
yv274zsJoe2SU6+POX6wH82lz5Vc9BkxLE8vBSGB78n4BFKSdEPRWIYkeq7Kwk8L
MwFER9iEtf/HEH+CmxYoqZCr/mm7FduiAyOdQ+AZrQgvFP2c5sqxqhAwQyrW9eU/
yDPlRNL+S5OBIx61TJQTJ1DZ</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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </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.dfn.de.xml b/swamid-interfederations-2.0/idp.dfn.de.xml
index aef8cbe1..74ec79e4 100644
--- a/swamid-interfederations-2.0/idp.dfn.de.xml
+++ b/swamid-interfederations-2.0/idp.dfn.de.xml
@@ -1,62 +1,25 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn.de/idp/shibboleth">
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T18:20: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>
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-08-10T13:32:27Z">
+ <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">dfn.de</saml1md:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="de">DFN</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">DFN</mdui:DisplayName>
- <mdui:Description xml:lang="de">DFN Identity Provider für DFN-MitarbeiterInnen</mdui:Description>
- <mdui:Description xml:lang="en">The DFN Identity Provider is used by DFN staff members.</mdui:Description>
- <mdui:Logo height="81" width="180">https://www.aai.dfn.de/fileadmin/templates/main/images/logo.jpg</mdui:Logo>
+ <mdui:DisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">German National Research and Education Network</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Föderations-Login für MitarbeiterInnen des DFN-Vereins</mdui:Description>
+ <mdui:Description xml:lang="en">Federation login for DFN staff members</mdui:Description>
+ <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
+ <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">http://www.dfn.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.dfn.de/en/</mdui:InformationURL>
</mdui:UIInfo>
</Extensions>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idp.dfn.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEDR/jMzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0ZWxs
-ZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0wODEwMjMxMTUz
-MDdaFw0xMzEwMjIxMTUzMDdaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4t
-VmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRMwEQYDVQQDEwppZHAu
-ZGZuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzTWL0k7ANsvg
-boiSQK6IbJXcuxb4lrcs3uKdJvQlKAH4oWu/oY+g/xqERlOqftjL3g36F979O+pF
-567VjG40X2XULfZ/BnKlk5nFPshgUUAY1d5ppc7QooyBWdISIyfxjEX9DKlFJ9P4
-TflqX6m9jWxx8nXokP5foewJrV5HpxYsv1W6t0AbxN4PB8rr60g2ip7ZH9Cu6Rh4
-EsG0kxhV59jewU8re0nRaRFl8Lgarj8EHTHq55C1N0tZyChmxnGYOsDX/bhon4KY
-6wHP94fTUN5O3z+cd4drDD+rfRBq/6sLVLfYz9rn5b0MFsglTrneaLEA46iVHt8L
-o0G5etpxAQIDAQABo4IB2zCCAdcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRQGdtpn+tg3/5k
-wx6PG/fkY367+zAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAdBgNV
-HREEFjAUgRJob3RsaW5lQGFhaS5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZl
-cmVpbi1ncy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCB
-mjBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWlu
-LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAMVD5IkagXQC9CeMLaumWt9r
-6smb/4qonPlNUACp3Dbr/QAnZvNj6haJgGKJ7YpFnijXaq6AtsMUsQ3iOLjHodDP
-IhGUv0Q+GuuSr+jmNsRST81UkrJm+wUk5R3jQMTOIWD3qdqV7g4y5xZB/7Xt1ItJ
-wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
-1PbZw1Cy1bYxzecOAzRI1rSivyDMPW0YC79qCB/8QssLbU8pjfyfBNQui28ZkIst
-3wRjq+vPHe87TOxiDI4QR9IBwMIk6zTL67iH35se5LUp+qdvAtWBLf0/iYNwVWY=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>idp.dfn.de</ds:KeyName>
@@ -107,42 +70,6 @@ wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
<Extensions>
<saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
</Extensions>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idp.dfn.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEDR/jMzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0ZWxs
-ZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0wODEwMjMxMTUz
-MDdaFw0xMzEwMjIxMTUzMDdaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4t
-VmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRMwEQYDVQQDEwppZHAu
-ZGZuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzTWL0k7ANsvg
-boiSQK6IbJXcuxb4lrcs3uKdJvQlKAH4oWu/oY+g/xqERlOqftjL3g36F979O+pF
-567VjG40X2XULfZ/BnKlk5nFPshgUUAY1d5ppc7QooyBWdISIyfxjEX9DKlFJ9P4
-TflqX6m9jWxx8nXokP5foewJrV5HpxYsv1W6t0AbxN4PB8rr60g2ip7ZH9Cu6Rh4
-EsG0kxhV59jewU8re0nRaRFl8Lgarj8EHTHq55C1N0tZyChmxnGYOsDX/bhon4KY
-6wHP94fTUN5O3z+cd4drDD+rfRBq/6sLVLfYz9rn5b0MFsglTrneaLEA46iVHt8L
-o0G5etpxAQIDAQABo4IB2zCCAdcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRQGdtpn+tg3/5k
-wx6PG/fkY367+zAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAdBgNV
-HREEFjAUgRJob3RsaW5lQGFhaS5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZl
-cmVpbi1ncy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCB
-mjBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWlu
-LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAMVD5IkagXQC9CeMLaumWt9r
-6smb/4qonPlNUACp3Dbr/QAnZvNj6haJgGKJ7YpFnijXaq6AtsMUsQ3iOLjHodDP
-IhGUv0Q+GuuSr+jmNsRST81UkrJm+wUk5R3jQMTOIWD3qdqV7g4y5xZB/7Xt1ItJ
-wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
-1PbZw1Cy1bYxzecOAzRI1rSivyDMPW0YC79qCB/8QssLbU8pjfyfBNQui28ZkIst
-3wRjq+vPHe87TOxiDI4QR9IBwMIk6zTL67iH35se5LUp+qdvAtWBLf0/iYNwVWY=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>idp.dfn.de</ds:KeyName>
@@ -186,9 +113,9 @@ wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
- <OrganizationName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationName>
- <OrganizationName xml:lang="en">German National Research and Education Network, DFN</OrganizationName>
- <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationDisplayName>
+ <OrganizationName xml:lang="de">e15</OrganizationName>
+ <OrganizationName xml:lang="en">e15</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</OrganizationDisplayName>
<OrganizationURL xml:lang="de">http://www.dfn.de</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.dfn.de/en/</OrganizationURL>
@@ -204,8 +131,8 @@ wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
<EmailAddress>hotline@aai.dfn.de</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
- <GivenName>Wolfgang</GivenName>
- <SurName>Pempe</SurName>
+ <GivenName>DFN-AAI</GivenName>
+ <SurName>Hotline</SurName>
<EmailAddress>hotline@aai.dfn.de</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index e91c74e9..f92c5390 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,298 +1,303 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.feide.no">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">aal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">agdenes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">aho.no</shibmd:Scope>
- <shibmd:Scope regexp="false">alstahaug.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">aremark.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">arendal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">as-skole.no</shibmd:Scope>
- <shibmd:Scope regexp="false">askim.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">askoy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">asnes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">aure.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">austagderfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">austrheim.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">averoy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">baerum.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">balestrand.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bamble.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bergensskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bremanger.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">diakonhjemmet.no</shibmd:Scope>
- <shibmd:Scope regexp="false">dmmh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">donna.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">drammen.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">eid.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">eideskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">eidfjord.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">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.kg.vgs.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.mosseskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.oknett.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.osen.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.rade.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.rissa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.roan.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.roros.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.rygge.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.sarpsborg.com</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.skedsmo.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.stord.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.stranda.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.trysil.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">flesberg.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">flora.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">forsand.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">frogn.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">froland.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">frosta.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">froya.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fusa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">giske.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gjemnes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gloppen.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gol.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">granvin.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">grimstad.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">grong.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gs.alesund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gs.skodje.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gs.sula.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ha.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hadsel.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">haldenskole.no</shibmd:Scope>
- <shibmd:Scope regexp="false">halsa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hdh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
- <shibmd:Scope regexp="false">hemnegs.fronter.com</shibmd:Scope>
- <shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hials.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hib.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hibu.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hifm.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hig.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hih.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hihm.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hil.no</shibmd:Scope>
- <shibmd:Scope regexp="false">himolde.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hin.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hinesna.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hint.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hioa.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hiof.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hisf.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hist.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hit.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hitra.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hive.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hivolda.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hjartdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hjelmeland.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hobol.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hol.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hornindal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">horten.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hoylandet.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hsh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
- <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
- <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
- <shibmd:Scope regexp="false">klabu.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kongsberg.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kristiansand.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kristiansund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kvam.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ldh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">leikanger.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">leirfjord.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">lierne.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">lyngdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">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">nes-bu.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nesset.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nhh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nih.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nith.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nla.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nmh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">notodden.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">notteroy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ntfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ntnu.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nvh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oddaskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oksnes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oppdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oppland.org</shibmd:Scope>
- <shibmd:Scope regexp="false">os-ho.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">osteroy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ovgs.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oygarden.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">phs.no</shibmd:Scope>
- <shibmd:Scope regexp="false">radoy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rana.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">randaberg.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rauma.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rennebu.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rogfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rollag.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">romskog.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">royken.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">royrvik.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">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">smola.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">snasa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">snillfjord.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">sogndal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">sola.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
- <shibmd:Scope regexp="false">stavanger.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">steinkjer.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">stfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">stjordal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">stpaul.no</shibmd:Scope>
- <shibmd:Scope regexp="false">strand.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">stryn.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">suldal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">sund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">sunndal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">surnadal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">svelvik.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">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">vagan.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vagsoy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vaksdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">valer-of.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vang.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vestby.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
- <shibmd:Scope regexp="false">voss.kommune.no</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIDhjCCAm4CCQCMHNhxUI2H1TANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0wODA5MDUxMTU0MzNaFw0xODA3MTUxMTU0MzNaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4fTsmIsKVGtniXddnerSeiLeAZAlAOL8v+ebzVzYcpTJzMHrplD+lF2tXxRgs7IGEw3t2zRCtxnGbiGkXPW+oCs4T989z+Sq8nh7Lff/XlyK+jQ7BtfC8RUYQ+eNEQy0Fif+81JyPbiwZovbiL4WrK1GOG81/2CF7rvwyXJkDD1YXJ5W18/c06YLfYJjuzZgEoCVRq6ecgQyPKg1xwIpW2GpkKOBXA7oKWtev+xcmSiLZwZE96mSHjty0L+wW6NUuf2/8VSCc4IED0EbzqFUoeHuGXqPak+tu9+VpP6vmmyp4gSCxsmWtoKm7UC8P1QeCyZxwQaoGlIp78wsE5ao5wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQACUWuuirUSwDWksdkwKuqsNttnNmivwUMLtKDjHbMcwVK/b4qWjrAjfmJXxamUSYlnGjeoiqSQQuc3/qHCPAZUnN8VqXcZUCBXWjMO7Y/AnnsFKHpkYm51jWckjudeyfUr4UnH7te0OuUrGRIVrRRg3DqLdgrcbkJ98JyT97hnaDMke4qNVwrQFF+yvxYs1aYkILySBB/KPGSTh5sxJovcyWd7GY4ad5nH5oEjXF1yZzndmUuHGlTTzk6SGzmUJgqKyba+KJ/jauy6qNC1gPqfnbntWKDkE9a9ow8tlsi3jHI9AZu9U6LnOvTJ8MjhyXOEByCaDnTpK8JiZr6JvCaV</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SingleLogoutService.php"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationName>
- <md:OrganizationName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
- <md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Feide Support</md:GivenName>
- <md:EmailAddress>support@feide.no</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Feide Support</md:GivenName>
- <md:EmailAddress>support@feide.no</md:EmailAddress>
- </md:ContactPerson>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.feide.no">
+<md:Extensions>
+<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2012-10-09T13:08:24Z">
+<mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+</mdrpi:RegistrationInfo>
+</md:Extensions>
+<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:Extensions>
+<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+<mdui:DisplayName xml:lang="en">Feide</mdui:DisplayName>
+<mdui:DisplayName xml:lang="no">Feide</mdui:DisplayName>
+<mdui:DisplayName xml:lang="nn">Feide</mdui:DisplayName>
+<mdui:Description xml:lang="en">Feide is the login system for norwegian educational and research institusions.</mdui:Description>
+<mdui:Description xml:lang="no">Feide er innloggingssiden for norske utdannings- og forskningsinstitusjoner.</mdui:Description>
+<mdui:Description xml:lang="nn">Feide er innloggingssida for norske utdannings- og forskningsinstitusjonar.</mdui:Description>
+</mdui:UIInfo>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agdenes.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aho.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alstahaug.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aremark.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">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">austrheim.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">averoy.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baerum.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balestrand.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bamble.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bergensskolen.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfk.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bibsys.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bokn.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bomlo.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bremanger.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonhjemmet.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmmh.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">donna.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drammen.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eid.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eideskolen.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidfjord.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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.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.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.rade.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rissa.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roan.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roros.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rygge.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.sarpsborg.com</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.skedsmo.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stord.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stranda.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.trysil.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flaa.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flesberg.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flora.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forsand.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frana.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frogn.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">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">ha.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadsel.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haldenskole.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halsa.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hdh.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnegs.fronter.com</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnes.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemsedal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy-no.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hfk.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hials.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hib.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hibu.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hifm.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hih.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hihm.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hil.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">himolde.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hin.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinesna.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hint.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hioa.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiof.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hisf.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hist.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hit.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hitra.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hive.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hivolda.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoylandet.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsh.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karmoyskolen.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khib.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khio.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klabu.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsberg.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansand.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansund.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvam.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvinnherad.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">lierne.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillesand.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lindas.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luster.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngdal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">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">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">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">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">sor-aurdal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorum.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spusers.feide.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stavanger.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">steinkjer.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfk.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stjordal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stpaul.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strand.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stryn.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suldal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sund.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunndal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surnadal.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svelvik.kommune.no</shibmd:Scope>
+<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:X509Data>
+<ds:X509Certificate>MIIDhjCCAm4CCQCMHNhxUI2H1TANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0wODA5MDUxMTU0MzNaFw0xODA3MTUxMTU0MzNaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4fTsmIsKVGtniXddnerSeiLeAZAlAOL8v+ebzVzYcpTJzMHrplD+lF2tXxRgs7IGEw3t2zRCtxnGbiGkXPW+oCs4T989z+Sq8nh7Lff/XlyK+jQ7BtfC8RUYQ+eNEQy0Fif+81JyPbiwZovbiL4WrK1GOG81/2CF7rvwyXJkDD1YXJ5W18/c06YLfYJjuzZgEoCVRq6ecgQyPKg1xwIpW2GpkKOBXA7oKWtev+xcmSiLZwZE96mSHjty0L+wW6NUuf2/8VSCc4IED0EbzqFUoeHuGXqPak+tu9+VpP6vmmyp4gSCxsmWtoKm7UC8P1QeCyZxwQaoGlIp78wsE5ao5wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQACUWuuirUSwDWksdkwKuqsNttnNmivwUMLtKDjHbMcwVK/b4qWjrAjfmJXxamUSYlnGjeoiqSQQuc3/qHCPAZUnN8VqXcZUCBXWjMO7Y/AnnsFKHpkYm51jWckjudeyfUr4UnH7te0OuUrGRIVrRRg3DqLdgrcbkJ98JyT97hnaDMke4qNVwrQFF+yvxYs1aYkILySBB/KPGSTh5sxJovcyWd7GY4ad5nH5oEjXF1yZzndmUuHGlTTzk6SGzmUJgqKyba+KJ/jauy6qNC1gPqfnbntWKDkE9a9ow8tlsi3jHI9AZu9U6LnOvTJ8MjhyXOEByCaDnTpK8JiZr6JvCaV</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SingleLogoutService.php"/>
+<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
+</md:IDPSSODescriptor>
+<md:Organization>
+<md:OrganizationName xml:lang="en">Feide</md:OrganizationName>
+<md:OrganizationName xml:lang="no">Feide</md:OrganizationName>
+<md:OrganizationDisplayName xml:lang="en">Feide</md:OrganizationDisplayName>
+<md:OrganizationDisplayName xml:lang="no">Feide</md:OrganizationDisplayName>
+<md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
+<md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
+</md:Organization>
+<md:ContactPerson contactType="technical">
+<md:GivenName>Feide Support</md:GivenName>
+<md:EmailAddress>support@feide.no</md:EmailAddress>
+</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.georgikon.hu.xml b/swamid-interfederations-2.0/idp.georgikon.hu.xml
index f89b3a19..52b6bef6 100644
--- a/swamid-interfederations-2.0/idp.georgikon.hu.xml
+++ b/swamid-interfederations-2.0/idp.georgikon.hu.xml
@@ -3,6 +3,7 @@
<Extensions>
<ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">georgikon</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-test</ns9:MetadataSet>
<ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
<ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
diff --git a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
index 1e112127..2221cc68 100644
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
@@ -1,17 +1,29 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://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>
- <ds:X509Data>
- <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+<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">Idenity-Provider des Institut für Deutsche Sprache</mdui:Description>
+ <mdui:Description xml:lang="en">Idenity-Provider of the Institut für Deutsche Sprache</mdui:Description>
+ <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
MTgxNDI4MTVaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
@@ -37,37 +49,86 @@ bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-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>
+99YJ9IIzYQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </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</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache</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>schonefeld@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Andreas</GivenName>
+ <SurName>Witt</SurName>
+ <EmailAddress>witt@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Oliver</GivenName>
+ <SurName>Schonefeld</SurName>
+ <EmailAddress>schonefeld@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lrz.de.xml b/swamid-interfederations-2.0/idp.lrz.de.xml
index d5d0bc6b..f2e7da06 100644
--- a/swamid-interfederations-2.0/idp.lrz.de.xml
+++ b/swamid-interfederations-2.0/idp.lrz.de.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lrz.de/idp/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T10:07:24Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T12:36: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>
</Extensions>
@@ -10,11 +10,13 @@
<Extensions>
<saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lrz.de</saml1md:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="de">LRZ</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">LRZ</mdui:DisplayName>
- <mdui:Description xml:lang="de">Der LRZ Identity Provider bedient Benutzer und Mitarbeiter des Leibniz-Rechenzentrums, insb. auch Supercomputing-Kunden</mdui:Description>
- <mdui:Description xml:lang="en">The LRZ Identity Provider is used by staff members and users of Leibniz Supercomputing Centre, especially users of supercomputing systems.</mdui:Description>
- <mdui:Logo height="108" width="100">https://idp.lrz.de/idp/images/lrzlogo.jpg</mdui:Logo>
+ <mdui:DisplayName xml:lang="de">Leibniz-Rechenzentrum (LRZ)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ)</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Der LRZ Identity Provider bedient Benutzer und Mitarbeiter des Leibniz-Rechenzentrums, insb. auch Supercomputing-Kunden</mdui:Description>
+ <mdui:Description xml:lang="en">The LRZ Identity Provider is used by staff members and users of Leibniz Supercomputing Centre, especially users of supercomputing systems.</mdui:Description>
+ <mdui:Logo height="60" width="80">https://idp.lrz.de/idp/images/lrzlogo.jpg</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">http://www.lrz-muenchen.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.lrz-muenchen.de</mdui:InformationURL>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="encryption">
@@ -195,10 +197,10 @@ t0kVopfGsEIT142DrBwPmGvPGmU=
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
- <OrganizationName xml:lang="de">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</OrganizationName>
- <OrganizationName xml:lang="en">Leibniz Supercomputing Centre (LRZ) of the Bavarian Academy of Sciences and Humanities</OrganizationName>
- <OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum (LRZ)</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ)</OrganizationDisplayName>
+ <OrganizationName xml:lang="de">e38</OrganizationName>
+ <OrganizationName xml:lang="en">e38</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ) of the Bavarian Academy of Sciences and Humanities</OrganizationDisplayName>
<OrganizationURL xml:lang="de">http://www.lrz-muenchen.de</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.lrz.de/english/</OrganizationURL>
</Organization>
@@ -212,4 +214,9 @@ t0kVopfGsEIT142DrBwPmGvPGmU=
<SurName>Ebner</SurName>
<EmailAddress>shibboleth@lrz.de</EmailAddress>
</ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Ralf</GivenName>
+ <SurName>Ebner</SurName>
+ <EmailAddress>shibboleth@lrz.de</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nordu.net.xml b/swamid-interfederations-2.0/idp.nordu.net.xml
index f8e60ab8..33b00aa2 100644
--- a/swamid-interfederations-2.0/idp.nordu.net.xml
+++ b/swamid-interfederations-2.0/idp.nordu.net.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">NORDUnet</mdui:DisplayName>
<mdui:Description xml:lang="en">The NORDUnet A/S Identity Provider is used by employees and guests of NORDUnet.</mdui:Description>
- <mdui:Logo height="46" width="203" xml:lang="en">http://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
+ <mdui:Logo height="46" width="203" xml:lang="en">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DomainHint>nordu.net</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml b/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml
new file mode 100644
index 00000000..522d1f19
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<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://idp.puc-campinas.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">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:DisplayName>
+ <mdui:Description xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:Description>
+ <mdui:Description xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.puc-campinas.edu.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVAJSO0SM+Bh0UWKa6+hSykXbtplWuMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyMB4XDTEzMDEy
+NDE2NDg0NloXDTMzMDEyNDE2NDg0NlowIjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1w
+aW5hcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzaOH3
+wge0VzZfPtu24lXVFIvA3QQDptndcnpveFvwc9vXXiIKXVwLZvhfbLoKD2h13YCk
+6mqM/FzjyzpCx9fIZOUpTfekIIafVY1t0qcfpFVPkiNVdJMPy+UO0wXNcqv28dvT
+CrSFQnWhXT6pPfV38W0ql/m5l5VD1SOgkyn/XLHkBJiqKfGhymnfMCi+m+gB/SDt
+pH12yiDu1NABLZ1+CZJ6iJeCx4cpBQO9gZL/bOc2jVWuCfT8pECjh1t6CKmamBsm
+VUDs+61fMFsbwXB4uSnS2peqYXN3nBmebgc0V4TWPYhoDnIeyCYoRr1ClE+zIVPB
+GowmO38b4JXrFdq5AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC5wdWMtY2FtcGlu
+YXMuZWR1LmJyhi5odHRwczovL2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSMWdZ868b6RC9YFla5viyRnnZWmzANBgkqhkiG
+9w0BAQUFAAOCAQEAHBJZu7pwvM/QSpf19x6Duw1OCiKu5cGtP+iC6xjDOZrqcwe6
+CfDAWMc8QvwE0P+WhMMXGbsgDhpWGlTw1LrLY3JP7RCFXVAz9veNFjHukrOntumf
+2PDGiAle86ileOhbT9LlsgiVJECXYcL1VcTVgW4VsNRCSmr3OFDGFyrh6hgrBh9U
+BxvO3M9e0h4+8bVKxgQx1OC1GN41ryS2VvWSrgtORvXi+31ejIHlg4y4n6rK6+dW
+zy2FBUkaE8BwZlBgpAnYA2xtJKD4Di3266o9DtsYAKWrZh5SKr379PlFAOGlYgg6
+k/H7oMTExUQohJGKRTPBshsdHdv5MexHA+SxWw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.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://idp.puc-campinas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.puc-campinas.edu.br/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.puc-campinas.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>
+
+MIIDSDCCAjCgAwIBAgIVAJSO0SM+Bh0UWKa6+hSykXbtplWuMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyMB4XDTEzMDEy
+NDE2NDg0NloXDTMzMDEyNDE2NDg0NlowIjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1w
+aW5hcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzaOH3
+wge0VzZfPtu24lXVFIvA3QQDptndcnpveFvwc9vXXiIKXVwLZvhfbLoKD2h13YCk
+6mqM/FzjyzpCx9fIZOUpTfekIIafVY1t0qcfpFVPkiNVdJMPy+UO0wXNcqv28dvT
+CrSFQnWhXT6pPfV38W0ql/m5l5VD1SOgkyn/XLHkBJiqKfGhymnfMCi+m+gB/SDt
+pH12yiDu1NABLZ1+CZJ6iJeCx4cpBQO9gZL/bOc2jVWuCfT8pECjh1t6CKmamBsm
+VUDs+61fMFsbwXB4uSnS2peqYXN3nBmebgc0V4TWPYhoDnIeyCYoRr1ClE+zIVPB
+GowmO38b4JXrFdq5AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC5wdWMtY2FtcGlu
+YXMuZWR1LmJyhi5odHRwczovL2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSMWdZ868b6RC9YFla5viyRnnZWmzANBgkqhkiG
+9w0BAQUFAAOCAQEAHBJZu7pwvM/QSpf19x6Duw1OCiKu5cGtP+iC6xjDOZrqcwe6
+CfDAWMc8QvwE0P+WhMMXGbsgDhpWGlTw1LrLY3JP7RCFXVAz9veNFjHukrOntumf
+2PDGiAle86ileOhbT9LlsgiVJECXYcL1VcTVgW4VsNRCSmr3OFDGFyrh6hgrBh9U
+BxvO3M9e0h4+8bVKxgQx1OC1GN41ryS2VvWSrgtORvXi+31ejIHlg4y4n6rK6+dW
+zy2FBUkaE8BwZlBgpAnYA2xtJKD4Di3266o9DtsYAKWrZh5SKr379PlFAOGlYgg6
+k/H7oMTExUQohJGKRTPBshsdHdv5MexHA+SxWw==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.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">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationName>
+ <OrganizationName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.puc-campinas.edu.br/</OrganizationURL>
+ <OrganizationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</OrganizationURL>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <SurName>Carlos Cesar Braga</SurName>
+ <EmailAddress>cesar@puc-campinas.edu.br</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.renater.fr.xml b/swamid-interfederations-2.0/idp.renater.fr.xml
index eb1d57be..4edb5b2f 100644
--- a/swamid-interfederations-2.0/idp.renater.fr.xml
+++ b/swamid-interfederations-2.0/idp.renater.fr.xml
@@ -21,23 +21,23 @@
<ds:X509Data>
<ds:X509Certificate>
- MIIDJDCCAgygAwIBAgIVAKv1E4buzmYGim6/fryBXu75scNHMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5yZW5hdGVyLmZyMB4XDTEwMDkyODE1MTA1NFoX
-DTMwMDkyODE1MTA1NFowGTEXMBUGA1UEAxMOaWRwLnJlbmF0ZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1L99BMncXESNb36w5VjLZYX2wehxk
-nkmrMf1ZEtICtBC2ztmf6AyzKapEbFJz9bIJdaZyKNDdLeJq6d0pPTSLUB9Wuuwa
-bKojFoWB0KexAhxnuBeVGQUjSxCARPnT7XuxPPA8aB0jskjWaptFLGJlP/Dg6u0q
-4kEN93PM9K3Vc2bEc/gAdBKrGgajOPX2ygqratZd/Ud3NG6lKz+DkR5zhfdBmoOo
-Ups8gFlRECh8rR6NpFnQpwf8g1kGZVbMH0cv91N674Bj3KzfS2K9OhsUBM2CsL4c
-2gMh+DMBpDlrIqz71q44C1q3VHK8GGQFzOtYbPI7vVX28RCDtLAUlwP/AgMBAAGj
+ MIIDJDCCAgygAwIBAgIVAOKBqJWqJFq6T2dHTEfrhVJRssecMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5yZW5hdGVyLmZyMB4XDTEzMDMwMTEwMjUwNVoX
+DTMzMDMwMTEwMjUwNVowGTEXMBUGA1UEAxMOaWRwLnJlbmF0ZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo6i0pn7lTyN4PkneU7/zJAG4k0P/W
+vBzSmAnTQuNtq9z4GsZztrXofycWCF/ekQcWPOK17NNx1zcE28Fhun3/lNWjE+X+
+tDqoB14T5M2lOGdlk5JIuE6N240cuaZGQmvIvCgvup9ESEEDjdyx6V7KR1s5rz3n
+diaTygk2FU51vknOqoMvHWOZjp2tbYo7KVHrauxKxbXbVewmKcN8LKeRL+qZs5wQ
+5Yrd1/juM99r37kF+1QVVGa3/OQicHal1qJG+UNlH3FuUHu3TCmLxWP4WW1WtKCi
+BP+RIm/WHaWD7bPPDH/XTYLFfJqJ0ZbXLA92jlo1dZ7qhiehl7ubk2KRAgMBAAGj
YzBhMEAGA1UdEQQ5MDeCDmlkcC5yZW5hdGVyLmZyhiVodHRwczovL2lkcC5yZW5h
-dGVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQxueCim5oupES9j2rn+S2c
-cKK2EjANBgkqhkiG9w0BAQUFAAOCAQEALXt46iplGub8Ahmw7nTVfi1SJcfoZDQh
-i35NNcnSOx9xbKPI0NvLZmLqDsmVWJVCW2mUR8nS6R6vWoPH+Bg38UqqWd9WjktX
-38kXyLOVKr1+HNN1rdGDXe+qXeheZ8EYkmtR4aKqK7zkjgYfmd2G/7S5tL+GpTSx
-lTocl77yBB/Rw/MZFmVSomqUOiANNVy5cfbRYhsm7pn2yGDeT1a1o8rizJAUQyf0
-dlDov1adZuUaKuHY38rUasnC7mD1YX0W0tnzfg8D1St9OvyV6zD4ROPHrXXA3chN
-kK/P9Lxm8pMShufWoPHDDyzRHVWUq/JkLoQGz+vyOaYsjyqMmudTrw==
+dGVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQYy83Ve884R0jR3BqE159U
+zbFhDzANBgkqhkiG9w0BAQUFAAOCAQEAOxYs5vfum4LbmsePdGng6mKi8PFcpGKh
+dcFvxOxggLD1YX+R4C1MooN69a3Nf+YY1GzYZO8rUKd+3YL/BhJb0ouE31CzxwLP
+uXCctT3re8BW6GKy3JGju9H3sJ8AJUog3rHCegIJrA7PYarIAQUokEgCzaE5M/sT
+xY7nHrrdSo+QUQSyIYb/Ue7003/wr+8yRc42lx/hbHAcj9vIkrVvFpPCAg86rS0N
+Ber/c4EoBOTHkNkGxaFSWKA8trRJUecsobHum/jjuwwJBahR8Jvf+p0a0ADCrsqN
+JA+a0emlAOfEnZeRkpSunkghdezhsTvs0DB3QVZyrFRKmxA5IiORVg==
</ds:X509Certificate>
</ds:X509Data>
@@ -59,9 +59,11 @@ kK/P9Lxm8pMShufWoPHDDyzRHVWUq/JkLoQGz+vyOaYsjyqMmudTrw==
<Organization>
+
<OrganizationName xml:lang="en">RENATER</OrganizationName>
<OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://www.renater.fr</OrganizationURL>
+
</Organization>
diff --git a/swamid-interfederations-2.0/idp.student.bth.se.xml b/swamid-interfederations-2.0/idp.student.bth.se.xml
new file mode 100644
index 00000000..5f2a362f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.student.bth.se.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.student.bth.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">bth.se</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
+OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
+R/GuN73dy9gDYOtvgwtFJkVdQBuEGDvVYgD4WUzCnSSy5b4EGFwAaBLIfZ4UAL2c
+fWIWJknPrfSxFqR9dLJJo9hkHMX8VBumjhzYHVZqYSm/JVGh4GYewhQmRO0iSG9a
+it5fe6ZyVG67TduhnwzFC8azRSfIgnEjaRGP2qVEiUIbfuiRRr2J88rwxyxrYCa5
+ZVMLjR9wSBRqG8P+00UDolT3Q0lvawF3pj+kEbZ2p+Y6UxZHghHi5EKMkvy1OfKy
+RYkfxXbGk2JEXGcgb3MyRLmdZoqrH0BedH2udrwzOEGUdb/cElqmpFMOyZBdwEVO
+/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuc3R1ZGVudC5idGguc2WGKWh0dHBz
+Oi8vaWRwLnN0dWRlbnQuYnRoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRA
+vpCow9+jy11YKdmATEMN1KY1dTANBgkqhkiG9w0BAQUFAAOCAQEALbZz8voHJMiE
+Tjc7RYskFIOAx7k1fmPsF4kSdPyDK8RkyHBfGHa5uJ9wBh4w5BPCp9Wy7SY5+q/y
+E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
+0ahszKKVCL8v7ifCqxr1q2dbABB6GV9iwKHB+vfXLIp2Upt6+y3i5+iC1C8uXul0
+TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
+nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
+4NzN1iC8kg==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.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://idp.student.bth.se/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.student.bth.se/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.student.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.student.bth.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">bth.se</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
+OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
+R/GuN73dy9gDYOtvgwtFJkVdQBuEGDvVYgD4WUzCnSSy5b4EGFwAaBLIfZ4UAL2c
+fWIWJknPrfSxFqR9dLJJo9hkHMX8VBumjhzYHVZqYSm/JVGh4GYewhQmRO0iSG9a
+it5fe6ZyVG67TduhnwzFC8azRSfIgnEjaRGP2qVEiUIbfuiRRr2J88rwxyxrYCa5
+ZVMLjR9wSBRqG8P+00UDolT3Q0lvawF3pj+kEbZ2p+Y6UxZHghHi5EKMkvy1OfKy
+RYkfxXbGk2JEXGcgb3MyRLmdZoqrH0BedH2udrwzOEGUdb/cElqmpFMOyZBdwEVO
+/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuc3R1ZGVudC5idGguc2WGKWh0dHBz
+Oi8vaWRwLnN0dWRlbnQuYnRoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRA
+vpCow9+jy11YKdmATEMN1KY1dTANBgkqhkiG9w0BAQUFAAOCAQEALbZz8voHJMiE
+Tjc7RYskFIOAx7k1fmPsF4kSdPyDK8RkyHBfGHa5uJ9wBh4w5BPCp9Wy7SY5+q/y
+E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
+0ahszKKVCL8v7ifCqxr1q2dbABB6GV9iwKHB+vfXLIp2Upt6+y3i5+iC1C8uXul0
+TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
+nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
+4NzN1iC8kg==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.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">STUDENTS-BTH</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
+ </Organization>
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <GivenName>Tom</GivenName>
+ <SurName>Martinsson</SurName>
+ <EmailAddress>tom.martinsson@bth.se</EmailAddress>
+ </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.surfnet.nl.xml b/swamid-interfederations-2.0/idp.surfnet.nl.xml
index 23e1cc89..ec3517af 100644
--- a/swamid-interfederations-2.0/idp.surfnet.nl.xml
+++ b/swamid-interfederations-2.0/idp.surfnet.nl.xml
@@ -1,5 +1,10 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.surfnet.nl">
+ <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>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -39,8 +44,8 @@ fxLkDyGV/oQ=
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.surfnet.nl/federate/saml20/https%253A%252F%252Fidp.surfnet.nl"/>
</IDPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="en">SURFnet BV (new)</OrganizationName>
- <OrganizationDisplayName xml:lang="en">SURFnet BV (new)</OrganizationDisplayName>
+ <OrganizationName xml:lang="en">SURFnet BV</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">SURFnet BV</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.surffederatie.nl</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml
new file mode 100644
index 00000000..cac07baf
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<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://idp.utorauth.utoronto.ca/shibboleth">
+
+<Extensions>
+<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2013-05-23T00:00:00Z">
+<mdrpi:RegistrationPolicy xml:lang="en">
+http://www.canarie.ca/templates/services/docs/CAF_join_en.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">utoronto.ca</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of Toronto</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.utoronto.ca/about-uoft.htm</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>utoronto.ca</mdui:DomainHint>
+ </mdui:DiscoHints>
+
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDTDCCAjSgAwIBAgIVAKBtctYdDHOwvkS2Cae5mn6+SG12MA0GCSqGSIb3DQEB
+BQUAMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0aC51dG9yb250by5jYTAeFw0xMDAy
+MTcwNDM2MzZaFw0zMDAyMTcwNDM2MzZaMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0
+aC51dG9yb250by5jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANsi
+lyIZHSDZPNT7GJAnB6sydHDoezYsO5k6OqQaY1iVJnx8dFkY+mdI5zwmUgDV3LKY
+M+vh/1v1tDx/5G6eVPckZPn6WobTd+GQgwUsXFRGZ5svkHSxQhAzBuc4ltFAFXPI
+JnbgD29oukIE3S6YCo7pQBORbbizsoHbwZ2pzk1u6iEbf7DuiPy8i8+CjdHHs3BS
+wXJ9cG7Yah9ouXK8g44Jy6KqoFKhPckKbZfJ2reojSAQEZm4hu6Rn38PRSAIFJFb
+HFZlqDpvFnLwQXkrB1bcoWoePPRjwkUPWqPjOkqBmTgSRlitKNUpnrQMjzckTaVX
+70r73+hA2L0YbWp2Xt0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLnV0b3JhdXRo
+LnV0b3JvbnRvLmNhhi9odHRwczovL2lkcC51dG9yYXV0aC51dG9yb250by5jYS9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUrp0AR4X36F4QukpWTPrl7SpIVLUwDQYJ
+KoZIhvcNAQEFBQADggEBAJl0Wi8qk8D02AaPu0XdqoQekjvmZFyi6rcoCKDzCKWd
+jyuF+gqEPWIWg+Ee8zqVvx0XNXx6YqqU5WyXjp1vvcNTE33+kq8eCMGWHrpW+mwn
+FwMXexviS6z/TLsSMwTbbTb7G900iMl81B7++v9KkRzg5KSx3UILKr3t39hmf/nP
+v6q8Ut3UQ5EjnV5J+PTDePSSVhsauAqQgdXJk6e5D0Y6BOYQGKsncBvmmz3LRuEO
+JA6YHVtPjl1wNwGOMImUX4ZT0G0YAGrxx0VN7rU9RCGlLaasDFQCIuNrOOM94w6W
+x5P0oxvLtqiOA5Sbm0KW5p7Fpzig9Hm+7M5dxGJd0L0=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca: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.utorauth.utoronto.ca/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utorauth.utoronto.ca/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">utoronto.ca</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDTDCCAjSgAwIBAgIVAKBtctYdDHOwvkS2Cae5mn6+SG12MA0GCSqGSIb3DQEB
+BQUAMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0aC51dG9yb250by5jYTAeFw0xMDAy
+MTcwNDM2MzZaFw0zMDAyMTcwNDM2MzZaMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0
+aC51dG9yb250by5jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANsi
+lyIZHSDZPNT7GJAnB6sydHDoezYsO5k6OqQaY1iVJnx8dFkY+mdI5zwmUgDV3LKY
+M+vh/1v1tDx/5G6eVPckZPn6WobTd+GQgwUsXFRGZ5svkHSxQhAzBuc4ltFAFXPI
+JnbgD29oukIE3S6YCo7pQBORbbizsoHbwZ2pzk1u6iEbf7DuiPy8i8+CjdHHs3BS
+wXJ9cG7Yah9ouXK8g44Jy6KqoFKhPckKbZfJ2reojSAQEZm4hu6Rn38PRSAIFJFb
+HFZlqDpvFnLwQXkrB1bcoWoePPRjwkUPWqPjOkqBmTgSRlitKNUpnrQMjzckTaVX
+70r73+hA2L0YbWp2Xt0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLnV0b3JhdXRo
+LnV0b3JvbnRvLmNhhi9odHRwczovL2lkcC51dG9yYXV0aC51dG9yb250by5jYS9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUrp0AR4X36F4QukpWTPrl7SpIVLUwDQYJ
+KoZIhvcNAQEFBQADggEBAJl0Wi8qk8D02AaPu0XdqoQekjvmZFyi6rcoCKDzCKWd
+jyuF+gqEPWIWg+Ee8zqVvx0XNXx6YqqU5WyXjp1vvcNTE33+kq8eCMGWHrpW+mwn
+FwMXexviS6z/TLsSMwTbbTb7G900iMl81B7++v9KkRzg5KSx3UILKr3t39hmf/nP
+v6q8Ut3UQ5EjnV5J+PTDePSSVhsauAqQgdXJk6e5D0Y6BOYQGKsncBvmmz3LRuEO
+JA6YHVtPjl1wNwGOMImUX4ZT0G0YAGrxx0VN7rU9RCGlLaasDFQCIuNrOOM94w6W
+x5P0oxvLtqiOA5Sbm0KW5p7Fpzig9Hm+7M5dxGJd0L0=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca: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">University of Toronto</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University of Toronto</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.utoronto.ca/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Mike</GivenName>
+ <SurName>Wiseman</SurName>
+ <EmailAddress>mike.wiseman@utoronto.ca</EmailAddress>
+ </ContactPerson>
+
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml b/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml
index f2f3c18d..f4ba4c4a 100644
--- a/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml
+++ b/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml
@@ -10,8 +10,8 @@
<Extensions>
<shibmd:Scope regexp="false">cvut.cz</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">CTU in Prague</mdui:DisplayName>
- <mdui:DisplayName xml:lang="cs">ČVUT v Praze</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Czech Technical University in Prague</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze</mdui:DisplayName>
<mdui:Description xml:lang="en">Identity Provider for CTU in Prague</mdui:Description>
<mdui:Description xml:lang="cs">Identity Provider pro ČVUT v Praze</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.cvut.cz/en</mdui:InformationURL>
@@ -112,7 +112,7 @@
<OrganizationName xml:lang="cs">ČVUT</OrganizationName>
<OrganizationName xml:lang="en">CTU</OrganizationName>
<OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">Ceske vysoke uceni technicke v Praze</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Czech Technical University in Prague</OrganizationDisplayName>
<OrganizationURL xml:lang="cs">http://www.cvut.cz/cs</OrganizationURL>
<OrganizationURL xml:lang="en">http://www.cvut.cz/en</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/laife-idp.lanet.lv.xml b/swamid-interfederations-2.0/laife-idp.lanet.lv.xml
new file mode 100644
index 00000000..9ab8af0f
--- /dev/null
+++ b/swamid-interfederations-2.0/laife-idp.lanet.lv.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://laife-idp.lanet.lv">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIE0zCCAvICAQAwDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCTFYxDzANBgNV
+BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxDjAMBgNVBAsT
+BUxBTkVUMRswGQYDVQQDExJsYWlmZS1pZHAubGFuZXQubHYwHhcNMTMwMzA2MTIz
+MTIwWhcNMjMwMzA0MTIzMTIwWjBnMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0
+dmlhMQ0wCwYDVQQHEwRSaWdhMQswCQYDVQQKEwJMVTEOMAwGA1UECxMFTEFORVQx
+GzAZBgNVBAMTEmxhaWZlLWlkcC5sYW5ldC5sdjCCAeowDQYJKoZIhvcNAQEBBQAD
+ggHXADCCAdICggHJAqmEukkBNsZKvEyjT1GqHjnEEb3r3hV+rF8q5EVpq43ceFmY
+az+G4RzLatiYz36+3P+p7ygH8JJQS4N0tzvf+f++0HHNuwn3Ye9pPzbx9k0BwLxw
+/2In3G2qpmZILKO7O0a7g+RF9NGpyDg/h6Y3wuH/mKftYe3GGvHb0k9n1UK9nPKu
+BnY8DnxR/L6p/EK/PSAHDf+B8vqnym2gVeLa/3UUpH0Ael9mo+GUBcsvkRUrN/Wy
+QuHpB3TKVHH7I+gnLDholI+wIu+vHQ/Hhwe6pnq/ph1xoI/NZ4ffBvMDC/gVa/vA
+Qma4g4EvzujoeXJPKIYrKSQ1rmsHITLuHcas33vzsaPxlBVV1UFeX+9jxvtcHLTC
+0utFcZub4TJ/Ys8/FpxmhbxWRdE1JmEDcEYWyE1ubqWDFdRd9ziE8iI1BeIhnJE7
+OKQdEmlY/2mieGDRdAu/nIGzfybKHhht+IueIBan6nezjlG2DIUuFRPTnVPTTXAo
+itAbrueZ3jJK3KtHoqRkSoANHVvKSeKrFuXFk3o8/0gjK6XPkA1IMX/GSK7B0iXk
+tGpaAO25DWb/EpiBDv0QIJp36/tDzpMjYszsiPJTu4da0zmAnQIDAQABMA0GCSqG
+SIb3DQEBBAUAA4IBygAB6y6Da7AM88xoc+Uu/ZL/gsnRQ5/llUT81ZD5T1dx71Ds
++edMamrtL0uf0zCRWc8hhkn91ut9MNl6XCEVjDSL4+mhlr+i4uJjeSy/xZ1gQYps
+G0NwX0jMrCLw+/sqbZUxvfueb466br8q/bT4838WAsMRnHj5uFu+9sehlL+VXVT/
+iM9otoQIuvBY3SRVL6OV0KPjZO2dv2hK9QB7ar6TRAdNgCda+Fnnx7O56Jg2cc3M
+1CEWJXC5SGCGmqkcBvfa5XJndiLB3J2Lix5WuSryvI+Z/vB/Pd2ppCNvP6NL45+6
+RwT6S+jAos/eQhoefid2ONZhdUfsd0i5uq8E3VZvDoDbpCmxhTcAJNWCVKtWvjBJ
+P5ZOUL4M0KED41xkL3L1jhc14SdqHgbftPtkVuvXEu436GtwHBGD6mKv19JxZm26
+9jxgUzXXW189mznS/jWq1sVfU5Vjt5rRkZWT2Rcnyr+1QHtUnWrcwbJQ4/qC5PaH
+TyEueSY43VvJHl+WtZOLtCxNj4kWDulEYy6xqRdargHclwk9awkAMbP6QKfRaPUK
+74ng3Rk9KuvN5hoQV5oeWUNlkHsxlxoJCJzF+V5ywxYNtoeIi3W7
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIE0zCCAvICAQAwDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCTFYxDzANBgNV
+BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxDjAMBgNVBAsT
+BUxBTkVUMRswGQYDVQQDExJsYWlmZS1pZHAubGFuZXQubHYwHhcNMTMwMzA2MTIz
+MTIwWhcNMjMwMzA0MTIzMTIwWjBnMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0
+dmlhMQ0wCwYDVQQHEwRSaWdhMQswCQYDVQQKEwJMVTEOMAwGA1UECxMFTEFORVQx
+GzAZBgNVBAMTEmxhaWZlLWlkcC5sYW5ldC5sdjCCAeowDQYJKoZIhvcNAQEBBQAD
+ggHXADCCAdICggHJAqmEukkBNsZKvEyjT1GqHjnEEb3r3hV+rF8q5EVpq43ceFmY
+az+G4RzLatiYz36+3P+p7ygH8JJQS4N0tzvf+f++0HHNuwn3Ye9pPzbx9k0BwLxw
+/2In3G2qpmZILKO7O0a7g+RF9NGpyDg/h6Y3wuH/mKftYe3GGvHb0k9n1UK9nPKu
+BnY8DnxR/L6p/EK/PSAHDf+B8vqnym2gVeLa/3UUpH0Ael9mo+GUBcsvkRUrN/Wy
+QuHpB3TKVHH7I+gnLDholI+wIu+vHQ/Hhwe6pnq/ph1xoI/NZ4ffBvMDC/gVa/vA
+Qma4g4EvzujoeXJPKIYrKSQ1rmsHITLuHcas33vzsaPxlBVV1UFeX+9jxvtcHLTC
+0utFcZub4TJ/Ys8/FpxmhbxWRdE1JmEDcEYWyE1ubqWDFdRd9ziE8iI1BeIhnJE7
+OKQdEmlY/2mieGDRdAu/nIGzfybKHhht+IueIBan6nezjlG2DIUuFRPTnVPTTXAo
+itAbrueZ3jJK3KtHoqRkSoANHVvKSeKrFuXFk3o8/0gjK6XPkA1IMX/GSK7B0iXk
+tGpaAO25DWb/EpiBDv0QIJp36/tDzpMjYszsiPJTu4da0zmAnQIDAQABMA0GCSqG
+SIb3DQEBBAUAA4IBygAB6y6Da7AM88xoc+Uu/ZL/gsnRQ5/llUT81ZD5T1dx71Ds
++edMamrtL0uf0zCRWc8hhkn91ut9MNl6XCEVjDSL4+mhlr+i4uJjeSy/xZ1gQYps
+G0NwX0jMrCLw+/sqbZUxvfueb466br8q/bT4838WAsMRnHj5uFu+9sehlL+VXVT/
+iM9otoQIuvBY3SRVL6OV0KPjZO2dv2hK9QB7ar6TRAdNgCda+Fnnx7O56Jg2cc3M
+1CEWJXC5SGCGmqkcBvfa5XJndiLB3J2Lix5WuSryvI+Z/vB/Pd2ppCNvP6NL45+6
+RwT6S+jAos/eQhoefid2ONZhdUfsd0i5uq8E3VZvDoDbpCmxhTcAJNWCVKtWvjBJ
+P5ZOUL4M0KED41xkL3L1jhc14SdqHgbftPtkVuvXEu436GtwHBGD6mKv19JxZm26
+9jxgUzXXW189mznS/jWq1sVfU5Vjt5rRkZWT2Rcnyr+1QHtUnWrcwbJQ4/qC5PaH
+TyEueSY43VvJHl+WtZOLtCxNj4kWDulEYy6xqRdargHclwk9awkAMbP6QKfRaPUK
+74ng3Rk9KuvN5hoQV5oeWUNlkHsxlxoJCJzF+V5ywxYNtoeIi3W7
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife-idp.lanet.lv/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-Redirect" Location="https://laife-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">LAIFE</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Latvian Identity Federation - LAIFE IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://laife.lanet.lv/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>Administrator</SurName>
+ <EmailAddress>serviss@lanet.lv</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml b/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
new file mode 100644
index 00000000..2d521082
--- /dev/null
+++ b/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lanet-idp.lanet.lv">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lanet-idp.lanet.lv/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://lanet-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">LAIFE - LANET</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">LANET - LANET IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.lanet.lv/</OrganizationURL>
+ </Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml b/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml
new file mode 100644
index 00000000..5c76aab4
--- /dev/null
+++ b/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://liepu-idp.lanet.lv">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://liepu-idp.lanet.lv/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://liepu-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">LAIFE - LIEPU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Liepaja University - LIEPU IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.liepu.lv/</OrganizationURL>
+ </Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lma-idp.lanet.lv.xml b/swamid-interfederations-2.0/lma-idp.lanet.lv.xml
new file mode 100644
index 00000000..30be7fbc
--- /dev/null
+++ b/swamid-interfederations-2.0/lma-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lma-idp.lanet.lv">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lma-idp.lanet.lv/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://lma-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">LAIFE - LMA</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Art Academy of Latvia - LMA IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.lma.lv/</OrganizationURL>
+ </Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmuidp.lrz.de.xml b/swamid-interfederations-2.0/lmuidp.lrz.de.xml
index a8786f32..db9b2720 100644
--- a/swamid-interfederations-2.0/lmuidp.lrz.de.xml
+++ b/swamid-interfederations-2.0/lmuidp.lrz.de.xml
@@ -1,8 +1,22 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuidp.lrz.de/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-11-11T14:59:40Z">
+ <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">lmu.de</saml1md:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Universität München (LMU)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Universität of Munich (LMU)</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity-Provider für die LMU</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for LMU</mdui:Description>
+ <mdui:InformationURL xml:lang="de">https://lmuidp.lrz.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://lmuidp.lrz.de</mdui:InformationURL>
+ </mdui:UIInfo>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -101,13 +115,21 @@ OBzmQ6Dm9pv8U0O159CUXtw4TeXiKNL0+E7LXkVRkH4=
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
- <OrganizationName xml:lang="de">Universität München (Ludwig-Maximilians-Universität)</OrganizationName>
- <OrganizationDisplayName xml:lang="de">Universität München (LMU)</OrganizationDisplayName>
+ <OrganizationName xml:lang="de">e29</OrganizationName>
+ <OrganizationName xml:lang="en">e29</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
<OrganizationURL xml:lang="de">https://lmuidp.lrz.de</OrganizationURL>
+ <OrganizationURL xml:lang="en">https://lmuidp.lrz.de</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
<GivenName>Ralf</GivenName>
<SurName>Ebner</SurName>
<EmailAddress>shibboleth@lrz.de</EmailAddress>
</ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Helpdesk</GivenName>
+ <SurName>Helpdesk</SurName>
+ <EmailAddress>helpdesk@campus.lmu.de</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml b/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
new file mode 100644
index 00000000..3d6cd3e4
--- /dev/null
+++ b/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuza-idp.lanet.lv">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuza-idp.lanet.lv/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://lmuza-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">LAIFE - LMUZA</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Latvian Academy of Music - LMUZA IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.jvlma.lv/</OrganizationURL>
+ </Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login-idp.auth.gr.xml b/swamid-interfederations-2.0/login-idp.auth.gr.xml
index 38322578..9deb58f6 100644
--- a/swamid-interfederations-2.0/login-idp.auth.gr.xml
+++ b/swamid-interfederations-2.0/login-idp.auth.gr.xml
@@ -1,5 +1,15 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login-idp.auth.gr/idp/shibboleth">
+ <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+ <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">
+ http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
+ </mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">
+ http://aai.grnet.gr/static/policy/policy-el-1.1.0.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auth.gr</shibmd:Scope>
@@ -8,52 +18,40 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIIkzCCB3ugAwIBAgIFBAAAAMIwDQYJKoZIhvcNAQEFBQAwgdAxCzAJBgNVBAYT
- AkdSMS0wKwYDVQQKEyRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fsb25p
- a2kxKTAnBgNVBAsTIENlbnRyYWwgQ29tbXVuaWNhdGlvbiBGYWNpbGl0aWVzMUIw
- QAYDVQQDEzlBVVRIIE5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIgQ2VydGlmaWNh
- dGlvbiBBdXRob3JpdHkgUjMxIzAhBgkqhkiG9w0BCQEWFHBraWFkbWluQGNjZi5h
- dXRoLmdyMB4XDTExMDkyMzAwMDAwMFoXDTEzMDkyMjE2MDk1NVowfDELMAkGA1UE
- BhMCR1IxLTArBgNVBAoTJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxv
- bmlraTEiMCAGA1UECxMZTmV0d29yayBPcGVyYXRpb25zIENlbnRlcjEaMBgGA1UE
- AxMRbG9naW4taWRwLmF1dGguZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
- AoIBAQC+ub4Eq9JXomGbLQH+iK79IKxwUHsME2xjR1mmqXSUl2liRIV05Gm0HoMr
- 0aHq1KbqJPOvBJgho54WKbuzAcl+TJj0WKwEwU7/mxIp9EJm3ZeU8WA7BbRcIgeA
- pID7hIbqZGkf037EcBhJAB7uu0GyeWqTX4Lcn7CHa+9ICOtaPMkZaP64DH0JepbL
- Vnk9ryItNEYqQWPAfxe74WC8TAO5kb62WkmdCS0idprszscWqmQ6/MzgHyu8CwqH
- OUgTsiLoys6KSDZ3LbmbMHX6Gba1YK9Vey6vpt/9Qs/HyqHGQyjtqj9sO9VGYANR
- SPiDpnCp775oS29ZR877U1rcPND1AgMBAAGjggTFMIIEwTAMBgNVHRMBAf8EAjAA
- MBEGCWCGSAGG+EIBAQQEAwIGwDAOBgNVHQ8BAf8EBAMCBLAwHQYDVR0lBBYwFAYI
- KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSvyhlDN+SORfBDsHhowRRrgqac
- GjCBzwYDVR0jBIHHMIHEgBRSF0VvFteQCoBteXveYb70sU8536GBpKSBoTCBnjEL
- MAkGA1UEBhMCR1IxLTArBgNVBAoTJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRo
- ZXNzYWxvbmlraTE7MDkGA1UEAxMyQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhl
- c3NhbG9uaWtpIENlbnRyYWwgQ0EgUjIxIzAhBgkqhkiG9w0BCQEWFHBraWFkbWlu
- QGNjZi5hdXRoLmdyggUDAAAABTAfBgNVHRIEGDAWgRRwa2lhZG1pbkBjY2YuYXV0
- aC5ncjAzBggrBgEFBQcBAQQnMCUwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLnBr
- aS5hdXRoLmdyMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmx2MS5wa2kuYXV0
- aC5nci9BdXRoTm9jQ0FSMy9jcmx2MS5kZXIuY3JsMIGaBglghkgBhvhCAQ0EgYwW
- gYlUaGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gR3JlZWsgbGF3cyBhbmQg
- b3VyIENQUy4gVGhpcyBDZXJ0aWZpY2F0ZSBtdXN0IG9ubHkgYmUgdXNlZCBmb3Ig
- YWNhZGVtaWMsIHJlc2VhcmNoIG9yIGVkdWNhdGlvbmFsIHB1cnBvc2VzLjAzBglg
- hkgBhvhCAQIEJhYkaHR0cDovL2NybHYxLnBraS5hdXRoLmdyL0F1dGhOb2NDQVIz
- MCMGCWCGSAGG+EIBBAQWFhRuc19yZXZva2VfcXVlcnkucGhwPzA4BglghkgBhvhC
- AQgEKxYpaHR0cDovL3d3dy5wa2kuYXV0aC5nci9kb2N1bWVudHMvQ1BTLmh0bWww
- ggEgBgNVHSAEggEXMIIBEzCCAQ8GCysGAQQBvB0CAAIEMIH/MDQGCCsGAQUFBwIB
- FihodHRwOi8vd3d3LnBraS5hdXRoLmdyL2RvY3VtZW50cy9DUFMucGhwMIHGBggr
- BgEFBQcCAjCBuTArFiRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fsb25p
- a2kwAwIBARqBiVRoaXMgY2VydGlmaWNhdGUgaXMgc3ViamVjdCB0byBHcmVlayBs
- YXdzIGFuZCBvdXIgQ1BTLiBUaGlzIENlcnRpZmljYXRlIG11c3Qgb25seSBiZSB1
- c2VkIGZvciBhY2FkZW1pYywgcmVzZWFyY2ggb3IgZWR1Y2F0aW9uYWwgcHVycG9z
- ZXMuMIGNBgNVHREEgYUwgYKCEWxvZ2luLWlkcC5hdXRoLmdyghVsb2dpbi1pZHAu
- Y2NmLmF1dGguZ3KCFmxvZ2luLWlkcDEuY2NmLmF1dGguZ3KCEmxvZ2luLWlkcDEu
- YXV0aC5ncoIWbG9naW4taWRwMi5jY2YuYXV0aC5ncoISbG9naW4taWRwMi5hdXRo
- LmdyMA0GCSqGSIb3DQEBBQUAA4IBAQBqVHPY0PS4gew7NzazIfxmjX+H/Rt2rJaj
- tUU7YLZvATrNSlw2aZTrrDXSU+MtSe6cMEscRSI0ArjgBHKLkGj5Tb36cwk7+tl2
- G3QB+UKD222lgpc6N6ZV3b0pedHAceyOLC72JAcnC5lYNetwAinYyvdoPTAo7ONt
- WY4ylqx6U5RpsXkIPeV+oi3kyobofcrT68x5IGJ2HeDiDKV8PoSml5Q9SefeYPtT
- BuDLWKrDngbgJA50lChmftzrbWMcPAww7hfSLE2fQb2z/yRfhWuVVXgYla+FSWEO
- RtKkQNUCVIOqX1lF7CJy2Zr9IFLDNSk0H3wP+V8tUJUcoSbz6It6
+ MIIGWzCCBUOgAwIBAgIIG1Z4EQnPdKAwDQYJKoZIhvcNAQEFBQAwgasxCzAJBgNV
+ BAYTAkdSMS0wKwYDVQQKEyRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fs
+ b25pa2kxKTAnBgNVBAsTIENlbnRyYWwgQ29tbXVuaWNhdGlvbiBGYWNpbGl0aWVz
+ MUIwQAYDVQQDEzlBVVRIIE5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIgQ2VydGlm
+ aWNhdGlvbiBBdXRob3JpdHkgUjQwHhcNMTMwNTE0MDAwMDAwWhcNMTUwNTE0MTQ1
+ NTM5WjB8MQswCQYDVQQGEwJHUjEtMCsGA1UEChMkQXJpc3RvdGxlIFVuaXZlcnNp
+ dHkgb2YgVGhlc3NhbG9uaWtpMSIwIAYDVQQLExlOZXR3b3JrIE9wZXJhdGlvbnMg
+ Q2VudGVyMRowGAYDVQQDExFsb2dpbi1pZHAuYXV0aC5ncjCCASIwDQYJKoZIhvcN
+ AQEBBQADggEPADCCAQoCggEBAM3esjLA2btvgrriZ5knveWBBG16a7JKPMrhKW96
+ TlV2T7TaH9GgJa5Hdx4+sqQrpWNuW69LskLRS0gceGoLFr4XiJg3WmceHDi4JsSP
+ ptxI6bDPul9gzd8SMAQNs0EevTl2OgD+Y2NQWwOeK5mWliLkpfsHIS8acpP4FRaP
+ B4wXdic0cNAFXFDPo0uDk+Uho/HS9lYdWlj7SS9pU2/Csl6+s4jEkZZKQrMee36C
+ UeVcZ/qaKnpc4KwmUt81k9jTALw+ussILGOyqHptWE+73cY8ZqZNjWa1W9yixC7i
+ B5wbaPrksRIi12kQkpHawcy87qsguonNtwpUsOSCsNJIce0CAwEAAaOCAq8wggKr
+ MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUF
+ BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUDDR6RWu0zGViF0VSdJnnS6sRkc8wHwYD
+ VR0jBBgwFoAUiUIEyKao9TzeZuew+Ol7zXJEKVUwMwYIKwYBBQUHAQEEJzAlMCMG
+ CCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjBDBgNVHR8EPDA6MDig
+ NqA0hjJodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aE5vY0NBUjQvY3JsdjEu
+ ZGVyLmNybDCCASAGA1UdIASCARcwggETMIIBDwYLKwYBBAG8HQIAAwUwgf8wNAYI
+ KwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1dGguZ3IvZG9jdW1lbnRzL0NQUy5w
+ aHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRo
+ ZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRv
+ IEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRoaXMgQ2VydGlmaWNhdGUgbXVzdCBv
+ bmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCByZXNlYXJjaCBvciBlZHVjYXRpb25h
+ bCBwdXJwb3Nlcy4wgY0GA1UdEQSBhTCBgoIRbG9naW4taWRwLmF1dGguZ3KCFWxv
+ Z2luLWlkcC5jY2YuYXV0aC5ncoIWbG9naW4taWRwMS5jY2YuYXV0aC5ncoISbG9n
+ aW4taWRwMS5hdXRoLmdyghZsb2dpbi1pZHAyLmNjZi5hdXRoLmdyghJsb2dpbi1p
+ ZHAyLmF1dGguZ3IwDQYJKoZIhvcNAQEFBQADggEBAMO/uLHG7tm+LB/+7s9hZtRU
+ d+nFqCLgaR3J9K7D82lnUwNhdEQNdKcxbkpPHIGA+bVGzDtIXkCBND/YUk+QyDzA
+ RJzSdxmGG0ijaB9q/XAYXAqBfyGzsoY52jV87oh0O0uDw8QSEDW0cklBSXW2+PJH
+ hM6l8fpMmxm/DomC3lLNuvNJ87NVgUjhT8zcpfM53GG9Ea5ufYVvPricGAvroOiG
+ o8n41D4gfgu0VRSKwk7eWYWWR8dlX5XOUAfNJ5HW1tlOiGJrrpGlw9+Y6IRZIV+/
+ sVhv+fssysDyJDxMW084OuOl0MAZZY7+gIOmlLD5I8xzBf6Y6tfKGHyQevU7VHg=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -75,52 +73,40 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIIkzCCB3ugAwIBAgIFBAAAAMIwDQYJKoZIhvcNAQEFBQAwgdAxCzAJBgNVBAYT
- AkdSMS0wKwYDVQQKEyRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fsb25p
- a2kxKTAnBgNVBAsTIENlbnRyYWwgQ29tbXVuaWNhdGlvbiBGYWNpbGl0aWVzMUIw
- QAYDVQQDEzlBVVRIIE5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIgQ2VydGlmaWNh
- dGlvbiBBdXRob3JpdHkgUjMxIzAhBgkqhkiG9w0BCQEWFHBraWFkbWluQGNjZi5h
- dXRoLmdyMB4XDTExMDkyMzAwMDAwMFoXDTEzMDkyMjE2MDk1NVowfDELMAkGA1UE
- BhMCR1IxLTArBgNVBAoTJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxv
- bmlraTEiMCAGA1UECxMZTmV0d29yayBPcGVyYXRpb25zIENlbnRlcjEaMBgGA1UE
- AxMRbG9naW4taWRwLmF1dGguZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
- AoIBAQC+ub4Eq9JXomGbLQH+iK79IKxwUHsME2xjR1mmqXSUl2liRIV05Gm0HoMr
- 0aHq1KbqJPOvBJgho54WKbuzAcl+TJj0WKwEwU7/mxIp9EJm3ZeU8WA7BbRcIgeA
- pID7hIbqZGkf037EcBhJAB7uu0GyeWqTX4Lcn7CHa+9ICOtaPMkZaP64DH0JepbL
- Vnk9ryItNEYqQWPAfxe74WC8TAO5kb62WkmdCS0idprszscWqmQ6/MzgHyu8CwqH
- OUgTsiLoys6KSDZ3LbmbMHX6Gba1YK9Vey6vpt/9Qs/HyqHGQyjtqj9sO9VGYANR
- SPiDpnCp775oS29ZR877U1rcPND1AgMBAAGjggTFMIIEwTAMBgNVHRMBAf8EAjAA
- MBEGCWCGSAGG+EIBAQQEAwIGwDAOBgNVHQ8BAf8EBAMCBLAwHQYDVR0lBBYwFAYI
- KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSvyhlDN+SORfBDsHhowRRrgqac
- GjCBzwYDVR0jBIHHMIHEgBRSF0VvFteQCoBteXveYb70sU8536GBpKSBoTCBnjEL
- MAkGA1UEBhMCR1IxLTArBgNVBAoTJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRo
- ZXNzYWxvbmlraTE7MDkGA1UEAxMyQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhl
- c3NhbG9uaWtpIENlbnRyYWwgQ0EgUjIxIzAhBgkqhkiG9w0BCQEWFHBraWFkbWlu
- QGNjZi5hdXRoLmdyggUDAAAABTAfBgNVHRIEGDAWgRRwa2lhZG1pbkBjY2YuYXV0
- aC5ncjAzBggrBgEFBQcBAQQnMCUwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLnBr
- aS5hdXRoLmdyMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmx2MS5wa2kuYXV0
- aC5nci9BdXRoTm9jQ0FSMy9jcmx2MS5kZXIuY3JsMIGaBglghkgBhvhCAQ0EgYwW
- gYlUaGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gR3JlZWsgbGF3cyBhbmQg
- b3VyIENQUy4gVGhpcyBDZXJ0aWZpY2F0ZSBtdXN0IG9ubHkgYmUgdXNlZCBmb3Ig
- YWNhZGVtaWMsIHJlc2VhcmNoIG9yIGVkdWNhdGlvbmFsIHB1cnBvc2VzLjAzBglg
- hkgBhvhCAQIEJhYkaHR0cDovL2NybHYxLnBraS5hdXRoLmdyL0F1dGhOb2NDQVIz
- MCMGCWCGSAGG+EIBBAQWFhRuc19yZXZva2VfcXVlcnkucGhwPzA4BglghkgBhvhC
- AQgEKxYpaHR0cDovL3d3dy5wa2kuYXV0aC5nci9kb2N1bWVudHMvQ1BTLmh0bWww
- ggEgBgNVHSAEggEXMIIBEzCCAQ8GCysGAQQBvB0CAAIEMIH/MDQGCCsGAQUFBwIB
- FihodHRwOi8vd3d3LnBraS5hdXRoLmdyL2RvY3VtZW50cy9DUFMucGhwMIHGBggr
- BgEFBQcCAjCBuTArFiRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fsb25p
- a2kwAwIBARqBiVRoaXMgY2VydGlmaWNhdGUgaXMgc3ViamVjdCB0byBHcmVlayBs
- YXdzIGFuZCBvdXIgQ1BTLiBUaGlzIENlcnRpZmljYXRlIG11c3Qgb25seSBiZSB1
- c2VkIGZvciBhY2FkZW1pYywgcmVzZWFyY2ggb3IgZWR1Y2F0aW9uYWwgcHVycG9z
- ZXMuMIGNBgNVHREEgYUwgYKCEWxvZ2luLWlkcC5hdXRoLmdyghVsb2dpbi1pZHAu
- Y2NmLmF1dGguZ3KCFmxvZ2luLWlkcDEuY2NmLmF1dGguZ3KCEmxvZ2luLWlkcDEu
- YXV0aC5ncoIWbG9naW4taWRwMi5jY2YuYXV0aC5ncoISbG9naW4taWRwMi5hdXRo
- LmdyMA0GCSqGSIb3DQEBBQUAA4IBAQBqVHPY0PS4gew7NzazIfxmjX+H/Rt2rJaj
- tUU7YLZvATrNSlw2aZTrrDXSU+MtSe6cMEscRSI0ArjgBHKLkGj5Tb36cwk7+tl2
- G3QB+UKD222lgpc6N6ZV3b0pedHAceyOLC72JAcnC5lYNetwAinYyvdoPTAo7ONt
- WY4ylqx6U5RpsXkIPeV+oi3kyobofcrT68x5IGJ2HeDiDKV8PoSml5Q9SefeYPtT
- BuDLWKrDngbgJA50lChmftzrbWMcPAww7hfSLE2fQb2z/yRfhWuVVXgYla+FSWEO
- RtKkQNUCVIOqX1lF7CJy2Zr9IFLDNSk0H3wP+V8tUJUcoSbz6It6
+ MIIGWzCCBUOgAwIBAgIIG1Z4EQnPdKAwDQYJKoZIhvcNAQEFBQAwgasxCzAJBgNV
+ BAYTAkdSMS0wKwYDVQQKEyRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fs
+ b25pa2kxKTAnBgNVBAsTIENlbnRyYWwgQ29tbXVuaWNhdGlvbiBGYWNpbGl0aWVz
+ MUIwQAYDVQQDEzlBVVRIIE5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIgQ2VydGlm
+ aWNhdGlvbiBBdXRob3JpdHkgUjQwHhcNMTMwNTE0MDAwMDAwWhcNMTUwNTE0MTQ1
+ NTM5WjB8MQswCQYDVQQGEwJHUjEtMCsGA1UEChMkQXJpc3RvdGxlIFVuaXZlcnNp
+ dHkgb2YgVGhlc3NhbG9uaWtpMSIwIAYDVQQLExlOZXR3b3JrIE9wZXJhdGlvbnMg
+ Q2VudGVyMRowGAYDVQQDExFsb2dpbi1pZHAuYXV0aC5ncjCCASIwDQYJKoZIhvcN
+ AQEBBQADggEPADCCAQoCggEBAM3esjLA2btvgrriZ5knveWBBG16a7JKPMrhKW96
+ TlV2T7TaH9GgJa5Hdx4+sqQrpWNuW69LskLRS0gceGoLFr4XiJg3WmceHDi4JsSP
+ ptxI6bDPul9gzd8SMAQNs0EevTl2OgD+Y2NQWwOeK5mWliLkpfsHIS8acpP4FRaP
+ B4wXdic0cNAFXFDPo0uDk+Uho/HS9lYdWlj7SS9pU2/Csl6+s4jEkZZKQrMee36C
+ UeVcZ/qaKnpc4KwmUt81k9jTALw+ussILGOyqHptWE+73cY8ZqZNjWa1W9yixC7i
+ B5wbaPrksRIi12kQkpHawcy87qsguonNtwpUsOSCsNJIce0CAwEAAaOCAq8wggKr
+ MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUF
+ BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUDDR6RWu0zGViF0VSdJnnS6sRkc8wHwYD
+ VR0jBBgwFoAUiUIEyKao9TzeZuew+Ol7zXJEKVUwMwYIKwYBBQUHAQEEJzAlMCMG
+ CCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjBDBgNVHR8EPDA6MDig
+ NqA0hjJodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aE5vY0NBUjQvY3JsdjEu
+ ZGVyLmNybDCCASAGA1UdIASCARcwggETMIIBDwYLKwYBBAG8HQIAAwUwgf8wNAYI
+ KwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1dGguZ3IvZG9jdW1lbnRzL0NQUy5w
+ aHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRo
+ ZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRv
+ IEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRoaXMgQ2VydGlmaWNhdGUgbXVzdCBv
+ bmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCByZXNlYXJjaCBvciBlZHVjYXRpb25h
+ bCBwdXJwb3Nlcy4wgY0GA1UdEQSBhTCBgoIRbG9naW4taWRwLmF1dGguZ3KCFWxv
+ Z2luLWlkcC5jY2YuYXV0aC5ncoIWbG9naW4taWRwMS5jY2YuYXV0aC5ncoISbG9n
+ aW4taWRwMS5hdXRoLmdyghZsb2dpbi1pZHAyLmNjZi5hdXRoLmdyghJsb2dpbi1p
+ ZHAyLmF1dGguZ3IwDQYJKoZIhvcNAQEFBQADggEBAMO/uLHG7tm+LB/+7s9hZtRU
+ d+nFqCLgaR3J9K7D82lnUwNhdEQNdKcxbkpPHIGA+bVGzDtIXkCBND/YUk+QyDzA
+ RJzSdxmGG0ijaB9q/XAYXAqBfyGzsoY52jV87oh0O0uDw8QSEDW0cklBSXW2+PJH
+ hM6l8fpMmxm/DomC3lLNuvNJ87NVgUjhT8zcpfM53GG9Ea5ufYVvPricGAvroOiG
+ o8n41D4gfgu0VRSKwk7eWYWWR8dlX5XOUAfNJ5HW1tlOiGJrrpGlw9+Y6IRZIV+/
+ sVhv+fssysDyJDxMW084OuOl0MAZZY7+gIOmlLD5I8xzBf6Y6tfKGHyQevU7VHg=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/login.athena-innovation.gr.xml b/swamid-interfederations-2.0/login.athena-innovation.gr.xml
index 355e5bd9..4e86903e 100644
--- a/swamid-interfederations-2.0/login.athena-innovation.gr.xml
+++ b/swamid-interfederations-2.0/login.athena-innovation.gr.xml
@@ -1,5 +1,15 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.athena-innovation.gr/idp/shibboleth">
+ <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+ <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">
+ http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
+ </mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">
+ http://aai.grnet.gr/static/policy/policy-el-1.1.0.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athena-innovation.gr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/login.du.se.xml b/swamid-interfederations-2.0/login.du.se.xml
new file mode 100644
index 00000000..28fe8533
--- /dev/null
+++ b/swamid-interfederations-2.0/login.du.se.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.du.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">du.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Högskolan Dalarna</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Dalarna University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan Dalarna.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for employees and students at Dalarna University.</mdui:Description>
+ <mdui:Logo height="350" width="146" xml:lang="sv">https://login.du.se/duse-logo-sv.png</mdui:Logo>
+ <mdui:Logo height="350" width="146" xml:lang="en">https://login.du.se/duse-logo-en.png</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>130.243.32.0/19</mdui:IPHint>
+ <mdui:DomainHint>du.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:60.6137,15.6536</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
+MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
+l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
+eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
+8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
+yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
+riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
+9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
+eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
+E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
+KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
+2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
+GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.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://login.du.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.du.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.du.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">du.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
+MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
+l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
+eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
+8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
+yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
+riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
+9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
+eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
+E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
+KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
+2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
+GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.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">DU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Högskolan Dalarna</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.du.se</OrganizationURL>
+ </Organization>
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <Company>Högskolan Dalarna</Company>
+ <EmailAddress>dempa@du.se</EmailAddress>
+ </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ntua.gr.xml b/swamid-interfederations-2.0/login.ntua.gr.xml
index 4c64fad2..77403d76 100644
--- a/swamid-interfederations-2.0/login.ntua.gr.xml
+++ b/swamid-interfederations-2.0/login.ntua.gr.xml
@@ -1,5 +1,15 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ntua.gr/idp/shibboleth">
+ <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+ <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">
+ http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
+ </mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">
+ http://aai.grnet.gr/static/policy/policy-el-1.1.0.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntua.gr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/login.terena.org.xml b/swamid-interfederations-2.0/login.terena.org.xml
index 9e9e9eac..93072f0b 100644
--- a/swamid-interfederations-2.0/login.terena.org.xml
+++ b/swamid-interfederations-2.0/login.terena.org.xml
@@ -1,5 +1,10 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.terena.org/idp/saml2/idp/metadata.php">
+ <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>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/lu-idp.lu.lv.xml b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
new file mode 100644
index 00000000..eeb3474a
--- /dev/null
+++ b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lu-idp.lu.lv">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDG
+x1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsG
+A1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4
+GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1ZBGi2uWZ
+xKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARV
+oZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQyOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDG
+x1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsG
+A1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4
+GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1ZBGi2uWZ
+xKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARV
+oZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQyOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp.lu.lv/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://lu-idp.lu.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </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>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.lu.lv/</OrganizationURL>
+ </Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lu-idp1.lu.lv.xml b/swamid-interfederations-2.0/lu-idp1.lu.lv.xml
new file mode 100644
index 00000000..c0be0858
--- /dev/null
+++ b/swamid-interfederations-2.0/lu-idp1.lu.lv.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lu-idp1.lu.lv">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhgCAQAwDQYJKoZIhvcNAQEEBQAwXjELMAkGA1UEBhMCTFYxDzANBgNV
+BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxCzAJBgNVBAsT
+AkxVMRUwEwYDVQQDEwxsdS1pZHAubHUubHYwHhcNMTMwMzA1MTI0NjEzWhcNMjMw
+MzAzMTI0NjEzWjBeMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0dmlhMQ0wCwYD
+VQQHEwRSaWdhMQswCQYDVQQKEwJMVTELMAkGA1UECxMCTFUxFTATBgNVBAMTDGx1
+LWlkcC5sdS5sdjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVP1+R8
+ESt5pHCtzIWOiF+yw+IQMzYSWe4LB/tbyNzAnZ0q/nRaJe0XQpasWpobIGVXvzvh
+cWmMf/sxiM2OW8jzrNsQcEk+E69brgq9eE4lEbhHGbmBjangJLXI3cEwVickWXqQ
+qhe0cUPBMD1FZARwGlL8YWZRQ5+dfB933EO8dR4LSdLbNXjglCEwGG2e6XHzbl4w
+7JS+SLaTjLjRB0ITCp9HtvxciFakPX/gzGOJM54UuF68siLGyokP7s/T7XgOxnFL
+Z54FRLckXOkDzcyfMn+6VB5r7MAIE1E25zcllZbfvqKDtb4JmeP5o3UOfY2TUCIg
+QbiA+GZGz8xTcbkCAwEAATANBgkqhkiG9w0BAQQFAAOCAQEABN89j8izhz6LrVsr
+pTj6u8ZE4mlUkDsvXJSxiuz7VNsf3M/y63QAdMNot/HSjEhl+a4utrcXiv63qtsC
+/GJNoI2uu6cBvMR6QXLf2rsuPG8bhIRciXu05PiY3gbHiiPJWOQuPEBSSFBMskiU
+U3dxJNFd+EmUjigNrpObWNOjGypQE7v+WlZ6261kkCUbSEKixQ28Py4tqS6CJehn
+pdgKs1TNu4MoBxUjg8yo3b+1UaA96NmMbA3XUSd2K9qOV9NzJ64E9e7d04u+VVBv
+D2TcA6zOrv9jXb96N0u0D9Bz2K6rDsdV7T1N+3L3LcLzP7qj/jNlRU8tagDbXrwz
+jo0gpQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhgCAQAwDQYJKoZIhvcNAQEEBQAwXjELMAkGA1UEBhMCTFYxDzANBgNV
+BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxCzAJBgNVBAsT
+AkxVMRUwEwYDVQQDEwxsdS1pZHAubHUubHYwHhcNMTMwMzA1MTI0NjEzWhcNMjMw
+MzAzMTI0NjEzWjBeMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0dmlhMQ0wCwYD
+VQQHEwRSaWdhMQswCQYDVQQKEwJMVTELMAkGA1UECxMCTFUxFTATBgNVBAMTDGx1
+LWlkcC5sdS5sdjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVP1+R8
+ESt5pHCtzIWOiF+yw+IQMzYSWe4LB/tbyNzAnZ0q/nRaJe0XQpasWpobIGVXvzvh
+cWmMf/sxiM2OW8jzrNsQcEk+E69brgq9eE4lEbhHGbmBjangJLXI3cEwVickWXqQ
+qhe0cUPBMD1FZARwGlL8YWZRQ5+dfB933EO8dR4LSdLbNXjglCEwGG2e6XHzbl4w
+7JS+SLaTjLjRB0ITCp9HtvxciFakPX/gzGOJM54UuF68siLGyokP7s/T7XgOxnFL
+Z54FRLckXOkDzcyfMn+6VB5r7MAIE1E25zcllZbfvqKDtb4JmeP5o3UOfY2TUCIg
+QbiA+GZGz8xTcbkCAwEAATANBgkqhkiG9w0BAQQFAAOCAQEABN89j8izhz6LrVsr
+pTj6u8ZE4mlUkDsvXJSxiuz7VNsf3M/y63QAdMNot/HSjEhl+a4utrcXiv63qtsC
+/GJNoI2uu6cBvMR6QXLf2rsuPG8bhIRciXu05PiY3gbHiiPJWOQuPEBSSFBMskiU
+U3dxJNFd+EmUjigNrpObWNOjGypQE7v+WlZ6261kkCUbSEKixQ28Py4tqS6CJehn
+pdgKs1TNu4MoBxUjg8yo3b+1UaA96NmMbA3XUSd2K9qOV9NzJ64E9e7d04u+VVBv
+D2TcA6zOrv9jXb96N0u0D9Bz2K6rDsdV7T1N+3L3LcLzP7qj/jNlRU8tagDbXrwz
+jo0gpQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp1.lu.lv/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-Redirect" Location="https://lu-idp1.lu.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">LAIFE - LU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Latvian Identity Federation LAIFE - LU IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.lu.lv/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>Administrator</SurName>
+ <EmailAddress>serviss@lanet.lv</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no.xml b/swamid-interfederations-2.0/openwiki.uninett.no.xml
index a4ca33a0..66ea7589 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no.xml
@@ -1,35 +1,58 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
- <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a wikifarm where Feide users can create their own wiki.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikifarm hvor Feidebrukere kan lage egne wikier.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="nn">UNINETT OpenWiki er ein wikifarm der Feidebrukarar kan lage eigne wikiar.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
- <md:Company>UNINETT AS</md:Company>
- <md:GivenName>Andreas</md:GivenName>
- <md:SurName>Solberg</md:SurName>
- <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
- <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
- </md:ContactPerson>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+<md:Extensions>
+<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T11:34:54Z">
+<mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+</mdrpi:RegistrationInfo>
+</md:Extensions>
+<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:Extensions>
+<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+<mdui:DisplayName xml:lang="en">UNINETT OpenWiki</mdui:DisplayName>
+<mdui:DisplayName xml:lang="no">UNINETT OpenWiki</mdui:DisplayName>
+<mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
+<mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</mdui:Description>
+</mdui:UIInfo>
+</md:Extensions>
+<md:KeyDescriptor use="signing">
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:X509Data>
+<ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:KeyDescriptor use="encryption">
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:X509Data>
+<ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+<md:AttributeConsumingService index="0">
+<md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
+<md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
+<md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</md:ServiceDescription>
+<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+</md:AttributeConsumingService>
+</md:SPSSODescriptor>
+<md:Organization>
+<md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+<md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+<md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+<md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+<md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+<md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+</md:Organization>
+<md:ContactPerson contactType="technical">
+<md:GivenName>Feide Support</md:GivenName>
+<md:EmailAddress>support@feide.no</md:EmailAddress>
+</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ra-idp.lanet.lv.xml b/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
new file mode 100644
index 00000000..8dc5e7af
--- /dev/null
+++ b/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ra-idp.lanet.lv">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ra-idp.lanet.lv/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://ra-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">LAIFE - RA</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Rezekne Higher Education Institution - RA IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.ru.lv/</OrganizationURL>
+ </Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repos.ids-mannheim.de.xml b/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
index e9267173..457c3a34 100644
--- a/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repos.ids-mannheim.de/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-02-08T15:03:00Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-02-08T13:14:47Z">
<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>
@@ -17,8 +17,10 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS) - Forschungsprimärdatenrepository</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Institute for the German Language (IDS) - Respository</mdui:DisplayName>
- <mdui:Description xml:lang="de">Das Forschungsprimärdetenrepository des Institut für Deutsche Sprache (IDS).</mdui:Description>
+ <mdui:Description xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</mdui:Description>
<mdui:Description xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</mdui:Description>
+ <mdui:InformationURL xml:lang="de">https://repos.ids-mannheim.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://repos.ids-mannheim.de</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="en">https://repos.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</Extensions>
@@ -62,7 +64,7 @@ hoWgvpRdJLO3MqO0sMEedQE=
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
@@ -74,11 +76,13 @@ hoWgvpRdJLO3MqO0sMEedQE=
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="6"/>
<AttributeConsumingService index="1">
<ServiceName xml:lang="de">Institut für Deutsche Sprache (IDS) - Forschungsprimärdatenrepository</ServiceName>
- <ServiceDescription xml:lang="de">Das Forschungsprimärdetenrepository des Institut für Deutsche Spache (IDS).</ServiceDescription>
+ <ServiceName xml:lang="en">Institute for the German Language (IDS) - Respository</ServiceName>
+ <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="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>
+ </AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="de">e217</OrganizationName>
@@ -103,4 +107,4 @@ hoWgvpRdJLO3MqO0sMEedQE=
<SurName>Schonefeld</SurName>
<EmailAddress>schonefeld@ids-mannheim.de</EmailAddress>
</ContactPerson>
- </EntityDescriptor>
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rja-idp.lanet.lv.xml b/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
new file mode 100644
index 00000000..57384ae8
--- /dev/null
+++ b/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rja-idp.lanet.lv">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rja-idp.lanet.lv/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://rja-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">LAIFE - RJA</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Riga Graduate School of Law - RJA IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.rgsl.edu.lv/</OrganizationURL>
+ </Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rr.funet.fi.xml b/swamid-interfederations-2.0/rr.funet.fi.xml
index 2f0366d3..9f0bcd10 100644
--- a/swamid-interfederations-2.0/rr.funet.fi.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi.xml
@@ -1,9 +1,14 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns: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>
+ </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,15 +17,11 @@
<mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</mdui:PrivacyStatementURL>
</mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEzDCCA7SgAwIBAgIRANkuMGk/HlexnQRYLfLoQaEwDQYJKoZIhvcNAQEFBQAw
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEzDCCA7SgAwIBAgIRANkuMGk/HlexnQRYLfLoQaEwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMjAyMjgwMDAwMDBaFw0xNDAyMjcyMzU5NTlaMIGqMQswCQYD
VQQGEwJGSTEOMAwGA1UEERMFMDIxMDExEDAOBgNVBAgTB1V1c2ltYWExDjAMBgNV
@@ -46,106 +47,106 @@ KoZIhvcNAQEFBQADggEBADH55FfR7I+1zt41DTwz2Ig9w6S6l0pFL889eFl772qV
BipmtjTfM/pv+j2iTDMRfjzTjKSlDdDOaRbCQeLDtIgJkXvwSb/OTPOWHzbLLiPE
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>Timo</md:GivenName>
- <md:SurName>Mustonen</md:SurName>
- <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Timo</md:GivenName>
- <md:SurName>Mustonen</md:SurName>
- <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</ServiceName>
+ <ServiceName xml:lang="en">Haka Attribute Test Service</ServiceName>
+ <ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</ServiceDescription>
+ <ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</ServiceDescription>
+ <RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="CountryOfResidence" Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduCourseMember" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduCourseOffering" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonCreditUnits" Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonECTS" Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonEPPNTimeStamp" Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonHomeCity" Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonPrimaryStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonProgram" Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonSpecialisation" Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudentCategory" Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudentStatus" Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudentUnion" Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudyToEnd" Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonTargetDegree" Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="Nickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacCountryOfCitizenship" Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacGender" Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacPersonalUniqueCode" Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacPlaceOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="userPresenceID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="userStatus" Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+ <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Timo</GivenName>
+ <SurName>Mustonen</SurName>
+ <EmailAddress>mailto:haka@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/services-federation.renater.fr.xml b/swamid-interfederations-2.0/services-federation.renater.fr.xml
index 9aab496c..cfd32188 100644
--- a/swamid-interfederations-2.0/services-federation.renater.fr.xml
+++ b/swamid-interfederations-2.0/services-federation.renater.fr.xml
@@ -321,9 +321,11 @@ Cette ressource ne requiert aucun attribut, elle se contente d'afficher les attr
<Organization>
+
<OrganizationName xml:lang="en">RENATER</OrganizationName>
<OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://www.renater.fr</OrganizationURL>
+
</Organization>
diff --git a/swamid-interfederations-2.0/sgw.africa-grid.org.xml b/swamid-interfederations-2.0/sgw.africa-grid.org.xml
new file mode 100644
index 00000000..d0ae76bb
--- /dev/null
+++ b/swamid-interfederations-2.0/sgw.africa-grid.org.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.africa-grid.org/shibboleth">
+
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-27T09:58:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+
+ <md: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">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">
+ Africa Grid Science Gateway
+ </mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">
+ Africa Grid Science Gateway
+ </mdui:DisplayName>
+ <mdui:Description xml:lang="en">
+ This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
+ </mdui:Description>
+ <mdui:Description xml:lang="it">
+ Questo servizio permette l'accesso e l'uso delle applicazioni/servizi Grid sviluppati per il progetto eI4Africa
+ </mdui:Description>
+ </mdui:UIInfo>
+ <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://sgw.africa-grid.org/Shibboleth.sso/DS"/>
+ <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://sgw.africa-grid.org/Shibboleth.sso/DS" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
+ <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
+ <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
+ <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
+ <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
+ <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
+ <ds:KeyName>klios.ct.infn.it</ds:KeyName>
+ <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
+ <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
+ <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
+ <ds:X509Certificate>MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+ NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+ IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+ VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+ EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+ c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+ T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+ 3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+ O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+ i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+ LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+ TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+ AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+ BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+ A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+ IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+ KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+ AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+ Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+ ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+ ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+ bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+ LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+ ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+ cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+ iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+ PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+ n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+ zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+ 2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+ j/MCNlE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">Africa Grid Science Gateway</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">
+ This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
+ </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" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Marco</md:GivenName>
+ <md:SurName>Fargetta</md:SurName>
+ <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+ <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Roberto</md:GivenName>
+ <md:SurName>Barbera</md:SurName>
+ <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+ <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+ </md:ContactPerson>
+
+ </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.garr.it.xml b/swamid-interfederations-2.0/sgw.garr.it.xml
new file mode 100644
index 00000000..4e2e1b4c
--- /dev/null
+++ b/swamid-interfederations-2.0/sgw.garr.it.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.garr.it/shibboleth">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-11T00:45:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md: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">
+ <md:Extensions>
+ <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.garr.it/Shibboleth.sso/DS" index="1"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="it">GARR - Science Gateway</mdui:DisplayName>
+ <mdui:Description xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud
+ </mdui:Description>
+ <mdui:InformationURL xml:lang="it">http://sgw.garr.it</mdui:InformationURL>
+ <mdui:DisplayName xml:lang="en">GARR - Science Gateway</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.
+ </mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://sgw.garr.it</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>sgw.garr.it</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=sgw.garr.it</ds:X509SubjectName>
+ <ds:X509Certificate>
+ MIIEXTCCA0WgAwIBAgIQWujYl4SUR3QcC4FsP9F0yTANBgkqhkiG9w0BAQUFADA2
+ MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+ U1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowPTELMAkGA1UE
+ BhMCSVQxGDAWBgNVBAoTD0NvbnNvcnRpdW0gR0FSUjEUMBIGA1UEAxMLc2d3Lmdh
+ cnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ1uz7FWOS0k5y
+ xcB9Ac60XgUBnXPC7MXiHLvDhpJpQHHGz1awLAuOr/WvqJxJ6ZwpD2sU72bt44GF
+ uqlmdg2waASa/xDKP3oPGgnC7ximlK1UAQ/fbcSnjBprgRHZeJyQxndf1EGtC4zB
+ qSi3yNprVqZsysw/7ew/KIMQ8un/a1ULfOfNedzIx1RXZeN85Hk+BQWxfuKkcLA+
+ BRg5WuOP/7N/l9KGkDGmTsTsGkcGBUVtsKycIGUis9D4ZxpD7eYG66StcQE+uTnG
+ 37Yahsq9mELkWxBWy3HdxvEnNHtcqucuWS0YGaZMIYddeDd5IxZfzOq/WKkMggAF
+ 3alpftPFAgMBAAGjggFeMIIBWjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+ kOO57TAdBgNVHQ4EFgQU88beKAx83mumGu58e947oiBNXbQwDgYDVR0PAQH/BAQD
+ AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+ MBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0
+ cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUH
+ AQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RF
+ UkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVu
+ YS5vcmcwFgYDVR0RBA8wDYILc2d3LmdhcnIuaXQwDQYJKoZIhvcNAQEFBQADggEB
+ AH7+kdSsi31EBdjCDpBgnGpN37P/6ZlHhbRMMx4O0xtC6PIiGIvqW45DUFcPXkpb
+ C4LZ3lqpz5oTI1l+E/7pWH7c7+xSKucqiwABtbTn4EteSfeZ4R58A0QXwKclwHwU
+ TsaqtOwB/U2i0a9l/P5cL4fz7wFcREAPLsm6FVY5ZJP2aAAZEQO3C8tXuwym5oXB
+ /W5PcRc2PRNAR0ZXuB5CQVNVEbqkHMXsNfVh5Lmr8TtdN9bkDUQYQmHKf4ynfEY4
+ F/KOSR7Wtz++Fh/cG44uZgU7G7VdMUjmHVPSgwnqmYR56oXPkRmkloq25Qy0/moN
+ GApBYHSfMtsnpP9U+0RncPM=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>sgw.garr.it</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=sgw.garr.it</ds:X509SubjectName>
+ <ds:X509Certificate>
+ MIIEXTCCA0WgAwIBAgIQWujYl4SUR3QcC4FsP9F0yTANBgkqhkiG9w0BAQUFADA2
+ MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+ U1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowPTELMAkGA1UE
+ BhMCSVQxGDAWBgNVBAoTD0NvbnNvcnRpdW0gR0FSUjEUMBIGA1UEAxMLc2d3Lmdh
+ cnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ1uz7FWOS0k5y
+ xcB9Ac60XgUBnXPC7MXiHLvDhpJpQHHGz1awLAuOr/WvqJxJ6ZwpD2sU72bt44GF
+ uqlmdg2waASa/xDKP3oPGgnC7ximlK1UAQ/fbcSnjBprgRHZeJyQxndf1EGtC4zB
+ qSi3yNprVqZsysw/7ew/KIMQ8un/a1ULfOfNedzIx1RXZeN85Hk+BQWxfuKkcLA+
+ BRg5WuOP/7N/l9KGkDGmTsTsGkcGBUVtsKycIGUis9D4ZxpD7eYG66StcQE+uTnG
+ 37Yahsq9mELkWxBWy3HdxvEnNHtcqucuWS0YGaZMIYddeDd5IxZfzOq/WKkMggAF
+ 3alpftPFAgMBAAGjggFeMIIBWjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+ kOO57TAdBgNVHQ4EFgQU88beKAx83mumGu58e947oiBNXbQwDgYDVR0PAQH/BAQD
+ AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+ MBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0
+ cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUH
+ AQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RF
+ UkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVu
+ YS5vcmcwFgYDVR0RBA8wDYILc2d3LmdhcnIuaXQwDQYJKoZIhvcNAQEFBQADggEB
+ AH7+kdSsi31EBdjCDpBgnGpN37P/6ZlHhbRMMx4O0xtC6PIiGIvqW45DUFcPXkpb
+ C4LZ3lqpz5oTI1l+E/7pWH7c7+xSKucqiwABtbTn4EteSfeZ4R58A0QXwKclwHwU
+ TsaqtOwB/U2i0a9l/P5cL4fz7wFcREAPLsm6FVY5ZJP2aAAZEQO3C8tXuwym5oXB
+ /W5PcRc2PRNAR0ZXuB5CQVNVEbqkHMXsNfVh5Lmr8TtdN9bkDUQYQmHKf4ynfEY4
+ F/KOSR7Wtz++Fh/cG44uZgU7G7VdMUjmHVPSgwnqmYR56oXPkRmkloq25Qy0/moN
+ GApBYHSfMtsnpP9U+0RncPM=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="it">GARR Science Gateway</md:ServiceName>
+ <md:ServiceName xml:lang="en">GARR Science Gateway</md:ServiceName>
+ <md:ServiceDescription xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.</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" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="it">Consortium GARR</OrganizationName>
+ <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
+ <OrganizationDisplayName xml:lang="it">GARR Science Gateway erogato da Consortium GARR</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">GARR Science Gateway provided by Consortium GARR</OrganizationDisplayName>
+ <OrganizationURL xml:lang="it">http://www.garr.it/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.garr.it/</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <EmailAddress>sgwadmin@garr.it</EmailAddress>
+ </ContactPerson>
+ </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml
new file mode 100644
index 00000000..3bec5c11
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<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://shibboleth-idp.dti.ufv.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">ufv.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UFV - universidade Federal de Vicosa</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UFV - universidade Federal de Vicosa</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UFV - universidade Federal de Vicosa</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UFV - universidade Federal de Vicosa</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ufv.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ufv.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
+aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
+ZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
+ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
+ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
+dWZ2LmJyMB4XDTEzMDMyMjIwNTM1N1oXDTE2MDMyMTIwNTM1N1owgdkxLTArBgNV
+BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
+CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZ
+MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
+VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
+ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
+8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
+RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
+aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
+YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
+WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAobds5
+X9EyPCWOnEwnMLUmxbTJQ5twEEND7JesKiNJSIK1oaZcYsxS4d5HAjrCUFVop/cK
+9ZhFbpLVnky/SvSYAqyU0LifKMHqTGkpB2o64A1oPRPQRQrPCuG3/AIAALBQeGJP
+EFB4KyGunENrD1rUsWiz7RCX9uVcEuncCtdhYxCve+7JKbzCxv/pUGNorQK9fdhm
+b/LBWLQCi3PmrZQ2DW1L2pz9ATfIduYRamw0F+udCEkP7l0CjeCE81xkBFxRLIDI
+TEo7mEQN4S99NlVV1pGuWtZRJz4Zco8ThPhBp3ya98phTcMxYs9aJt/AWFJdcnfq
+mnRgIPsxKrrKvirQ
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.ufv.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://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.dti.ufv.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">ufv.br</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
+aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
+ZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
+ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
+ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
+dWZ2LmJyMB4XDTEzMDMyMjIwNTM1N1oXDTE2MDMyMTIwNTM1N1owgdkxLTArBgNV
+BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
+CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZ
+MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
+VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
+ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
+8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
+RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
+aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
+YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
+WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAobds5
+X9EyPCWOnEwnMLUmxbTJQ5twEEND7JesKiNJSIK1oaZcYsxS4d5HAjrCUFVop/cK
+9ZhFbpLVnky/SvSYAqyU0LifKMHqTGkpB2o64A1oPRPQRQrPCuG3/AIAALBQeGJP
+EFB4KyGunENrD1rUsWiz7RCX9uVcEuncCtdhYxCve+7JKbzCxv/pUGNorQK9fdhm
+b/LBWLQCi3PmrZQ2DW1L2pz9ATfIduYRamw0F+udCEkP7l0CjeCE81xkBFxRLIDI
+TEo7mEQN4S99NlVV1pGuWtZRJz4Zco8ThPhBp3ya98phTcMxYs9aJt/AWFJdcnfq
+mnRgIPsxKrrKvirQ
+
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.ufv.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">UFV - Universidade Federal de Vicosa</OrganizationName>
+ <OrganizationName xml:lang="pt-br">UFV - Universidade Federal de Vicosa</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">UFV - universidade Federal de Vicosa</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">UFV - universidade Federal de Vicosa</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ufv.br/</OrganizationURL>
+ <OrganizationURL xml:lang="pt-br">http://www.ufv.br/</OrganizationURL>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <SurName>Harley Balduino Saraiva</SurName>
+ <EmailAddress>harley.saraiva@ufv.br</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.nkp.cz.xml b/swamid-interfederations-2.0/shibboleth.nkp.cz.xml
index 3996bb4a..fce3f0d0 100644
--- a/swamid-interfederations-2.0/shibboleth.nkp.cz.xml
+++ b/swamid-interfederations-2.0/shibboleth.nkp.cz.xml
@@ -10,12 +10,13 @@
<Extensions>
<shibmd:Scope regexp="false">nkp.cz</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:Description xml:lang="en">Identity provider for the National Library of the Czech Republic</mdui:Description>
- <mdui:Description xml:lang="cs">Identity provider pro Národní knihovnu České republiky</mdui:Description>
+ <mdui:Description xml:lang="en">Identity provider for employees the National Library of the Czech Republic</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity provider pro zaměstnance Národní knihovnu České republiky</mdui:Description>
<mdui:DisplayName xml:lang="en">The National Library of the Czech Republic</mdui:DisplayName>
<mdui:DisplayName xml:lang="cs">Národní knihovna České republiky</mdui:DisplayName>
<mdui:InformationURL xml:lang="en">http://www.en.nkp.cz/</mdui:InformationURL>
<mdui:InformationURL xml:lang="cs">http://www.nkp.cz/</mdui:InformationURL>
+ <mdui:Logo height="472" width="500">https://www2.eduid.cz/idp-loga/nkp.png</mdui:Logo>
</mdui:UIInfo>
<eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
<eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
diff --git a/swamid-interfederations-2.0/sourcesup.cru.fr.xml b/swamid-interfederations-2.0/sourcesup.cru.fr.xml
index cc70288a..b9aaa737 100644
--- a/swamid-interfederations-2.0/sourcesup.cru.fr.xml
+++ b/swamid-interfederations-2.0/sourcesup.cru.fr.xml
@@ -111,9 +111,11 @@ HaaOGqD8nCkO3t3qaIPP4CTmE+GS72ooHHntvoGy/RDn32aVVg==
<Organization>
+
<OrganizationName xml:lang="en">RENATER</OrganizationName>
<OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
<OrganizationURL xml:lang="en">https://www.renater.fr</OrganizationURL>
+
</Organization>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index d61efbbe..1764f3e7 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,10 +1,35 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://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>
- <ds:X509Data>
- <ds:X509Certificate>MIIE3DCCA8SgAwIBAgIED+aV9jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+<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.edugain.org/dataprotection/coc-eu-01-draft</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
MTFaFw0xNTA0MTQxMzQ1MTFaMH8xCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
@@ -29,37 +54,91 @@ s6fNqdPrhNcEN8KweZh9HyOgNpTEJPJpfwb4XR3pzfSRyPotr2GL80NVXTDA+YQs
fPO0WLU0KduZtyfl1QGnYZcIpBAN53M+EvMk0Q9ruOP3FZazLPscULJnqW8Ks8/v
ijthUt3XZFCR66qbNf7HeyS7zzYYMkyRDJN9PixRyiEAWHifqXJQzNI9dlqcy+Aq
nnDbttGYLUyhuuT+CqcBRWJButW9x4BFUDNHrgfcPWwFhUGx3hqI2U6zqrTgesWg
-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>
+hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </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>Daan.Broeder@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Tobias</GivenName>
+ <SurName>van Valkenhoef</SurName>
+ <EmailAddress>tobias.vanvalkenhoef@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Dieter</GivenName>
+ <SurName>Van Uytvanck</SurName>
+ <EmailAddress>dieter.vanuytvanck@mpi.nl</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lat.csc.fi.xml b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
index ea1008cd..d9ebc147 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"?>
-<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.edugain.org/dataprotection/coc-eu-01-draft</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">LAT – Language Archive Tools</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
<mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
@@ -16,15 +26,11 @@
<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>
- <ds:X509Data>
- <ds:X509Certificate>MIIEuDCCA6CgAwIBAgIRAJRkURURLhdqLNjrk9ROa4QwDQYJKoZIhvcNAQEFBQAw
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEuDCCA6CgAwIBAgIRAJRkURURLhdqLNjrk9ROa4QwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMTA1MTgwMDAwMDBaFw0xMzA1MTcyMzU5NTlaMIGXMQswCQYD
VQQGEwJGSTEOMAwGA1UEERMFMDIxMDExEDAOBgNVBAgTB1V1c2ltYWExDjAMBgNV
@@ -50,13 +56,13 @@ lQ6NKPiVSlp9N1V6EVDnYlioyqv/pabKKivWlvl+MAAjZlfk8OmdWsBYUgH2aeM5
Q76UgcYknkN+Trpc4n8TExlhXZw881XVdm/hKgaRDnS4obofKFpZyqTtVNekHMr6
0/tukGQvVEp3KmukbhzJ2Oa4d4Q0sIZctuU8RRh62IqbBKkSAQx/kw9dF43X8rmf
gIbcJY1SYVwxxDSg</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEzMDQxOTAwMDAwMFoXDTE2MDUxNjIzNTk1OVowODEhMB8GA1UE
CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwpsYXQuY3NjLmZp
@@ -80,44 +86,44 @@ jC+pHnekS6zfoVTN66KDHzU/JtJK3v8Bp3tudeAUlwXs7sSuiFSiD/Ua3qfZ21/v
rkz1YmSz4bPS+bO477WiuDDTRHo5FSifBlWe46QQfM1beNCAiiBJZh0uyB6PPrD8
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>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="fi">LAT – Language Archive Tools</ServiceName>
+ <ServiceName xml:lang="en">LAT – Language Archive Tools</ServiceName>
+ <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 cb43d90b..1b1dbc13 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,10 +1,36 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://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>
- <ds:X509Data>
- <ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+<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.edugain.org/dataprotection/coc-eu-01-draft</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="60" width="80">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
MTBaFw0xNDAzMTcxMzQ4MTBaMHoxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
@@ -29,37 +55,91 @@ LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
-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>
+0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </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>Tobias.vanValkenhoef@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Dieter</GivenName>
+ <SurName>Van Uytvanck</SurName>
+ <EmailAddress>dieter.vanuytvanck@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Dieter</GivenName>
+ <SurName>Van Uytvanck</SurName>
+ <EmailAddress>dieter.vanuytvanck@mpi.nl</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sse-idp.lanet.lv.xml b/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
new file mode 100644
index 00000000..91458abe
--- /dev/null
+++ b/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sse-idp.lanet.lv">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sse-idp.lanet.lv/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://sse-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">LAIFE - SSE</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Stockholm School of Economics in Riga - SSE IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.sseriga.edu/</OrganizationURL>
+ </Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml b/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml
new file mode 100644
index 00000000..f34ca6ad
--- /dev/null
+++ b/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://studienportal.vetmed.uni-muenchen.de/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-04-30T13:50:47Z">
+ <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://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Studienportal tierärztliche Fakultät LMU</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Studienportal tierärztliche Fakultät LMU</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Studienportal tierärztliche Fakultät LMU</mdui:Description>
+ <mdui:Description xml:lang="en">Studienportal tierärztliche Fakultät LMU</mdui:Description>
+ <mdui:InformationURL xml:lang="de">https://devstudienportal.vetmed.uni-muenchen.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://devstudienportal.vetmed.uni-muenchen.de</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>studienportal.vetmed.uni-muenchen.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=studienportal.vetmed.uni-muenchen.de,OU=Tieraerztliche Fakultaet,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIEEOYptTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNVBAoT
+KEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzANBgNV
+BAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMDEwMjYx
+MDIzMzNaFw0xNTEwMjUxMDIzMzNaMIG2MQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+QmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1heGlt
+aWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEhMB8GA1UECxMYVGllcmFlcnp0
+bGljaGUgRmFrdWx0YWV0MS0wKwYDVQQDEyRzdHVkaWVucG9ydGFsLnZldG1lZC51
+bmktbXVlbmNoZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCf
+aVM4c+oiLWXWdu/PVBS7JHqdNKqk//w0wQoH4o/g6gRK5LiSOy3Dqloz5UpFYjNW
+D7lQEzcg1Ar/0/NsQ3HEU75k7uUaOmZi+kNse8seagyCjlfWnU5DAsPDFG7SiotU
+0AX6dPL+GkzyWKpdG7/HrGze43pFbYkB67KaAuwLHPGZwBzeyIDyL9RPjdRXflhI
+o/sxJh5tv/9tLpxNupacnk7mfz1xDlfvSLyWEjr6pL/JtLR7Z3BQ5/PISFncWO+Q
+ZfrY7TGZ/E9uS2pnfteOY22Y6rR1FiVgcIowzScVTOwyshvopoVI1/u3d+ChMhBI
+ezjRfr1udeSajAk/RqVTAgMBAAGjggHkMIIB4DAJBgNVHRMEAjAAMAsGA1UdDwQE
+AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFGIL
+BlMn4wIAUnAiU7s+tIBt1iu0MB8GA1UdIwQYMBaAFHmHeGov+pu8I0+UpqN3HR4O
+lIAPMDIGA1UdEQQrMCmBJ2FkbWluaXN0cmF0b3JAaXQudmV0bWVkLnVuaS1tdWVu
+Y2hlbi5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA+oDygOoY4aHR0
+cDovL2NkcDIucGNhLmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NybC9jYWNy
+bC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW11ZW5j
+aGVuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
+XoE3xNYk2QmdKevsY4W/szKTswy74uqQ3utXm5Hf5+/9+Cgd7BStYRZVHI24veXq
+a0YOorNUumnTkZFUB4B5OZpaDw9t80WSaefC3o1zc0PXH9+caRhoqmnBSG1JdF6L
+kY0pqAOralMzMChLKOrRb2cnjxHWa/Ug9C7XaXmEJhjP+7GCjZSLMS/du1E1wyKc
+3fN+WdEbKF4OiY1lK+MBlgDyGdXqkrAFX8JbGo1uWyGgDKu2gT7QhMeNXDPzpWn8
+YwnP4oYTHPCDNHFJR6XyRTogzebI5RgoL2eLI8SOf0LXXBTE2KvM2cOWFSmKlgFd
+NL76LsPu9j46CldHJOaVdg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="de">e29</OrganizationName>
+ <OrganizationName xml:lang="en">e29</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">https://lmuidp.lrz.de</OrganizationURL>
+ <OrganizationURL xml:lang="en">https://lmuidp.lrz.de</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Cyrill</GivenName>
+ <SurName>Matenaers</SurName>
+ <EmailAddress>studienportal@it.vetmed.uni-muenchen.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Studienportal</GivenName>
+ <SurName>Helpdesk</SurName>
+ <EmailAddress>studienportal@it.vetmed.uni-muenchen.de</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 a347f79e..322db378 100644
--- a/swamid-interfederations-2.0/swamid.user.uu.se.xml
+++ b/swamid-interfederations-2.0/swamid.user.uu.se.xml
@@ -1,13 +1,44 @@
<?xml version="1.0"?>
-<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>
- <ds:X509Data>
- <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+<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
BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -24,27 +55,40 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-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>
- <ds:X509Data>
- <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+2DlT+A==
+
+ </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 +105,31 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==</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>
+2DlT+A==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </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="en">Uppsala universitet</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
new file mode 100644
index 00000000..58726c25
--- /dev/null
+++ b/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<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">
+ <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>
+ </mdrpi:RegistrationInfo>
+ </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: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: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"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
+ </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/tcs</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>UvT</md:GivenName>
+ <md:SurName>LIS Unix</md:SurName>
+ <md:EmailAddress>na@example.org</md:EmailAddress>
+ </md:ContactPerson>
+ </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml b/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
new file mode 100644
index 00000000..d1628f31
--- /dev/null
+++ b/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-personal-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:31:26Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </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:X509Data>
+ <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</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>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</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>MIIEdjCCA16gAwIBAgIQaDG9O4Jn+97HiMuVnaMmcDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDEyMjAwMDAwMFoXDTEzMDEyMTIzNTk1OVowRTELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTElMCMGA1UEAxMcdGNzLXBlcnNvbmFsLXNhbWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOCAW8wggFrMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSg83c02TvstcJr9ZOENi88KnuA+jAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAnBgNVHREEIDAeghx0Y3MtcGVyc29uYWwtc2FtbC50ZXJlbmEub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQA12FYPotUO78yJ3gIa97kuYcQTX8ZwZXWm5hG39UOedTFCn7zFWCcmksL3BrT0rKp3KvRYkmQ9sQ28biv8kOfM0zlOhy7RMNCY/J5jKQpwdiRIWpzbcf+OfDmTmzBcxHJFEU8MwYjWUEwUbAfe+AYagTCZvYVx3tyfP0patzWDvg+c40nDFS4VGQ9NU9cPh1s+uYTblzh0SwDFWleT//JZELcRprsj9lEqH8wyNOEQEmtoEQn25lEpyEY4PacA7oKO95YdUEbqdlxkqtP69W8MpSKUyEXLW0fXBtoD86m7jEZD+V/5QyV8S9VUVCy+u3y2XmFeXbvUqzJHz9x3N25I</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-personal-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-personal-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-personal-portal.terena.org/simplesamlphp/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://tcs-personal-portal.terena.org/simplesamlphp/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://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
+ </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/tcs</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>UvT</md:GivenName>
+ <md:SurName>LIS Unix</md:SurName>
+ <md:EmailAddress>na@example.org</md:EmailAddress>
+ </md:ContactPerson>
+ </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org.xml
index 591eeb3b..ecf95c91 100644
--- a/swamid-interfederations-2.0/terena.org.xml
+++ b/swamid-interfederations-2.0/terena.org.xml
@@ -1,32 +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="https://terena.org/sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md: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:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
- <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/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/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </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 Secretariat</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Services run by the TERENA Secretariat.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p/</mdui:PrivacyStatementURL>
+ <mdui:Logo height="143" width="150" xml:lang="en">https://www.terena.org/gfx/terena-150px-SP-Logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>TERENA</md:GivenName>
+ <md:SurName>AAI team</md:SurName>
+ <md:EmailAddress>aai@terena.org</md:EmailAddress>
+ </md:ContactPerson>
+ </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tumidp.lrz.de.xml b/swamid-interfederations-2.0/tumidp.lrz.de.xml
index c5ef6f26..b1b88373 100644
--- a/swamid-interfederations-2.0/tumidp.lrz.de.xml
+++ b/swamid-interfederations-2.0/tumidp.lrz.de.xml
@@ -1,8 +1,22 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tumidp.lrz.de/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:04Z">
+ <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">tum.de</saml1md:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">TU München (TUM)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Munich University of Technology (TUM)</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity Provider der Technischen Universität München</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for TUM</mdui:Description>
+ <mdui:InformationURL xml:lang="de">http://www.tum.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.tum.de</mdui:InformationURL>
+ </mdui:UIInfo>
</Extensions>
<KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -178,9 +192,12 @@ AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
- <OrganizationName xml:lang="de">Universität München (Technische Universität)</OrganizationName>
- <OrganizationDisplayName xml:lang="de">TU München (TUM)</OrganizationDisplayName>
+ <OrganizationName xml:lang="de">e8</OrganizationName>
+ <OrganizationName xml:lang="en">e8</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Technische Universität München</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Technische Universität München</OrganizationDisplayName>
<OrganizationURL xml:lang="de">http://www.tum.de</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.tum.de</OrganizationURL>
</Organization>
<ContactPerson contactType="administrative">
<GivenName>Ralf</GivenName>
diff --git a/swamid-interfederations-2.0/va-idp.lanet.lv.xml b/swamid-interfederations-2.0/va-idp.lanet.lv.xml
new file mode 100644
index 00000000..cc4b02ad
--- /dev/null
+++ b/swamid-interfederations-2.0/va-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://va-idp.lanet.lv">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://va-idp.lanet.lv/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://va-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">LAIFE - VA</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Vidzeme University of Applied Sciences - VA IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.va.lv/</OrganizationURL>
+ </Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/via-idp.lanet.lv.xml b/swamid-interfederations-2.0/via-idp.lanet.lv.xml
new file mode 100644
index 00000000..55db963f
--- /dev/null
+++ b/swamid-interfederations-2.0/via-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://via-idp.lanet.lv">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://via-idp.lanet.lv/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://via-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">LAIFE - VIA</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Ventspils University College - VIA IDP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+ <OrganizationURL xml:lang="lv">http://www.venta.lv/</OrganizationURL>
+ </Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>ITserviss</md:SurName>
+ <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 542e8879..72507e31 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"?>
-<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">statsbiblioteket.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">og.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">aa.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">aip.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ak.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">akat.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">asg.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">eg.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">gg.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">lg.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">mg.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ra.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">rs.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sg.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sgy.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sosur.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sska.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sss.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">stv.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">udc.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vd.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vhg.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">via.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">its.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sikker-adgang.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">regionsjaelland.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ibc.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">natmus.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">rungsted-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">roskilde-gym.gymund.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">greve-hym.gymund.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">himmelev-gymnasium.gymund.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">kggym.gymund.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">rks-gym.gymund.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">solgym.gymund.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sst.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ucsj.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sosuc.cphwest.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">kea.cphwest.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">cphwest.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dab.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">akf.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">bst.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dmi.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ism.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ens.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">fob.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">fsv.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">kul.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ami.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sfi.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ank.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vfc.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">stm.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vej.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dsl.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sosu-syd.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">videndjurs.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">munkensdam.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">odensekatedralskole.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">nghf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">cg-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">hs-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">kolding-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">zbc.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">cbs.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sosuesbjerg.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">deff.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">hogym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ku.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">kristne-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">eucsyd.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ikgym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dsn.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">naestved-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">learnmark.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">aabc.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vordingborg-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">aalborgstudenterkursus.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dmjx.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">hasseris-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">apoteket.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">statsskolen.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sosusj.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">kadk.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">iva.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dansidpp.uniit.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dtu.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ucn.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">gribskovgymnasium.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">gefion-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">frhavn-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sde.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">eal.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">eucnvs.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">hrs.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vuc-vs.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sceu.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">nykat-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vgtgym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">odense.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dalumls.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">fredericia-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ghg.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">au.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">koldcollege.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">knord.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">bggym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vibkat.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vghf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">eucnord.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">horsensgym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">eucvest.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">handelsskolen.com</shibmd:Scope>
- <shibmd:Scope regexp="false">cphbusiness.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 7bc00eaf..27f33af2 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,20 +1,34 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns: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>
+<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.edugain.org/dataprotection/coc-eu-01-draft</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>
+ <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>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+ </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
@@ -44,41 +58,78 @@ YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
+Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
-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>
+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
+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>
+ <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">Eberhard Karls Universität Tübingen</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Eberhard Karls Universität Tübingen</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.uni-tuebingen.de/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Thomas</GivenName>
+ <SurName>Zastrow</SurName>
+ <EmailAddress>thomas.zastrow@uni-tuebingen.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Department of Linguistics, General and Computational Linguistics</GivenName>
+ <SurName>Support</SurName>
+ <EmailAddress>webapplications@sfs.uni-tuebingen.de</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/whoami.cesnet.cz.xml b/swamid-interfederations-2.0/whoami.cesnet.cz.xml
index e8671828..a200b619 100644
--- a/swamid-interfederations-2.0/whoami.cesnet.cz.xml
+++ b/swamid-interfederations-2.0/whoami.cesnet.cz.xml
@@ -16,7 +16,7 @@
<mdui:DisplayName xml:lang="en">CESNET</mdui:DisplayName>
<mdui:DisplayName xml:lang="cs">CESNET</mdui:DisplayName>
<mdui:Description xml:lang="en">Identity Provider for CESNET employees.</mdui:Description>
- <mdui:Description xml:lang="cs">Identity Provider pro zaměstance CESNETu.</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance CESNETu.</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.ces.net/</mdui:InformationURL>
<mdui:InformationURL xml:lang="cs">http://www.cesnet.cz/</mdui:InformationURL>
<mdui:Logo height="88" width="200">https://pki.cesnet.cz/_media/cs/cesnet-logo-200.gif</mdui:Logo>
diff --git a/swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml b/swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml
new file mode 100644
index 00000000..55972ead
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.surfnetlabs.nl/shibboleth">
+ <md:Extensions>
+ <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>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md: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">
+ <md: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://wiki.surfnetlabs.nl/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://wiki.surfnetlabs.nl/Shibboleth.sso/Login" 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://wiki.surfnetlabs.nl/Shibboleth.sso/Login" index="2"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">SURFnetlabs Wiki</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="nl">SURFnetlabs Wiki</mdui:DisplayName>
+ <mdui:Description xml:lang="en">SURFnetlabs Wiki</mdui:Description>
+ <mdui:Description xml:lang="nl">SURFnetlabs Wiki</mdui:Description>
+ <mdui:Logo height="300" width="500" xml:lang="en">https://static.surfconext.nl/media/sp/SURFnetdienst.png</mdui:Logo>
+ <mdui:Logo height="300" width="500" xml:lang="nl">https://static.surfconext.nl/media/sp/SURFnetdienst.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">wiki surfnet surfnetlabs</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">wiki surfnet surfnetlabs</mdui:Keywords>
+ <mdui:InformationURL xml:lang="en">https://wiki.surfnetlabs.nl</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="nl">https://wiki.surfnetlabs.nl</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.surfnet.nl/Documents/best_practice_privacy_SURFfederatie_SURFconext_EN.pdf</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="nl">http://www.surfnet.nl/Documents/best_practice_privacy_SURFfederatie_SURFconext_NL.pdf</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>wiki.surfnetlabs.nl</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=wiki.surfnetlabs.nl,OU=Services,O=SURFnet B.V.,C=NL</ds:X509SubjectName>
+ <ds:X509Certificate>MIIEfjCCA2agAwIBAgIRAPMC2j8GrCWf8rRjWzHCHh8wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMDAxMjUwMDAwMDBaFw0xMzAxMjQyMzU5NTlaMFUxCzAJBgNV
+BAYTAk5MMRUwEwYDVQQKEwxTVVJGbmV0IEIuVi4xETAPBgNVBAsTCFNlcnZpY2Vz
+MRwwGgYDVQQDExN3aWtpLnN1cmZuZXRsYWJzLm5sMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAwy0KxkE03WH+r/G3yn4QLP7vEIXaslJXS2vD3Ba8vWIu
+MSvdtRrimSnwGAo8C3Dn4NwsRj8hmZN6KO1Rf22M5QEPAmskNdBlZrv4AmMOpqle
+YkJ16sp6GEX6yjrbzWlzl4GBE5K0DztjeBc+Uu+CUFWVrepGaj5Nic1mTprj2gRA
+Q5yUd16w91CG9WydPF5gqJ63xQAw1DwzUxjO3Ki7YHcNyJsmhzGOwD954UCLeAQ3
+xy+j02yx3WjzKkBcTJmb5WnzJnYNEqhI/s+Sur+ckm72iIfPSbcy8uP7LE0HGzwE
+SWXmo/Whxzm5WRvI8nVjZ2WQRXq+axWclAcf15yEjwIDAQABo4IBZjCCAWIwHwYD
+VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLjh9r/BG1J6
+vyOl7kQ2uHFIXl9iMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
+AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB4GA1UdEQQXMBWCE3dpa2ku
+c3VyZm5ldGxhYnMubmwwDQYJKoZIhvcNAQEFBQADggEBABbwQZuJ3HjsyZmHJDDE
+6aAbaMp6WLPPcihEl5VIHnV/ymBxEREol0dzXLFP8RJWAZHc7lMoD9M8t1UNpOD2
+Ix6r3nrM6UX8cP5Efp84ESkRETW3l5QWw/4+SoArsRRLZiNZ9hAeQFLQB5pODpNk
+sb3PYtEIZRq4nV4kP7T2zRGkllvIzoF/Z/Tf88Uxb8y7/d6q6sJx1kqZascmxBg7
+qieRAqjAtVENnmJFmUbp/6t5jLQ0zwqbsO4SHloodPjv5j3rkRzUBWcPQLvyyl6q
+LD1R7DW6m/DT9iQfZ11P3CV92ehsHFNqlGxakYH7S3ghv+dzcwWq53T8kTPaQaC6
+Fxw=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">SURFnetlabs Wiki</md:ServiceName>
+ <md:ServiceName xml:lang="nl">SURFnetlabs Wiki</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">SURFnetlabs Wiki</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="nl">SURFnetlabs Wiki</md:ServiceDescription>
+ <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.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <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:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">SURFnet B.V.</md:OrganizationName>
+ <md:OrganizationName xml:lang="nl">SURFnet B.V.</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>SURFnetlabs</md:GivenName>
+ <md:SurName>Beheer</md:SurName>
+ <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>SURFnetlabs</md:GivenName>
+ <md:SurName>Beheer</md:SurName>
+ <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>SURFnetlabs</md:GivenName>
+ <md:SurName>Beheer</md:SurName>
+ <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
+ </md:ContactPerson>
+ </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es.xml b/swamid-interfederations-2.0/www.rediris.es.xml
index e572686b..6e9527a2 100644
--- a/swamid-interfederations-2.0/www.rediris.es.xml
+++ b/swamid-interfederations-2.0/www.rediris.es.xml
@@ -1,48 +1,57 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/rediristestidp">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
- </mdrpi:RegistrationInfo>
- </md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">RedIRIS Test IDP</mdui:DisplayName>
- <mdui:DisplayName xml:lang="es">RedIRIS Test IDP</mdui:DisplayName>
- <mdui:Description xml:lang="en">This is a test IdP run by RedIRIS</mdui:Description>
- <mdui:Description xml:lang="es">Este es un IdP de pruebas operado por RedIRIS</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>MIIEbTCCA1WgAwIBAgIQE4Nv+KfqJviO2JRRnaYt7TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDcxNTAwMDAwMFoXDTEzMDcxNDIzNTk1OVowSjELMAkGA1UEBhMCRVMxEDAOBgNVBAgTB1NldmlsbGExEDAOBgNVBAoTB1JlZElSSVMxFzAVBgNVBAMTDnNpci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA09NWniyYzA2UzEiMuhBVVqD/h1D3BNUtzNj96DDA7QQneuRYH5lNP4FD0GU5rbiD7/ST9n9I6jCciHWnS7+3TuBzlGC+vBpi+84AW6Ln2Af8EKpuGVVS83CEZI50lTK3gKi+FXBdvVMg1mXozyaZYrOUHS/dhoSqQJaIsQFZpQ3OWTjQNtRl6VssWr9gyfuMn+DpcKVvdMPnNqUQfcKkSlXKBxujw2fZ+fa4LfQOzJm7jUAoSqSdYXBo+VuCGZwJbPgjihIAtZ27Q39qzp82nc6H49DIIGgjJJvgqA5rVT3LZmgGffl5njOHShPowlFFANkUHsdgRir/76yH1JNPyQIDAQABo4IBYTCCAV0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOCMtAbYU+Rsk/1RF0qEZqyPKy5KMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDnNpci5yZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB3lJmqV0T3fbyLRhkSTr0PQFJlzwY3hlbwD0CGh7eRjktqW5r6B0JsvfSNvECReorH8PmkCawPi0HSqHLbppkmDENZEgB4rxWHjSHXKlr0HR4NEP8e569LlTfGSpoGAHZjGGnsdH2s5D6QtN4KcfmNhbzr/6gkqeq/5lxdGH3hcUP5Pnjtqy52+hdA5+V3pV9ZNa+oZtn+LHOTNgxb4B82HNXCpmY1+7y3ehzUoI4tEoIHtfhwkQxxI+Pe9PV9JTeFj+yf0Xx4bVYjNwARWfk0DGEF9FZpK+ouLf8g4CLYvIRfHmMjwpoyMpotrFhmxDRuZ4UnL7FVSwQgoaEYf3ZG</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>MIIEbTCCA1WgAwIBAgIQE4Nv+KfqJviO2JRRnaYt7TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDcxNTAwMDAwMFoXDTEzMDcxNDIzNTk1OVowSjELMAkGA1UEBhMCRVMxEDAOBgNVBAgTB1NldmlsbGExEDAOBgNVBAoTB1JlZElSSVMxFzAVBgNVBAMTDnNpci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA09NWniyYzA2UzEiMuhBVVqD/h1D3BNUtzNj96DDA7QQneuRYH5lNP4FD0GU5rbiD7/ST9n9I6jCciHWnS7+3TuBzlGC+vBpi+84AW6Ln2Af8EKpuGVVS83CEZI50lTK3gKi+FXBdvVMg1mXozyaZYrOUHS/dhoSqQJaIsQFZpQ3OWTjQNtRl6VssWr9gyfuMn+DpcKVvdMPnNqUQfcKkSlXKBxujw2fZ+fa4LfQOzJm7jUAoSqSdYXBo+VuCGZwJbPgjihIAtZ27Q39qzp82nc6H49DIIGgjJJvgqA5rVT3LZmgGffl5njOHShPowlFFANkUHsdgRir/76yH1JNPyQIDAQABo4IBYTCCAV0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOCMtAbYU+Rsk/1RF0qEZqyPKy5KMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDnNpci5yZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB3lJmqV0T3fbyLRhkSTr0PQFJlzwY3hlbwD0CGh7eRjktqW5r6B0JsvfSNvECReorH8PmkCawPi0HSqHLbppkmDENZEgB4rxWHjSHXKlr0HR4NEP8e569LlTfGSpoGAHZjGGnsdH2s5D6QtN4KcfmNhbzr/6gkqeq/5lxdGH3hcUP5Pnjtqy52+hdA5+V3pV9ZNa+oZtn+LHOTNgxb4B82HNXCpmY1+7y3ehzUoI4tEoIHtfhwkQxxI+Pe9PV9JTeFj+yf0Xx4bVYjNwARWfk0DGEF9FZpK+ouLf8g4CLYvIRfHmMjwpoyMpotrFhmxDRuZ4UnL7FVSwQgoaEYf3ZG</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/simplesamlphp/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="http://sir.rediris.es/simplesamlphp/saml2/idp/SSOService.php"/>
- </md:IDPSSODescriptor>
-
- <md:Organization>
- <md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
- <md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">RedIRIS</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="es">RedIRIS</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
- <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>SIR helpdesk</md:GivenName>
- <md:EmailAddress>sir@rediris.es</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/umaidp">
+ <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Universidad de Málaga</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="es">Universidad de Málaga</mdui:DisplayName>
+ <mdui:Description xml:lang="en">The Identity Provider of Universidad de Málaga</mdui:Description>
+ <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad de Málaga</mdui:Description>
+ </mdui:UIInfo>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.es</shibmd:Scope>
+ </md:Extensions>
+
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEbTCCA1WgAwIBAgIQE4Nv+KfqJviO2JRRnaYt7TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDcxNTAwMDAwMFoXDTEzMDcxNDIzNTk1OVowSjELMAkGA1UEBhMCRVMxEDAOBgNVBAgTB1NldmlsbGExEDAOBgNVBAoTB1JlZElSSVMxFzAVBgNVBAMTDnNpci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA09NWniyYzA2UzEiMuhBVVqD/h1D3BNUtzNj96DDA7QQneuRYH5lNP4FD0GU5rbiD7/ST9n9I6jCciHWnS7+3TuBzlGC+vBpi+84AW6Ln2Af8EKpuGVVS83CEZI50lTK3gKi+FXBdvVMg1mXozyaZYrOUHS/dhoSqQJaIsQFZpQ3OWTjQNtRl6VssWr9gyfuMn+DpcKVvdMPnNqUQfcKkSlXKBxujw2fZ+fa4LfQOzJm7jUAoSqSdYXBo+VuCGZwJbPgjihIAtZ27Q39qzp82nc6H49DIIGgjJJvgqA5rVT3LZmgGffl5njOHShPowlFFANkUHsdgRir/76yH1JNPyQIDAQABo4IBYTCCAV0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOCMtAbYU+Rsk/1RF0qEZqyPKy5KMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDnNpci5yZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB3lJmqV0T3fbyLRhkSTr0PQFJlzwY3hlbwD0CGh7eRjktqW5r6B0JsvfSNvECReorH8PmkCawPi0HSqHLbppkmDENZEgB4rxWHjSHXKlr0HR4NEP8e569LlTfGSpoGAHZjGGnsdH2s5D6QtN4KcfmNhbzr/6gkqeq/5lxdGH3hcUP5Pnjtqy52+hdA5+V3pV9ZNa+oZtn+LHOTNgxb4B82HNXCpmY1+7y3ehzUoI4tEoIHtfhwkQxxI+Pe9PV9JTeFj+yf0Xx4bVYjNwARWfk0DGEF9FZpK+ouLf8g4CLYvIRfHmMjwpoyMpotrFhmxDRuZ4UnL7FVSwQgoaEYf3ZG</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php"/>
+
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uma/shib13/idp/SSOService.php"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uma/saml2/idp/SSOService.php"/>
+
+ </IDPSSODescriptor>
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uma/shib13/idp/aa.php"/>
+ </AttributeAuthorityDescriptor>
+
+ <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+ <md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
+ <md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">RedIRIS</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="es">RedIRIS</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <md:GivenName>SIR helpdesk</md:GivenName>
+ <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+ </md:ContactPerson>
+
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www2.eduid.cz.xml b/swamid-interfederations-2.0/www2.eduid.cz.xml
new file mode 100644
index 00000000..ec3ce18a
--- /dev/null
+++ b/swamid-interfederations-2.0/www2.eduid.cz.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.eduid.cz/shibboleth">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md: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">
+ <md: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://www2.eduid.cz/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://www2.eduid.cz/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">eduID.cz</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">eduID.cz</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Informational web of the eduID.cz federation. It brings informations to end users and to technical staff at end institutions.</mdui:Description>
+ <mdui:Description xml:lang="cs">Informační web projektu eduID.cz, který přináší informace jak pro koncové uživatele tak pro správce na jednotlivých institucích.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://eduroam.cz/en/start</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://eduroam.cz/cs/start</mdui:InformationURL>
+ <mdui:Logo height="63" width="150">http://www2.eduid.cz/eduid-logo-150.png</mdui:Logo>
+ </mdui:UIInfo>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>www2.eduid.cz</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www2.eduid.cz,O=CESNET,L=Prague,ST=Czech Republic,C=CZ</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDPDCCAiQCCQClUJYeXIZJ3TANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJD
+WjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEPMA0G
+A1UECgwGQ0VTTkVUMRYwFAYDVQQDDA13d3cyLmVkdWlkLmN6MB4XDTEzMDUwOTEy
+NDUyM1oXDTIzMDUwNzEyNDUyM1owYDELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6
+ZWNoIFJlcHVibGljMQ8wDQYDVQQHDAZQcmFndWUxDzANBgNVBAoMBkNFU05FVDEW
+MBQGA1UEAwwNd3d3Mi5lZHVpZC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAJwFqV+ZamKjesGhDmvnXRpFLuuYe2zP03M1nTkZp0p1sWc7z5R8sh+3
+TfnqF41KSyKV6xEhbuJMiZrCtXvNLMX1Uto+24rzC4M7ON7KBPI0/EBsL99f6bk8
+ohGQekbr6mq7dCKpLzRPrphh5sBT/VjxvG9UCtAU8KSEHxTWdm6HcoXqWfrVISDR
+fmye3qk+KPyXBzOf5YGodvcdzvnVCzYWRSudOX2xCuTWVzsAscdNrg2x9fbNICCs
+Xu9cJTqBnrVk7XcrsNUb2v667XdoBdRZOa7tf+MQGUr3OEyr3VmuDUTeSmNx85XX
+wgyMACtQAbsTYQRTDrTkzHlJJXlsDl8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+W5DVpUgPGdAFx2Zb0A3USgLT9UIvlfnN0iCqqyUVz1xRWksIRCR/PQNDmO/eMx9/
+bge0uO104HEHQKM3uqSkrJ+GlVbHyAdkK/yRi19M47cehz8Ee0Ev7WrR+94zhO5u
+fqaQ65WqVEEZcO5z8RSAiA/0MgZXIKnuGVo7Hwvx6tV9tCboAlho9kleg7dNK9Ou
+NG8x1eMvXpc8tKC7SMVhP3qBz8DU9bSllK3HSnIEDlhzGop+fJyRUDcY4VdpXHBE
+3mOpnlPfZgfr4bv5hSUb7Gv2Tmr4RSi6aUAb8Jq1r7mSX6XHMsDBTsD/1FUs31dl
+nt5ccOsKCAhHlCPX7iLLYw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduid.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduid.cz/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www2.eduid.cz/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduid.cz/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduid.cz/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eduid.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.cz/Shibboleth.sso/SAML2/POST" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/POST" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/Artifact" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/ECP" index="6"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.eduid.cz/Shibboleth.sso/SAML/POST" index="7"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www2.eduid.cz/Shibboleth.sso/SAML/Artifact" index="8"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Jan</md:GivenName>
+ <md:SurName>Tomášek</md:SurName>
+ <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
+ </md:ContactPerson>
+ </md:EntityDescriptor>