summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-interfederations-2.0.mxml9
-rw-r--r--swamid-interfederations-2.0/.xml136
-rw-r--r--swamid-interfederations-2.0/aai-idp.uzh.ch.xml2
-rw-r--r--swamid-interfederations-2.0/aai-logon.bfh.ch.xml6
-rw-r--r--swamid-interfederations-2.0/aai-logon.switch.ch.xml3
-rw-r--r--swamid-interfederations-2.0/aai-logon.uni.li.xml171
-rw-r--r--swamid-interfederations-2.0/agata.suz.cvut.cz.xml109
-rw-r--r--swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml12
-rw-r--r--swamid-interfederations-2.0/box-idp.nordu.net.xml13
-rw-r--r--swamid-interfederations-2.0/cafetools.ufpi.br.xml110
-rw-r--r--swamid-interfederations-2.0/capuccino.info.ufrn.br.xml12
-rw-r--r--swamid-interfederations-2.0/clarin.ids-mannheim.de.xml10
-rw-r--r--swamid-interfederations-2.0/clarino.uib.no.xml63
-rw-r--r--swamid-interfederations-2.0/dev.emeraldinsight.com.xml3
-rw-r--r--swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml3
-rw-r--r--swamid-interfederations-2.0/filesender.funet.fi.xml118
-rw-r--r--swamid-interfederations-2.0/foodl.org.xml56
-rw-r--r--swamid-interfederations-2.0/hbidp.hb.se.xml11
-rw-r--r--swamid-interfederations-2.0/homeproj.cesnet.cz.xml187
-rw-r--r--swamid-interfederations-2.0/iam.cf.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/identity.mdh.se.xml3
-rw-r--r--swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp.admin.grnet.gr.xml2
-rw-r--r--swamid-interfederations-2.0/idp.bth.se.xml1
-rw-r--r--swamid-interfederations-2.0/idp.csc.fi.xml77
-rw-r--r--swamid-interfederations-2.0/idp.dfn.de.xml7
-rw-r--r--swamid-interfederations-2.0/idp.feide.no.xml581
-rw-r--r--swamid-interfederations-2.0/idp.hig.se.xml1
-rw-r--r--swamid-interfederations-2.0/idp.hs-esslingen.de.xml225
-rw-r--r--swamid-interfederations-2.0/idp.ids-mannheim.de.xml147
-rw-r--r--swamid-interfederations-2.0/idp.it.gu.se.xml5
-rw-r--r--swamid-interfederations-2.0/idp.it.su.se.xml3
-rw-r--r--swamid-interfederations-2.0/idp.kb.se.xml14
-rw-r--r--swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp.nordu.net.xml1
-rw-r--r--swamid-interfederations-2.0/idp.shibboleth.net.xml3
-rw-r--r--swamid-interfederations-2.0/idp.student.bth.se.xml1
-rw-r--r--swamid-interfederations-2.0/idp.ufpr.br.xml115
-rw-r--r--swamid-interfederations-2.0/idp.uqam.ca.xml148
-rw-r--r--swamid-interfederations-2.0/idp2.iay.org.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp2.kau.se.xml3
-rw-r--r--swamid-interfederations-2.0/issues.shibboleth.net.xml3
-rw-r--r--swamid-interfederations-2.0/kiidp.ki.se.xml26
-rw-r--r--swamid-interfederations-2.0/login.du.se.xml3
-rw-r--r--swamid-interfederations-2.0/login.liu.se.xml8
-rw-r--r--swamid-interfederations-2.0/openwiki.uninett.no.xml61
-rw-r--r--swamid-interfederations-2.0/repos.ids-mannheim.de.xml2
-rw-r--r--swamid-interfederations-2.0/rr.funet.fi.xml227
-rw-r--r--swamid-interfederations-2.0/saml-1.sys.kth.se.xml7
-rw-r--r--swamid-interfederations-2.0/shib-idp-1.oru.se.xml5
-rw-r--r--swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/shib.manchester.ac.uk.xml103
-rw-r--r--swamid-interfederations-2.0/sp.catalog.clarin.eu.xml151
-rw-r--r--swamid-interfederations-2.0/sp.lat.csc.fi.xml148
-rw-r--r--swamid-interfederations-2.0/sp.lux17.mpi.nl.xml152
-rw-r--r--swamid-interfederations-2.0/swamid.user.uu.se.xml120
-rw-r--r--swamid-interfederations-2.0/terena.org.xml51
-rw-r--r--swamid-interfederations-2.0/test.ukfederation.org.uk.xml3
-rw-r--r--swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml174
-rw-r--r--swamid-interfederations-2.0/vea-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.xml149
-rw-r--r--swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml88
-rw-r--r--swamid-interfederations-2.0/wiki.edugain.org.xml32
-rw-r--r--swamid-interfederations-2.0/wiki.shibboleth.net.xml5
-rw-r--r--swamid-interfederations-2.0/www.emeraldinsight.com.xml174
-rw-r--r--swamid-interfederations-2.0/www.rediris.es.xml25
-rw-r--r--swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml139
-rw-r--r--swamid-interfederations-2.0/www.videotorium.hu.xml25
70 files changed, 3058 insertions, 1440 deletions
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 3579b813..1d2f72e2 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -5,12 +5,14 @@
<xi:include href="swamid-interfederations-2.0/aai-idp.uzh.ch.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.bfh.ch.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.switch.ch.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.uni.li.xml"/>
<xi:include href="swamid-interfederations-2.0/aai.ruhr-uni-bochum.de.xml"/>
<xi:include href="swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml"/>
<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/agata.suz.cvut.cz.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"/>
@@ -39,6 +41,7 @@
<xi:include href="swamid-interfederations-2.0/cafe.on.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.pucminas.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.sti.uff.br.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafetools.ufpi.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ufpa.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.unifap.br.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.unisc.br.xml"/>
@@ -50,6 +53,7 @@
<xi:include href="swamid-interfederations-2.0/cas.cuni.cz.xml"/>
<xi:include href="swamid-interfederations-2.0/cast.itunes.uni-muenchen.de.xml"/>
<xi:include href="swamid-interfederations-2.0/clarin.ids-mannheim.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/clarino.uib.no.xml"/>
<xi:include href="swamid-interfederations-2.0/cloudidp1.canarie.ca.xml"/>
<xi:include href="swamid-interfederations-2.0/cnb.rediris.es.xml"/>
<xi:include href="swamid-interfederations-2.0/connect.sunet.se.xml"/>
@@ -91,6 +95,7 @@
<xi:include href="swamid-interfederations-2.0/gw.ct.infn.it.xml"/>
<xi:include href="swamid-interfederations-2.0/halfback.cnaf.infn.it.xml"/>
<xi:include href="swamid-interfederations-2.0/hbidp.hb.se.xml"/>
+<xi:include href="swamid-interfederations-2.0/homeproj.cesnet.cz.xml"/>
<xi:include href="swamid-interfederations-2.0/iam.cf.ac.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/idem.ced.inaf.it.xml"/>
<xi:include href="swamid-interfederations-2.0/idemfero.units.it.xml"/>
@@ -181,6 +186,7 @@
<xi:include href="swamid-interfederations-2.0/idp.uef.fi.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ufgd.edu.br.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ufmg.br.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufpr.br.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ujep.cz.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uni-bremen.de.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uni-duisburg-essen.de.xml"/>
@@ -195,6 +201,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.uqam.ca.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"/>
@@ -346,6 +353,7 @@
<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/vea-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"/>
@@ -355,6 +363,7 @@
<xi:include href="swamid-interfederations-2.0/webshop.rz.uni-wuerzburg.de.xml"/>
<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/wifi.dir.garr.it:12081.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.edugain.org.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml"/>
<xi:include href="swamid-interfederations-2.0/wiki.shibboleth.net.xml"/>
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index 32e68b75..efce0880 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-09-06T13: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/" registrationInstant="2011-02-21T13:53:59Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/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-idp.uzh.ch.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
index cb3240bd..e409bb36 100644
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.uzh.ch/idp/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-07-01T14:52:44Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-08-30T07:24:39Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
diff --git a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml b/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
index 042fcced..77571926 100644
--- a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.bfh.ch/idp/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-07-05T11:34:05Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-07-24T06:16:29Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
@@ -10,7 +10,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfh.ch</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="de">BFH - Berner Fachhochschule</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">BUAS</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">BUAS - Bern University of Applied Sciences</mdui:DisplayName>
<mdui:DisplayName xml:lang="fr">HESB - Haute école spécialisée bernoise</mdui:DisplayName>
<mdui:Description xml:lang="de">Berner Fachhochschule BFH</mdui:Description>
<mdui:Description xml:lang="en">BUAS - Bern University of Applied Sciences</mdui:Description>
@@ -105,7 +105,7 @@ M2r2BWHVZt2GQD4ZsRgLjtsaRoyobIN2CWhOVZqnlk4vbXFXlS++TwtBzJq8HKft
<Organization>
<OrganizationName xml:lang="en">bfh.ch</OrganizationName>
<OrganizationDisplayName xml:lang="de">BFH - Berner Fachhochschule</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">BUAS</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">BUAS - Bern University of Applied Sciences</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="fr">HESB - Haute école spécialisée bernoise</OrganizationDisplayName>
<OrganizationURL xml:lang="de">http://www.bfh.ch/</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch.xml b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
index 12e32429..7d689a8d 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.switch.ch/idp/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-02-25T15:48:26Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-08-30T12:27:43Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
@@ -54,7 +54,6 @@ c1FacVORKSxWRMJL3kGzA8EvfzN+4mYs5JxslTdsyI0k6QssjCWq/Nk+B1RtHC/Y
<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.switch.ch/idp/profile/Shibboleth/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.switch.ch/idp/profile/SAML2/Redirect/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.switch.ch/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.switch.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
diff --git a/swamid-interfederations-2.0/aai-logon.uni.li.xml b/swamid-interfederations-2.0/aai-logon.uni.li.xml
new file mode 100644
index 00000000..f6639829
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.uni.li.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.uni.li/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-07-24T06:43:39Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.li</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Universität Liechtenstein</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Liechtenstein</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Universität Liechtenstein</mdui:Description>
+ <mdui:Description xml:lang="en">University of Liechtenstein</mdui:Description>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAACRJREFUeJxiYBgFlINdalL/icG41I4aQKIBo4BGAAAAAP//AwAhn6eucY32zQAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAPLSURBVHic7JjbS1RRFMZXzjjOkDRqOmlY3siI0qDLg1Gm0cUoTI3RsgyjHiywi11U0lA00zK7QC/1UIEvDURvvfUQBZHUS9Hfc1qLvY5nexzRYpjVgtnw42zPXvucb39n7YsDjuNAhn9HXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHa8SqbsRfYh4ZUELzKwOT+cSBWtBeFESShr/mV1uaFES8HSsVXhYJ2lbcSqX0VKkFlrkAeRC8gmpIvv08tuI/eYk0gcmUamkKDVHkF6kRPIG+Ql0oSs5zqVG8gHZAKpWpGB32uKnFTxa3vMaYyG5l/2vDzP+VkbSxr7G2PPFEbilrZpqz6EVCIzPMgG5Cgbu5oHCHxvNxvklvNIEXIZ2Yjcstru8LUZqec6tXfyh6Eymcy4JQ38vLXQSRVzaEz9Gs/Ax2VR59u2oqSxZGLH2mUN7GCzDvgMvMjm3OX4GTaH4rqRR5bJZNQYmGz0G7gKTIaGLKPVGjjKAwE2xjWQMuMFmEx0DcxF+pDrHD9hPYcysNj3PFrjWpMYeAh5iIyDmdYBzQbSWkSZQ9OxESlFDnMbZccOMFMtYpkW43o/MoycYnNoCm9BjrNpFBsFk7nAz9+FXLLeXwtmqejTaqCKknYD59DAL9jm58diA89Z9bNg1ieaojfBZAxN3SGmyYrPRtrBZBftppStm5FnXK8BL9MakA1ID5iMreMY6ncFaQGzJtL714HZ+fcjp7l/W1oNnEEDv6KBn7DND8W2LzRwxKrT4OiIMuBrz7P+djeQbPA2AHctzAezC1Ohqf8aKQMzxWlqT8HC4vbr4+cBx3dxH9rgaAm4llYDi7MD8cqcYLwiJ7AIPAPGo4Gs0mUMfAomA2m9GvcN+hW3DYC3bt3nKxn9no3dAyaTxtiMauQYmE0m19ePNqlBpM0ysJM/wkDaDfzLkszAQeveA1/8MF+D4GWga4SdgTvBTF3ahSnTqvl+HniZ5/ajD+EOwDaQTgS0DIz/zwZSNtGO2c2GkIGTfI8yho4zT3iQtNP2cz96YS/Xx/hK0+0t9z0C3qH5HVIOZh2lDGzk+6N87eE29xBOayv9d1MBZk3+mPkxIdU/JmTIGJgxUCPiArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA7fwAAAP//AwCc7vsetROpDQAAAABJRU5ErkJggg==</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>195.176.84.0/23</mdui:IPHint>
+ <mdui:IPHint>193.5.26.0/23</mdui:IPHint>
+ <mdui:IPHint>193.5.26.0/24</mdui:IPHint>
+ <mdui:IPHint>193.5.27.0/24</mdui:IPHint>
+ <mdui:IPHint>193.222.112.0/20</mdui:IPHint>
+ <mdui:IPHint>193.222.112.0/21</mdui:IPHint>
+ <mdui:IPHint>193.222.120.0/22</mdui:IPHint>
+ <mdui:IPHint>193.222.124.0/23</mdui:IPHint>
+ <mdui:IPHint>195.176.80.0/22</mdui:IPHint>
+ <mdui:IPHint>193.222.126.0/24</mdui:IPHint>
+ <mdui:IPHint>193.222.127.0/24</mdui:IPHint>
+ <mdui:DomainHint>uni.li</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:47.149655,9.516456</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAP7KVxUdRY7elqq2OvamARNF3EqkMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTEwMjIzMTYxNzEz
+WhcNMTQwMjIzMTYxNzEzWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmBtxcfEwbrf1mVnSSYlBEk4c
+uL9qaUWgC2yL865lFUiDV8YfcfGW2IEH9VhxFqCoR0FWcHFLwjRBNbPAKApJKNIo
+nHyAjG1cV9xmbV1IrYbJ5An3grdttLLl9Bd3cJOgrteenEFVqZ88DRZUXRhL2Fra
+MRzVwF5bmIOzQB+dgPna+9bO8f7QBnJnCFAiZvpTsByvrFWD7tLZqxhgmo9LRA3z
+GJMRRL+84PDUEUgqZWzLiuNT1DbjWQCAJmTXpz7SPcuL4xA8ptqkiOF0hdYPfWCz
+Cxc2ex1AuFxZrH1+s++8pKCVoT95IiV3Gs99A8zl7K/9uid/cUh7FUKhuNKFwQID
+AQABo2cwZTBEBgNVHREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2Fh
+aS1sb2dvbi51bmkubGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJlvfp9tflll
+x8GGWV2rgJ3DIZ5gMA0GCSqGSIb3DQEBBQUAA4IBAQBxAuAnIbX9N4FQxENsz+j7
+Elrr0JGtfl1CKJ/NmP0RYfNkQY7bsEzaiwNh0NqSmyt/RQfZRqn5VVzpYjhjWsZB
+rVRtGEGvxZniGeWIomnMNE9ydRCh0p7kdDFJWL2CaQNMQVtH7S5DqFaZ0mQsRrHV
+HriuYIkDiPVh+Na+gP9qtU34UxPL4sgmDSoXVotZ+6ajdpZr8LFl85gow53ICaZ7
+MrDxL9Jo+5sBGE/8m70LgO/2K+ysAbYlcK0iAL+IJTVmF9lSJJZmrZvq5OcAEOPX
+XS/Qn/lUfwKFLRU+MT/NFboEp3w12jAjCFz+Ii5LonkOhIxzwEWXc2WJcC/aqiXJ
+ </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>
+MIIDIDCCAgigAwIBAgIJAOhZUJ08jQ66MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTMwMTIxMDc1NTM0WhcNMTYwMTIxMDc1
+NTM0WjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAoWSikfE9lbGDSuDLVYRukm1vnqczuErl+U53ZR3K
+T0HMCutP37H0/oEbQdidEH4snG43NZ8uUqnbpmlYESWW6IaaNWhja9K5RfdutZb7
+u9ag3VYZNaVsONLz9OhVtuTSDaMM4SaBVpjKeAW5/V6q1zlTtHIYT/RuLJaZTRll
+xQZkXWiOQb1gfBuj3BqJ0mYwu4vc6rHrWp2sQ3VxavQ5tIAAdm6Ljexd2FEmRVsv
+bc0nuiHUja6mUJAXps6qAJuvPqmKpzrmipfWl3TE6AYHfRlXME+ipIQXXcIEqR1c
+O7OtECCO2ZD2raFIgEO0/gk1Z9jND/zX1DuJ6Yo97v0nJQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
+bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBJkmiO3dfjxi25odK77DbKq3fXE
+MA0GCSqGSIb3DQEBBQUAA4IBAQB502va1acwsrgm9jjB6P8FDVWnDOgwWajKwxc5
+jDTHIXBFrVurD9LR1jv/imeQKB+vK/CIYVkdmel8jdr/JAkEXtBaQehQgmdnvSeF
+kxfP7braAEbzvpvVvqOeQ33K7WGq8Jw2mSsosrIVxCjxv1WMNbMc6feuhqbx3OLF
++FpqZwXbA7/lQ/qwMk0fP2dpLYOvfeZG92JyyWqnM0iTUAgFf7xB3Ti4PN8VtRTY
+5+Iqh51yf857CF3PaAYT7wdjGjubkar4zI71q9MQTOZuN4nEtaXFWKJL5tKvo3J4
+KAKEnDkWfKGmYBn6v6NDMXTH1nBVdQnoCDJYipJn+LsStgby
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.uni.li:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.uni.li:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.uni.li/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.uni.li/idp/profile/SAML2/Redirect/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.uni.li/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.uni.li/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.li</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAP7KVxUdRY7elqq2OvamARNF3EqkMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTEwMjIzMTYxNzEz
+WhcNMTQwMjIzMTYxNzEzWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmBtxcfEwbrf1mVnSSYlBEk4c
+uL9qaUWgC2yL865lFUiDV8YfcfGW2IEH9VhxFqCoR0FWcHFLwjRBNbPAKApJKNIo
+nHyAjG1cV9xmbV1IrYbJ5An3grdttLLl9Bd3cJOgrteenEFVqZ88DRZUXRhL2Fra
+MRzVwF5bmIOzQB+dgPna+9bO8f7QBnJnCFAiZvpTsByvrFWD7tLZqxhgmo9LRA3z
+GJMRRL+84PDUEUgqZWzLiuNT1DbjWQCAJmTXpz7SPcuL4xA8ptqkiOF0hdYPfWCz
+Cxc2ex1AuFxZrH1+s++8pKCVoT95IiV3Gs99A8zl7K/9uid/cUh7FUKhuNKFwQID
+AQABo2cwZTBEBgNVHREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2Fh
+aS1sb2dvbi51bmkubGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJlvfp9tflll
+x8GGWV2rgJ3DIZ5gMA0GCSqGSIb3DQEBBQUAA4IBAQBxAuAnIbX9N4FQxENsz+j7
+Elrr0JGtfl1CKJ/NmP0RYfNkQY7bsEzaiwNh0NqSmyt/RQfZRqn5VVzpYjhjWsZB
+rVRtGEGvxZniGeWIomnMNE9ydRCh0p7kdDFJWL2CaQNMQVtH7S5DqFaZ0mQsRrHV
+HriuYIkDiPVh+Na+gP9qtU34UxPL4sgmDSoXVotZ+6ajdpZr8LFl85gow53ICaZ7
+MrDxL9Jo+5sBGE/8m70LgO/2K+ysAbYlcK0iAL+IJTVmF9lSJJZmrZvq5OcAEOPX
+XS/Qn/lUfwKFLRU+MT/NFboEp3w12jAjCFz+Ii5LonkOhIxzwEWXc2WJcC/aqiXJ
+ </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>
+MIIDIDCCAgigAwIBAgIJAOhZUJ08jQ66MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTMwMTIxMDc1NTM0WhcNMTYwMTIxMDc1
+NTM0WjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAoWSikfE9lbGDSuDLVYRukm1vnqczuErl+U53ZR3K
+T0HMCutP37H0/oEbQdidEH4snG43NZ8uUqnbpmlYESWW6IaaNWhja9K5RfdutZb7
+u9ag3VYZNaVsONLz9OhVtuTSDaMM4SaBVpjKeAW5/V6q1zlTtHIYT/RuLJaZTRll
+xQZkXWiOQb1gfBuj3BqJ0mYwu4vc6rHrWp2sQ3VxavQ5tIAAdm6Ljexd2FEmRVsv
+bc0nuiHUja6mUJAXps6qAJuvPqmKpzrmipfWl3TE6AYHfRlXME+ipIQXXcIEqR1c
+O7OtECCO2ZD2raFIgEO0/gk1Z9jND/zX1DuJ6Yo97v0nJQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
+bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBJkmiO3dfjxi25odK77DbKq3fXE
+MA0GCSqGSIb3DQEBBQUAA4IBAQB502va1acwsrgm9jjB6P8FDVWnDOgwWajKwxc5
+jDTHIXBFrVurD9LR1jv/imeQKB+vK/CIYVkdmel8jdr/JAkEXtBaQehQgmdnvSeF
+kxfP7braAEbzvpvVvqOeQ33K7WGq8Jw2mSsosrIVxCjxv1WMNbMc6feuhqbx3OLF
++FpqZwXbA7/lQ/qwMk0fP2dpLYOvfeZG92JyyWqnM0iTUAgFf7xB3Ti4PN8VtRTY
+5+Iqh51yf857CF3PaAYT7wdjGjubkar4zI71q9MQTOZuN4nEtaXFWKJL5tKvo3J4
+KAKEnDkWfKGmYBn6v6NDMXTH1nBVdQnoCDJYipJn+LsStgby
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.uni.li:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.uni.li:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">uni.li</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Universität Liechtenstein</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">University of Liechtenstein</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.uni.li/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>AAI</GivenName>
+ <SurName>Team</SurName>
+ <EmailAddress>mailto:aai@uni.li</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>AAI</GivenName>
+ <SurName>Team</SurName>
+ <EmailAddress>mailto:aai@uni.li</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/agata.suz.cvut.cz.xml b/swamid-interfederations-2.0/agata.suz.cvut.cz.xml
new file mode 100644
index 00000000..16ec810f
--- /dev/null
+++ b/swamid-interfederations-2.0/agata.suz.cvut.cz.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://agata.suz.cvut.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#ecdsa-sha224"/>
+ <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://agata.suz.cvut.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://agata.suz.cvut.cz/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <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">Canteens of CTU in Prague</mdui:Description>
+ <mdui:Description xml:lang="cs">Menzy ČVUT v Praze</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://www.suz.cvut.cz/en/the-facilities-administration-department-of-the-czech-technical-university-in-prague</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">https://www.suz.cvut.cz/sprava-ucelovych-zarizeni-cvut</mdui:InformationURL>
+ <mdui:Logo height="40" width="53">https://idp2.civ.cvut.cz/idp/images/logo_cvut_40pix.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>agata.suz.cvut.cz</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=agata.suz.cvut.cz,OU=Domain Control Validated</ds:X509SubjectName>
+ <ds:X509Certificate>MIIEcDCCA1igAwIBAgIRAJSnezeeSwDm9u6PQ2mCUPswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA3MDEwMDAwMDBaFw0xNjA2MzAyMzU5NTlaMD8xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRYWdhdGEuc3V6
+LmN2dXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkNwyaiPvQ
+fx1lS9AYlyR5VAYOwy/1KBC3FhSdGLMVpYYFIvVCEK5yDqQs6D7edBnjvqoDkIkU
+cbb6LZGz0bmiSMOE5toxMb1r8XzNcjzXe4Rn8NtFbO2lSUp77eTvMt4sTdmq1Krg
+7n5XuS0SrbIcWTh4M81QazVCIpD4L/elNCgyptKWw77EbRYe6as5lJsCcujSDCHD
+gO+gOqCM3fvOLSoCZv6zDnBAS4BVnfOOB4yRZgW5koIMFVnuXkMmyrqSc9kUiWp4
+EjghtgPuVsuhf+KWHegH63HfRBA7wp6Ukz/gkkBmRRIg4ogPUkBQJpTIBmCFHune
+hMUcueegHqRfAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUWeCB62InMSMtp9LL306vFP2jVsgwDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWFnYXRhLnN1ei5jdnV0LmN6
+MA0GCSqGSIb3DQEBBQUAA4IBAQCb5NX/OotQMluDW6r3mCtXGnkSHRikC75D8+ua
+ZEobB7MQHoeJg6ked7FlkatHkoqH2CZL7B66y9mhFJUFSHhRqjmudWRrJBW4SnME
+qnYLXX2q6NSmac3fH7P6BL7FyhED9+T+zfHI99A8oplvnXf4Vws/89hbzopCoI0+
+b++srMBwK/0XLocTzlTHhzCeNKflpEsP5YlNRvj4S25FhCb82Cmd+hL2OQen5000
+C0SakbhPqTeJv59bCJOjYhLfDW90dnn3HjdManRagoyE2zGCa88C7vSqwxabi7fj
+Bie8tt/8TZ/a7EDN0YLJRmmMLKKCTwebuCYsUFiMOLdqCK2+
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <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://agata.suz.cvut.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="cs">ČVUT</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">CTU</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="cs">http://www.cvut.cz/cs</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.cvut.cz/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Tomas</md:GivenName>
+ <md:SurName>Kanovsky</md:SurName>
+ <md:EmailAddress>kanovsky@suz.cvut.cz</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
index 6681a0e3..564dfe62 100644
--- a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.shib.manchester.ac.uk/shibboleth">
- <!--
- This is a "beta" Shibboleth IdP for The University of Manchester.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
</Extensions>
@@ -126,11 +123,12 @@
<OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Web Authentication Team</GivenName>
- <EmailAddress>mailto:webauth.admin@manchester.ac.uk</EmailAddress>
+ <GivenName>IT Service Desk</GivenName>
+ <EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Web Authentication Team</GivenName>
- <EmailAddress>mailto:webauth.admin@manchester.ac.uk</EmailAddress>
+ <GivenName>Sam</GivenName>
+ <SurName>Jones</SurName>
+ <EmailAddress>mailto:sam.jones@manchester.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/box-idp.nordu.net.xml b/swamid-interfederations-2.0/box-idp.nordu.net.xml
index a36d64c6..bf84e8a1 100644
--- a/swamid-interfederations-2.0/box-idp.nordu.net.xml
+++ b/swamid-interfederations-2.0/box-idp.nordu.net.xml
@@ -41,6 +41,19 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://box-idp.nordu.net/simplesaml/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://box-idp.nordu.net/simplesaml/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://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">NORDUnet Box Service Access</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">NORDUnet Box Service Access (box.com)</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md: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"/>
+ <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/cafetools.ufpi.br.xml b/swamid-interfederations-2.0/cafetools.ufpi.br.xml
new file mode 100644
index 00000000..f3684dde
--- /dev/null
+++ b/swamid-interfederations-2.0/cafetools.ufpi.br.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafetools.ufpi.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">ufpi.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UFPI - Universidade Federal do Piaui</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UFPI - Universidade Federal do Piaui</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UFPI - Universidade Federal do Piaui</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UFPI - Universidade Federal do Piaui</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ufpi.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ufpi.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDqjCCApICAQAwDQYJKoZIhvcNAQEFBQAwgZoxJjAkBgNVBAoTHVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0B
+CQEWD250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgT
+BVBpYXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMB4XDTEzMDcx
+NTE4NDUxMVoXDTE2MDcxNDE4NDUxMVowgZoxJjAkBgNVBAoTHVVuaXZlcnNpZGFk
+ZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0BCQEW
+D250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBp
+YXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkjRNJykzf+pYQwfB+HpWRnkVcg+lLI/wjQj
+CNfcjNeSFsXRVaPCrWzVJ6DlMnYM1sxkp9b+We5B5/t4P92XM+ZeFLvFEd5kbi50
+JlAqFLVQxVBjLJdJ9AvUxMn55bQAh9mw4ANMb0U0iYcB25POJ6vWjxCuQR68xV4t
+nqgYOk8/d299pXxeZd8VMPfasfazzov1fa2aqpdrb8dqX+6/RMJm71d3nBHsPJuO
+y5ixRrE3HHYS8K52Eah59GY0NBF3EpearDjCI/W2KVmMJE6kNtMDkq8cjOGLZCsb
+7sEb/uLpWn0Sxd7NPc6VkRzN5m1eFe4dQB3rz1dy9ngEa+GQjwIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQBfGXW54W7Y8WE5naezc3cFKrxErBdQ5ZvViX77Bsc3uNal
+EE2cXAkaYQbwKRa9Pp2zpkkr/wSKu2gZ1OwH4y8tWZf3kKzwxZa41fj2drWHYC88
++d4igeWI86UWoIA9HcQ9LZtY6gZSqpkaeOeKniFR/xTXrOwFOtreWkkZ6w4mhCAj
+EEK4mjitPz1kjBkaaZcnDOYysPjZ7Iq5mrEFwVvW6xXSs0LnGevKMig8Bi8Kr+nW
+UXJvN7r9gpaML2SGcEcAmqVExt2IuPrtUGvIS7CaN3+gaFAC53gmK+30nwLwvBkC
+DqmYcKWK/3TMzk3nUXEJx2H36Knb+Hv/Hig1rx35
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafetools.ufpi.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://cafetools.ufpi.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafetools.ufpi.br/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafetools.ufpi.br/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafetools.ufpi.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">ufpi.br</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIDqjCCApICAQAwDQYJKoZIhvcNAQEFBQAwgZoxJjAkBgNVBAoTHVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0B
+CQEWD250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgT
+BVBpYXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMB4XDTEzMDcx
+NTE4NDUxMVoXDTE2MDcxNDE4NDUxMVowgZoxJjAkBgNVBAoTHVVuaXZlcnNpZGFk
+ZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0BCQEW
+D250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBp
+YXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkjRNJykzf+pYQwfB+HpWRnkVcg+lLI/wjQj
+CNfcjNeSFsXRVaPCrWzVJ6DlMnYM1sxkp9b+We5B5/t4P92XM+ZeFLvFEd5kbi50
+JlAqFLVQxVBjLJdJ9AvUxMn55bQAh9mw4ANMb0U0iYcB25POJ6vWjxCuQR68xV4t
+nqgYOk8/d299pXxeZd8VMPfasfazzov1fa2aqpdrb8dqX+6/RMJm71d3nBHsPJuO
+y5ixRrE3HHYS8K52Eah59GY0NBF3EpearDjCI/W2KVmMJE6kNtMDkq8cjOGLZCsb
+7sEb/uLpWn0Sxd7NPc6VkRzN5m1eFe4dQB3rz1dy9ngEa+GQjwIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQBfGXW54W7Y8WE5naezc3cFKrxErBdQ5ZvViX77Bsc3uNal
+EE2cXAkaYQbwKRa9Pp2zpkkr/wSKu2gZ1OwH4y8tWZf3kKzwxZa41fj2drWHYC88
++d4igeWI86UWoIA9HcQ9LZtY6gZSqpkaeOeKniFR/xTXrOwFOtreWkkZ6w4mhCAj
+EEK4mjitPz1kjBkaaZcnDOYysPjZ7Iq5mrEFwVvW6xXSs0LnGevKMig8Bi8Kr+nW
+UXJvN7r9gpaML2SGcEcAmqVExt2IuPrtUGvIS7CaN3+gaFAC53gmK+30nwLwvBkC
+DqmYcKWK/3TMzk3nUXEJx2H36Knb+Hv/Hig1rx35
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafetools.ufpi.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">UFPI - Univerisdade Federal do Piaui</OrganizationName>
+ <OrganizationName xml:lang="pt-br">UFPI - Univerisdade Federal do Piaui</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">UFPI - Universidade Federal do Piaui</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">UFPI - Universidade Federal do Piaui</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ufpi.br/</OrganizationURL>
+ <OrganizationURL xml:lang="pt-br">http://www.ufpi.br/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>Arinaldo Silva</SurName>
+ <EmailAddress>arinaldo@ufpi.edu.br</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml b/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml
index 6e30a0b9..e88d87cc 100644
--- a/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml
+++ b/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml
@@ -11,10 +11,10 @@
<Extensions>
<shibmd:Scope regexp="false">ufrn.br</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en"> UFRN - Universidade Federal do Rio Grande do Norte </mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br"> UFRN - Universidade Federal do Rio Grande do Norte </mdui:DisplayName>
- <mdui:Description xml:lang="en"> UFRN - Universidade Federal do Rio Grande do Norte </mdui:Description>
- <mdui:Description xml:lang="pt-br"> UFRN - Universidade Federal do Rio Grande do Norte </mdui:Description>
+ <mdui:DisplayName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.ufrn.br/</mdui:InformationURL>
<mdui:InformationURL xml:lang="pt-br">http://www.ufrn.br/</mdui:InformationURL>
</mdui:UIInfo>
@@ -108,8 +108,8 @@ waiW5wfG
<Organization>
<OrganizationName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationName>
<OrganizationName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationName>
- <OrganizationDisplayName xml:lang="en"> UFRN - Universidade Federal do Rio Grande do Norte </OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="pt-br"> UFRN - Universidade Federal do Rio Grande do Norte </OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.ufrn.br/</OrganizationURL>
<OrganizationURL xml:lang="pt-br">http://www.ufrn.br/</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml b/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
index 23508b54..175a5a2e 100644
--- a/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
@@ -7,7 +7,7 @@
</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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
</Extensions>
@@ -17,8 +17,8 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS) - CLARIN services</mdui:DisplayName>
- <mdui:Description xml:lang="de">Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</mdui:Description>
- <mdui:Description xml:lang="en">Servies provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</mdui:Description>
+ <mdui:Description xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</mdui:Description>
+ <mdui:Description xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</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:PrivacyStatementURL xml:lang="en">https://clarin.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
@@ -111,8 +111,8 @@ Ew==
<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>
+ <ServiceDescription xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</ServiceDescription>
+ <ServiceDescription xml:lang="en">Various services 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"/>
diff --git a/swamid-interfederations-2.0/clarino.uib.no.xml b/swamid-interfederations-2.0/clarino.uib.no.xml
new file mode 100644
index 00000000..03ed1317
--- /dev/null
+++ b/swamid-interfederations-2.0/clarino.uib.no.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarino.uib.no/">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-08-20T06:55:04Z">
+ <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">Clarino, UiB</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="no">Clarino, UiB</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</mdui:Description>
+ <mdui:Description xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</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>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVpYi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZmm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiXDsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15frhNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WChsbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDWdy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8RpiXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNzLnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB820waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7EzRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</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>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVpYi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZmm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiXDsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15frhNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WChsbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDWdy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8RpiXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNzLnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB820waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7EzRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarino.uib.no/feide/single-logout"/>
+ <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://clarino.uib.no/feide/assertion-consumer" index="0"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">Clarino, UiB</md:ServiceName>
+ <md:ServiceName xml:lang="no">Clarino, UiB</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University of Bergen</md:OrganizationName>
+ <md:OrganizationName xml:lang="no">Universitetet i Bergen</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University of Bergen</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="no">Universitetet i Bergen</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uib.no/en</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="no">http://www.uib.no/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Paul</md:GivenName>
+ <md:SurName>Meurer</md:SurName>
+ <md:EmailAddress>paul.meurer@uni.no</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
index 55bec8c2..2e9716d0 100644
--- a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.emeraldinsight.com/entity">
- <!--
- This is a Shibboleth 2 SP for Emerald Group Publishing Ltd.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
</Extensions>
diff --git a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
index 6416d90b..8682e719 100644
--- a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
+++ b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://engine.jacson.jiscadvance.biz/authentication/sp/metadata">
- <!--
- This is a JACSoN OpenConext SP for the JISC Services Management Company Ltd.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-16T10:06:35Z"/>
</Extensions>
diff --git a/swamid-interfederations-2.0/filesender.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index 5cb0183f..408bcf71 100644
--- a/swamid-interfederations-2.0/filesender.funet.fi.xml
+++ b/swamid-interfederations-2.0/filesender.funet.fi.xml
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://filesender.funet.fi">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
- <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.funet.fi">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.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,13 +23,9 @@
<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>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -49,47 +55,47 @@ NuSoiRuRqUwvjh1crrpK3aEPzrhwALKEQo0tIKOpSHjVUwvGXWtoljY7JJJt94y1
o9pAScnCYOeqNoQ//wrcSVQcwozZLhGlymlLAyDI0rx/hM9v+8PL1E0iFmf/</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Funet FileSender</md:ServiceName>
- <md:ServiceName xml:lang="en">Funet FileSender</md:ServiceName>
- <md:ServiceName xml:lang="sv">Funet FileSender</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Harri</md:GivenName>
- <md:SurName>Kuusisto</md:SurName>
- <md:EmailAddress>mailto:funyht@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Tomi</md:GivenName>
- <md:SurName>Salmi</md:SurName>
- <md:EmailAddress>mailto:noc@funet.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Tomi</md:GivenName>
- <md:SurName>Salmi</md:SurName>
- <md:EmailAddress>mailto:noc@funet.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="1" isDefault="true"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="2" isDefault="false"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="fi">Funet FileSender</ServiceName>
+ <ServiceName xml:lang="en">Funet FileSender</ServiceName>
+ <ServiceName xml:lang="sv">Funet FileSender</ServiceName>
+ <ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</ServiceDescription>
+ <ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</ServiceDescription>
+ <ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</ServiceDescription>
+ <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+ <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <GivenName>Harri</GivenName>
+ <SurName>Kuusisto</SurName>
+ <EmailAddress>mailto:funyht@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Tomi</GivenName>
+ <SurName>Salmi</SurName>
+ <EmailAddress>mailto:noc@funet.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Tomi</GivenName>
+ <SurName>Salmi</SurName>
+ <EmailAddress>mailto:noc@funet.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/foodl.org.xml b/swamid-interfederations-2.0/foodl.org.xml
index 9aaff479..f56107ea 100644
--- a/swamid-interfederations-2.0/foodl.org.xml
+++ b/swamid-interfederations-2.0/foodl.org.xml
@@ -1,8 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-05-05T06:16:34Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Foodle</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="no">Foodle</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="nn">Foodle</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
+ <mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
+ <mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
+ <mdui:PrivacyStatementURL xml:lang="en">https://rnd.feide.no/software/foodle/foodle-privacy-policy/</mdui:PrivacyStatementURL>
+ <mdui:Logo height="58" width="187">https://foodl.org/res/foodle_logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
<md:KeyDescriptor>
- <ds:KeyInfo>
+ <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>
@@ -15,20 +37,26 @@
<md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
<md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
<md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+ <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+ </md:Organization>
<md:ContactPerson contactType="technical">
- <md:Company>UNINETT AS</md:Company>
- <md:GivenName>Andreas</md:GivenName>
- <md:SurName>Solberg</md:SurName>
- <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
- <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+ <md:GivenName>Feide Support</md:GivenName>
+ <md:EmailAddress>support@feide.no</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hbidp.hb.se.xml b/swamid-interfederations-2.0/hbidp.hb.se.xml
index 84d8d1fe..2769678e 100644
--- a/swamid-interfederations-2.0/hbidp.hb.se.xml
+++ b/swamid-interfederations-2.0/hbidp.hb.se.xml
@@ -9,10 +9,10 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hb.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
- <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
+ <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
<mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
<mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
@@ -131,7 +131,8 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">HB</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Högskolan i Borås</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Högskolan i Borås</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">University of Borås</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
</Organization>
<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
diff --git a/swamid-interfederations-2.0/homeproj.cesnet.cz.xml b/swamid-interfederations-2.0/homeproj.cesnet.cz.xml
new file mode 100644
index 00000000..7fc592b7
--- /dev/null
+++ b/swamid-interfederations-2.0/homeproj.cesnet.cz.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://homeproj.cesnet.cz/sp/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.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>
+ </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>
+ <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://homeproj.cesnet.cz/Shibboleth.sso/DS" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">homeproj.cesnet.cz</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">homeproj.cesnet.cz</mdui:DisplayName>
+ <mdui:Description xml:lang="en">CESNETs repository and colaboration server.</mdui:Description>
+ <mdui:Description xml:lang="cs">CESNETi repozitar a kolaborativni server.</mdui:Description>
+ </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 use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+ <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIRAPmFxcaH7//BneN4XQLF6/QwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMDA2MTcwMDAwMDBaFw0xMzA2MTYyMzU5NTlaMDsxCzAJBgNV
+BAYTAkNaMQ8wDQYDVQQKEwZDRVNORVQxGzAZBgNVBAMTEmhvbWVwcm9qLmNlc25l
+dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9mEv9sT/gctkA+
+46DGs37LwePuU2Kci717IlyyBwj/m6Z3TLbQnRbWg2JIkcKxBr4KGM4F7HugamGs
+sHZqlW83W29bmoeCc4GxrUk/ilp1hfU5pDCYc2VlqxGcI5RiuAL+HjO4zY0u213M
+zhyQ8hafCYF4keDMbSCr+QsSjK4ffMvN9la75JMxNWTOI7LmA7Zddy2Wp8WxYyF9
+saoj4/oZAoQQmeqdwxd7UXkZXmhUq+DWH9csNX6CgT0bEgl0ceph8y8fFQKEDb0G
+Mj464xKiE9bEyOZjLP1mhYgJmZ5KJuDF/VA7FmJc03r1TiQ3oUInorsL6EUVpour
+YZ0AENECAwEAAaOCAWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+47ntMB0GA1UdDgQWBBT5kuzyfLmgWQPzUHV0Xa+DeQ3GTDAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
+Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
+AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
+Lm9yZzAdBgNVHREEFjAUghJob21lcHJvai5jZXNuZXQuY3owDQYJKoZIhvcNAQEF
+BQADggEBAD0bRuPv3EZK0qZbANcOPpxXmi/a1Bfo8tuosQs6EuPvPKfPEi4s0nr1
+Fg46hZW0csonglMsxH3cbA0ZwehwWBZn4zYYKIph271Ne4fM8VwEAYW6P3xBxI+k
+S5MM7trK2O5huAHm0+7253Ma2luKJ9y8zSyotHh6CtZ1yTWt/BZRkmQKg067167M
+SD+D5Gi/fMYF7OwfEYfVAAV+qjGgquZHwpstFzd4YtpcejX9rfLg/VsNMZv2HbAN
+nbs3Yo3jtGvgf5E+frLhlvVGXoVH3f8M7B+QmRsMEYDtAGxBn+vCA81wyFHl2YIi
+K1S9YPh9zuhkjLIqJukO/GbQDyMZpOo=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>homeproj-ng.cesnet.cz</ds:KeyName>
+ <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+ <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQWQRSmw3VFnRkwQ7GwFczsDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDExODAwMDAwMFoXDTE2MDExODIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSaG9tZXByb2ouY2VzbmV0
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5jC/vA/pNrHbIn/N
+YYyV8ir/ZWdsx1PhlPhuy0VdKTWkv47pu7xLHdcdjLiN4O2i2LL3IjdChQYHG+pe
+ih9ow2sNP8jJOLUMkpaezcCULSJ334IgH/H4eZtOHVqXB2ycP1DO7lK+cxgl0Kis
+rrw8ntSf4L6Cv3tTMUBBwQ2uZVmFndoAYR8hVQox+2rR0OwZ0wGtpcU3UaIPfgYR
+1sSW6rO9GbzazrkiEBmNAqd4YA5ArRWBxUSIQdpaAGfhTp7ZLDsgcHVLiLQvKMmq
+CGBS7fvdtN70Tm3/p5L+qcUSL6tVp+KPejTzKSFd6OxUyEVCLmYEA7P8wXGtwQ08
+ObuX6QIDAQABo4IBfDCCAXgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFMaHVqZHBUkiSv+8pzj4jnaJhAxHMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMDQGA1UdEQQtMCuCEmhvbWVwcm9qLmNlc25ldC5jeoIVaG9tZXByb2otbmcu
+Y2VzbmV0LmN6MA0GCSqGSIb3DQEBBQUAA4IBAQBUkkwUrLVcS2PtUndgvLEaglea
+idhdLIAyMdHn6JbhSlHy1vQIi3ZrW+2bIHAuLtjFiM+S2pC8JOtkxTFDLqVk3B/q
+a0afZGvJ8ADMdwJhMTLFoGswvskn7QsGDJvlhm5wUXxh/MSK7DYzfEeSInfKtYHv
+/lVDr86yhWPKsAnutCITg3Y9Sq9xT+OBlLoNqMBGoY3qV6OxdGWaQ3FUf5x0U8RD
+mlhbeVMv9Ux/N4Ji5GjfZ8QcO6cjmMVjsE24R9XHOX3hdcH2Ou622mC+XJ1/SzN5
+UHGuWn2tXixcUxwXgp/go90sJTeTDbBJQhG4kKEquAdCnAxO1DZN23GVn1w3
+</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>homeproj.cesnet.cz</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+ <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIRAPmFxcaH7//BneN4XQLF6/QwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMDA2MTcwMDAwMDBaFw0xMzA2MTYyMzU5NTlaMDsxCzAJBgNV
+BAYTAkNaMQ8wDQYDVQQKEwZDRVNORVQxGzAZBgNVBAMTEmhvbWVwcm9qLmNlc25l
+dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9mEv9sT/gctkA+
+46DGs37LwePuU2Kci717IlyyBwj/m6Z3TLbQnRbWg2JIkcKxBr4KGM4F7HugamGs
+sHZqlW83W29bmoeCc4GxrUk/ilp1hfU5pDCYc2VlqxGcI5RiuAL+HjO4zY0u213M
+zhyQ8hafCYF4keDMbSCr+QsSjK4ffMvN9la75JMxNWTOI7LmA7Zddy2Wp8WxYyF9
+saoj4/oZAoQQmeqdwxd7UXkZXmhUq+DWH9csNX6CgT0bEgl0ceph8y8fFQKEDb0G
+Mj464xKiE9bEyOZjLP1mhYgJmZ5KJuDF/VA7FmJc03r1TiQ3oUInorsL6EUVpour
+YZ0AENECAwEAAaOCAWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+47ntMB0GA1UdDgQWBBT5kuzyfLmgWQPzUHV0Xa+DeQ3GTDAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
+Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
+AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
+Lm9yZzAdBgNVHREEFjAUghJob21lcHJvai5jZXNuZXQuY3owDQYJKoZIhvcNAQEF
+BQADggEBAD0bRuPv3EZK0qZbANcOPpxXmi/a1Bfo8tuosQs6EuPvPKfPEi4s0nr1
+Fg46hZW0csonglMsxH3cbA0ZwehwWBZn4zYYKIph271Ne4fM8VwEAYW6P3xBxI+k
+S5MM7trK2O5huAHm0+7253Ma2luKJ9y8zSyotHh6CtZ1yTWt/BZRkmQKg067167M
+SD+D5Gi/fMYF7OwfEYfVAAV+qjGgquZHwpstFzd4YtpcejX9rfLg/VsNMZv2HbAN
+nbs3Yo3jtGvgf5E+frLhlvVGXoVH3f8M7B+QmRsMEYDtAGxBn+vCA81wyFHl2YIi
+K1S9YPh9zuhkjLIqJukO/GbQDyMZpOo=
+</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>homeproj-ng.cesnet.cz</ds:KeyName>
+ <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+ <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQWQRSmw3VFnRkwQ7GwFczsDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDExODAwMDAwMFoXDTE2MDExODIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSaG9tZXByb2ouY2VzbmV0
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5jC/vA/pNrHbIn/N
+YYyV8ir/ZWdsx1PhlPhuy0VdKTWkv47pu7xLHdcdjLiN4O2i2LL3IjdChQYHG+pe
+ih9ow2sNP8jJOLUMkpaezcCULSJ334IgH/H4eZtOHVqXB2ycP1DO7lK+cxgl0Kis
+rrw8ntSf4L6Cv3tTMUBBwQ2uZVmFndoAYR8hVQox+2rR0OwZ0wGtpcU3UaIPfgYR
+1sSW6rO9GbzazrkiEBmNAqd4YA5ArRWBxUSIQdpaAGfhTp7ZLDsgcHVLiLQvKMmq
+CGBS7fvdtN70Tm3/p5L+qcUSL6tVp+KPejTzKSFd6OxUyEVCLmYEA7P8wXGtwQ08
+ObuX6QIDAQABo4IBfDCCAXgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFMaHVqZHBUkiSv+8pzj4jnaJhAxHMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMDQGA1UdEQQtMCuCEmhvbWVwcm9qLmNlc25ldC5jeoIVaG9tZXByb2otbmcu
+Y2VzbmV0LmN6MA0GCSqGSIb3DQEBBQUAA4IBAQBUkkwUrLVcS2PtUndgvLEaglea
+idhdLIAyMdHn6JbhSlHy1vQIi3ZrW+2bIHAuLtjFiM+S2pC8JOtkxTFDLqVk3B/q
+a0afZGvJ8ADMdwJhMTLFoGswvskn7QsGDJvlhm5wUXxh/MSK7DYzfEeSInfKtYHv
+/lVDr86yhWPKsAnutCITg3Y9Sq9xT+OBlLoNqMBGoY3qV6OxdGWaQ3FUf5x0U8RD
+mlhbeVMv9Ux/N4Ji5GjfZ8QcO6cjmMVjsE24R9XHOX3hdcH2Ou622mC+XJ1/SzN5
+UHGuWn2tXixcUxwXgp/go90sJTeTDbBJQhG4kKEquAdCnAxO1DZN23GVn1w3
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">CESNET</OrganizationName>
+ <OrganizationDisplayName xml:lang="cs">CESNET</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">CESNET</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.cesnet.cz/</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <GivenName>Jan</GivenName>
+ <SurName>Mach</SurName>
+ <EmailAddress>jan.mach@cesnet.cz</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <GivenName>Jan</GivenName>
+ <SurName>Ruzicka</SurName>
+ <EmailAddress>janru@cesnet.cz</EmailAddress>
+ </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iam.cf.ac.uk.xml b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
index 7d4beeaa..42b2c7ab 100644
--- a/swamid-interfederations-2.0/iam.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iam.cf.ac.uk/sp/shibboleth">
- <!--
- This is a IAM@Cardiff Shibboleth 2 SP for Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
</Extensions>
diff --git a/swamid-interfederations-2.0/identity.mdh.se.xml b/swamid-interfederations-2.0/identity.mdh.se.xml
index 0db8c171..88e51c09 100644
--- a/swamid-interfederations-2.0/identity.mdh.se.xml
+++ b/swamid-interfederations-2.0/identity.mdh.se.xml
@@ -9,7 +9,7 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdh.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Mälardalens högskola</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Mälardalens Högskola</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Mälardalen University</mdui:DisplayName>
<mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens högskola.</mdui:Description>
<mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
@@ -93,6 +93,7 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">MDH</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Mälardalens Högskola</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Mälardalen University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.mdh.se</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
index a9618f66..753cfcda 100644
--- a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dev.cardiff.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth 2 test IdP for Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
</Extensions>
diff --git a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
index e32a3629..6cce1711 100644
--- a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-preprod.cardiff.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth 2 test IdP (clustered with Terracotta 3.0) for Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
</Extensions>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
index cd9bc614..9692d0c8 100644
--- a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
+++ b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
@@ -65,6 +65,7 @@
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.admin.grnet.gr/idp/profile/Shibboleth/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -111,6 +112,7 @@
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.admin.grnet.gr: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>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">Greek Research and Technology Network</OrganizationName>
diff --git a/swamid-interfederations-2.0/idp.bth.se.xml b/swamid-interfederations-2.0/idp.bth.se.xml
index 07ba9176..f87ff55f 100644
--- a/swamid-interfederations-2.0/idp.bth.se.xml
+++ b/swamid-interfederations-2.0/idp.bth.se.xml
@@ -81,6 +81,7 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">BTH</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index 5f2baa5f..74acc727 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi.xml
@@ -1,10 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.csc.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
- <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
- <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csc.fi/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csc.fi</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">funet.fi</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="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,16 +20,12 @@
<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>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEvjCCA6agAwIBAgIRANzJo7X5SEmbvBstb88M+4kwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -54,27 +55,27 @@ 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>
+ </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 cc3513ce..49bc19ba 100644
--- a/swamid-interfederations-2.0/idp.dfn.de.xml
+++ b/swamid-interfederations-2.0/idp.dfn.de.xml
@@ -10,8 +10,8 @@
<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">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:DisplayName xml:lang="de">DFN-Verein Geschäftsstelle</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">DFN Office</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>
@@ -58,6 +58,9 @@ wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
</KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index 1900ce9a..6e9c8333 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,288 +1,297 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.feide.no">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.feide.no">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2012-10-09T13:08:24Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
- <shibmd:Scope regexp="false">aal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">agdenes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">aho.no</shibmd:Scope>
- <shibmd:Scope regexp="false">alstahaug.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">aremark.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">arendal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">as-skole.no</shibmd:Scope>
- <shibmd:Scope regexp="false">askim.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">askoy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">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">betanien.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bremanger.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">diakonhjemmet.no</shibmd:Scope>
- <shibmd:Scope regexp="false">diakonova.no</shibmd:Scope>
- <shibmd:Scope regexp="false">dmmh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">donna.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">drammen.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">dvm.iktsenteret.no</shibmd:Scope>
- <shibmd:Scope regexp="false">eid.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">eideskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">eidfjord.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">eidsberg.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">eidskog.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">elverum.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">etne.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">etnedal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">evenes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fedje.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.afjord.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.ahk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.amot.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.farsund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.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.nlm.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.oknett.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.osen.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.osloskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.rade.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.rissa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.roan.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.roros.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.rygge.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.sarpsborg.com</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.skedsmo.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.stord.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.stranda.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.trysil.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">flesberg.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">flora.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">forde.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">forsand.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">frogn.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">froland.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">frosta.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">froya.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fusa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">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">haraldsplass.no</shibmd:Scope>
- <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
- <shibmd:Scope regexp="false">hemnegs.fronter.com</shibmd:Scope>
- <shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hials.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hib.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hibu.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hifm.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hig.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hih.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hihm.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hil.no</shibmd:Scope>
- <shibmd:Scope regexp="false">himolde.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hin.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hinesna.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hint.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hioa.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hiof.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hisf.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hist.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hit.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hitra.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hive.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hivolda.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hjartdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hjelmeland.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hobol.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hol.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">holeskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hornindal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">horten.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">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">jolster.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
- <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
- <shibmd:Scope regexp="false">klabu.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">klepp.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kongsberg.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kristiansand.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kristiansund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kvam.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ldh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">leikanger.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">leirfjord.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">lier.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">lierne.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">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">nmbu.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nmh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">notodden.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">notteroy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ntfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ntnu.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nvh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oddaskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oksnes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oppdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oppland.org</shibmd:Scope>
- <shibmd:Scope regexp="false">os-ho.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">osteroy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ovgs.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oygarden.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">phs.no</shibmd:Scope>
- <shibmd:Scope regexp="false">radoy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rana.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">randaberg.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rauma.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rennebu.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">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">vaga.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vagan.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vagsoy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vaksdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">valer-of.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vang.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vestby.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
- <shibmd:Scope regexp="false">voss.kommune.no</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
- </saml:Attribute>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Feide</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="no">Feide</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="nn">Feide</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Feide is the login system for norwegian educational and research institusions.</mdui:Description>
+ <mdui:Description xml:lang="no">Feide er innloggingssiden for norske utdannings- og forskningsinstitusjoner.</mdui:Description>
+ <mdui:Description xml:lang="nn">Feide er innloggingssida for norske utdannings- og forskningsinstitusjonar.</mdui:Description>
+ </mdui:UIInfo>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agdenes.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aho.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alstahaug.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aremark.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arendal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">as-skole.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askim.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">betanien.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfk.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bibsys.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bokn.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bomlo.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bremanger.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonhjemmet.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonova.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmmh.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">donna.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drammen.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dvm.iktsenteret.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eid.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eideskolen.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidfjord.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsberg.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidskog.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elverum.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etne.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etnedal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evenes.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fedje.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.afjord.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ahk.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.amot.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.farsund.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.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.nlm.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.oknett.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osen.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osloskolen.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rade.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rissa.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roan.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roros.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rygge.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.sarpsborg.com</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.skedsmo.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stord.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stranda.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.trysil.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flaa.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flesberg.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flora.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forde.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forsand.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frana.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frogn.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froland.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frosta.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froya.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fusa.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">haraldsplass.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnegs.fronter.com</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemsedal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy-no.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hfk.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hials.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hib.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hibu.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hifm.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hih.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hihm.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hil.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">himolde.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hin.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinesna.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hint.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hioa.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiof.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hisf.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hist.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hit.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hitra.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hive.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hivolda.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">jolster.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karmoyskolen.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khib.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khio.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klabu.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klepp.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsberg.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansand.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansund.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvam.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvinnherad.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvn.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ldh.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leikanger.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leirfjord.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lier.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lierne.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillesand.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lindas.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luster.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">nmbu.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmh.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notodden.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notteroy.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntfk.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntnu.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nvh.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oddaskolen.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oksnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppland.org</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ho.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osteroy.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovgs.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oygarden.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phs.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rana.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">randaberg.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rauma.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennebu.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">vaga.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagan.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagsoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaksdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valer-of.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vang.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vefsn.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestby.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfk.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgsa.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voss.kommune.no</shibmd:Scope>
</md:Extensions>
<md:KeyDescriptor>
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIDhjCCAm4CCQCMHNhxUI2H1TANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0wODA5MDUxMTU0MzNaFw0xODA3MTUxMTU0MzNaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4fTsmIsKVGtniXddnerSeiLeAZAlAOL8v+ebzVzYcpTJzMHrplD+lF2tXxRgs7IGEw3t2zRCtxnGbiGkXPW+oCs4T989z+Sq8nh7Lff/XlyK+jQ7BtfC8RUYQ+eNEQy0Fif+81JyPbiwZovbiL4WrK1GOG81/2CF7rvwyXJkDD1YXJ5W18/c06YLfYJjuzZgEoCVRq6ecgQyPKg1xwIpW2GpkKOBXA7oKWtev+xcmSiLZwZE96mSHjty0L+wW6NUuf2/8VSCc4IED0EbzqFUoeHuGXqPak+tu9+VpP6vmmyp4gSCxsmWtoKm7UC8P1QeCyZxwQaoGlIp78wsE5ao5wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQACUWuuirUSwDWksdkwKuqsNttnNmivwUMLtKDjHbMcwVK/b4qWjrAjfmJXxamUSYlnGjeoiqSQQuc3/qHCPAZUnN8VqXcZUCBXWjMO7Y/AnnsFKHpkYm51jWckjudeyfUr4UnH7te0OuUrGRIVrRRg3DqLdgrcbkJ98JyT97hnaDMke4qNVwrQFF+yvxYs1aYkILySBB/KPGSTh5sxJovcyWd7GY4ad5nH5oEjXF1yZzndmUuHGlTTzk6SGzmUJgqKyba+KJ/jauy6qNC1gPqfnbntWKDkE9a9ow8tlsi3jHI9AZu9U6LnOvTJ8MjhyXOEByCaDnTpK8JiZr6JvCaV</ds:X509Certificate>
</ds:X509Data>
@@ -292,10 +301,10 @@
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
</md:IDPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationName>
- <md:OrganizationName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">Feide</md:OrganizationName>
+ <md:OrganizationName xml:lang="no">Feide</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Feide</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="no">Feide</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
<md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
</md:Organization>
@@ -303,8 +312,4 @@
<md:GivenName>Feide Support</md:GivenName>
<md:EmailAddress>support@feide.no</md:EmailAddress>
</md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Feide Support</md:GivenName>
- <md:EmailAddress>support@feide.no</md:EmailAddress>
- </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hig.se.xml b/swamid-interfederations-2.0/idp.hig.se.xml
index baa529f0..1fca3c64 100644
--- a/swamid-interfederations-2.0/idp.hig.se.xml
+++ b/swamid-interfederations-2.0/idp.hig.se.xml
@@ -95,6 +95,7 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">HIG</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Högskolan i Gävle</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml b/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
index 8d74effd..8e797d3e 100644
--- a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
+++ b/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
@@ -1,79 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-esslingen.de/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-04T16:29: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>
+ </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">hs-esslingen.de</saml1md:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Hochschule Esslingen</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Hochschule Esslingen</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Shibboleth IDP innerhalb der DFN-AAI der Hochschule Esslingen</mdui:Description>
+ <mdui:Description xml:lang="en">Shibboleth IDP innerhalb der DFN-AAI der Hochschule Esslingen</mdui:Description>
+ <mdui:InformationURL xml:lang="de">http://www.hs-esslingen.de/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.hs-esslingen.de/en/</mdui:InformationURL>
+ </mdui:UIInfo>
</Extensions>
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIFMTCCBBmgAwIBAgIEDmrJ1DANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTA5MDcwMTExNDUwOFoX
-DTEyMDYzMDExNDUwOFowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++IyIw
-IC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEGQxar
-37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRITMCp
-Ij8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsmj9x8
-id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHMFh3a
-LisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4IB9TCCAfEwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwNAYDVR0lBC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3
-CgMDBglghkgBhvhCBAEwHQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8G
-A1UdIwQYMBaAFONbF7zWLDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1h
-ZG1pbkBocy1lc3NsaW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4t
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1
-Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAUOq3J7g8KIhllj9REZGArIDDEDTKHz4v+nxK
-18HU/a++spk27pnJDZqQFTN59KxpzQaqVgrjoXTxIDib8VJlIKG0ddp2qKFXqKN2
-1mW9A3AYKFASEQB+x7BWsf74g62dn/tIptf190Cb8E8r1kbWTHILw+gGLwd2tOk8
-IQQsBIAbMkd3rtoJ0OqTTwab6qI0SX/BBtRsm9AuSTNohwevDr2ApSbw7Qv+cH2v
-7QI0ZhesW7/xE7O2eaue8Z7rjyHxjNNJOK3Tfj9wZzmjdM+tWl/c6q+DngcClxVw
-td8exW1+V+2Uh+asbfnUK6XED+qXWm7ze4CmNCE/XOviMn+ylw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIFMTCCBBmgAwIBAgIEDmrJ1DANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTA5MDcwMTExNDUwOFoX
-DTEyMDYzMDExNDUwOFowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++IyIw
-IC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEGQxar
-37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRITMCp
-Ij8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsmj9x8
-id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHMFh3a
-LisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4IB9TCCAfEwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwNAYDVR0lBC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3
-CgMDBglghkgBhvhCBAEwHQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8G
-A1UdIwQYMBaAFONbF7zWLDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1h
-ZG1pbkBocy1lc3NsaW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4t
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1
-Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAUOq3J7g8KIhllj9REZGArIDDEDTKHz4v+nxK
-18HU/a++spk27pnJDZqQFTN59KxpzQaqVgrjoXTxIDib8VJlIKG0ddp2qKFXqKN2
-1mW9A3AYKFASEQB+x7BWsf74g62dn/tIptf190Cb8E8r1kbWTHILw+gGLwd2tOk8
-IQQsBIAbMkd3rtoJ0OqTTwab6qI0SX/BBtRsm9AuSTNohwevDr2ApSbw7Qv+cH2v
-7QI0ZhesW7/xE7O2eaue8Z7rjyHxjNNJOK3Tfj9wZzmjdM+tWl/c6q+DngcClxVw
-td8exW1+V+2Uh+asbfnUK6XED+qXWm7ze4CmNCE/XOviMn+ylw==
+ <ds:X509Certificate>MIIFUjCCBDqgAwIBAgIHE+cHYfFBgzANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
+EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
+Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTEyMDUzMTE1MTAw
+OVoXDTE1MDUzMTE1MTAwOVowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hz
+Y2h1bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQD
+ExNpZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++
+IyIwIC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEG
+Qxar37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRI
+TMCpIj8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsm
+j9x8id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHM
+Fh3aLisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4ICEzCCAg8wHAYDVR0gBBUwEzAR
+Bg8rBgEEAYGtIYIsAQEEAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwNAYDVR0l
+BC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3CgMDBglghkgBhvhCBAEw
+HQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8GA1UdIwQYMBaAFONbF7zW
+LDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1hZG1pbkBocy1lc3NsaW5n
+ZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0
+cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2Nh
+Y3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWVz
+c2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
+AAOCAQEAaaNOHl2pyUxRanNKMXTXgkpeAKheCxi1eZ4Np/YQWbD/8oiLaeaTrhC3
+dUROgq1om05wCswknqMp4KEtSIsmgY+Lmu4dy9jcGPwU00WK/eM6YlWJFMgHymD+
+9mL5+eY9p5eiKTWoYqXUNpXC09Wv3FIoTU66kyhzYb5JxW/pPlbgjpcN7HI+Ft+p
+Rd2JT9ZOVIUvi+DcMWzUBqi9EQPuhoT2ZYB515PViy8hpkYjH213Qwr+CHsFAVIZ
+0/p4LwiDk9BwUB/EbxvvzDr2CCIH7RUEYKnYoNRu1xIS5F6/2WB9lDtQIf+E09P2
+UNd5+6xR1BuuABBTl3KVhPLMTbceuQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -82,7 +60,6 @@ td8exW1+V+2Uh+asbfnUK6XED+qXWm7ze4CmNCE/XOviMn+ylw==
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.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>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-esslingen.de/idp/profile/Shibboleth/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -92,76 +69,40 @@ td8exW1+V+2Uh+asbfnUK6XED+qXWm7ze4CmNCE/XOviMn+ylw==
<Extensions>
<saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</saml1md:Scope>
</Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIFMTCCBBmgAwIBAgIEDmrJ1DANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTA5MDcwMTExNDUwOFoX
-DTEyMDYzMDExNDUwOFowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++IyIw
-IC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEGQxar
-37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRITMCp
-Ij8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsmj9x8
-id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHMFh3a
-LisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4IB9TCCAfEwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwNAYDVR0lBC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3
-CgMDBglghkgBhvhCBAEwHQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8G
-A1UdIwQYMBaAFONbF7zWLDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1h
-ZG1pbkBocy1lc3NsaW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4t
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1
-Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAUOq3J7g8KIhllj9REZGArIDDEDTKHz4v+nxK
-18HU/a++spk27pnJDZqQFTN59KxpzQaqVgrjoXTxIDib8VJlIKG0ddp2qKFXqKN2
-1mW9A3AYKFASEQB+x7BWsf74g62dn/tIptf190Cb8E8r1kbWTHILw+gGLwd2tOk8
-IQQsBIAbMkd3rtoJ0OqTTwab6qI0SX/BBtRsm9AuSTNohwevDr2ApSbw7Qv+cH2v
-7QI0ZhesW7/xE7O2eaue8Z7rjyHxjNNJOK3Tfj9wZzmjdM+tWl/c6q+DngcClxVw
-td8exW1+V+2Uh+asbfnUK6XED+qXWm7ze4CmNCE/XOviMn+ylw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIFMTCCBBmgAwIBAgIEDmrJ1DANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTA5MDcwMTExNDUwOFoX
-DTEyMDYzMDExNDUwOFowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++IyIw
-IC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEGQxar
-37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRITMCp
-Ij8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsmj9x8
-id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHMFh3a
-LisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4IB9TCCAfEwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwNAYDVR0lBC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3
-CgMDBglghkgBhvhCBAEwHQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8G
-A1UdIwQYMBaAFONbF7zWLDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1h
-ZG1pbkBocy1lc3NsaW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4t
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1
-Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAUOq3J7g8KIhllj9REZGArIDDEDTKHz4v+nxK
-18HU/a++spk27pnJDZqQFTN59KxpzQaqVgrjoXTxIDib8VJlIKG0ddp2qKFXqKN2
-1mW9A3AYKFASEQB+x7BWsf74g62dn/tIptf190Cb8E8r1kbWTHILw+gGLwd2tOk8
-IQQsBIAbMkd3rtoJ0OqTTwab6qI0SX/BBtRsm9AuSTNohwevDr2ApSbw7Qv+cH2v
-7QI0ZhesW7/xE7O2eaue8Z7rjyHxjNNJOK3Tfj9wZzmjdM+tWl/c6q+DngcClxVw
-td8exW1+V+2Uh+asbfnUK6XED+qXWm7ze4CmNCE/XOviMn+ylw==
+ <ds:X509Certificate>MIIFUjCCBDqgAwIBAgIHE+cHYfFBgzANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
+EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
+Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTEyMDUzMTE1MTAw
+OVoXDTE1MDUzMTE1MTAwOVowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hz
+Y2h1bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQD
+ExNpZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++
+IyIwIC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEG
+Qxar37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRI
+TMCpIj8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsm
+j9x8id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHM
+Fh3aLisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4ICEzCCAg8wHAYDVR0gBBUwEzAR
+Bg8rBgEEAYGtIYIsAQEEAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwNAYDVR0l
+BC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3CgMDBglghkgBhvhCBAEw
+HQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8GA1UdIwQYMBaAFONbF7zW
+LDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1hZG1pbkBocy1lc3NsaW5n
+ZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0
+cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2Nh
+Y3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWVz
+c2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
+AAOCAQEAaaNOHl2pyUxRanNKMXTXgkpeAKheCxi1eZ4Np/YQWbD/8oiLaeaTrhC3
+dUROgq1om05wCswknqMp4KEtSIsmgY+Lmu4dy9jcGPwU00WK/eM6YlWJFMgHymD+
+9mL5+eY9p5eiKTWoYqXUNpXC09Wv3FIoTU66kyhzYb5JxW/pPlbgjpcN7HI+Ft+p
+Rd2JT9ZOVIUvi+DcMWzUBqi9EQPuhoT2ZYB515PViy8hpkYjH213Qwr+CHsFAVIZ
+0/p4LwiDk9BwUB/EbxvvzDr2CCIH7RUEYKnYoNRu1xIS5F6/2WB9lDtQIf+E09P2
+UNd5+6xR1BuuABBTl3KVhPLMTbceuQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -170,21 +111,23 @@ td8exW1+V+2Uh+asbfnUK6XED+qXWm7ze4CmNCE/XOviMn+ylw==
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.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>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
- <OrganizationName xml:lang="de">Hochschule Esslingen</OrganizationName>
+ <OrganizationName xml:lang="de">e192</OrganizationName>
+ <OrganizationName xml:lang="en">e192</OrganizationName>
<OrganizationDisplayName xml:lang="de">Hochschule Esslingen</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Hochschule Esslingen - University of Applied Sciences</OrganizationDisplayName>
<OrganizationURL xml:lang="de">http://www.hs-esslingen.de/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.hs-esslingen.de/en/</OrganizationURL>
</Organization>
- <ContactPerson contactType="administrative">
- <GivenName>Herbert</GivenName>
- <SurName>Wiese</SurName>
- <EmailAddress>Herbert.Wiese@hs-esslingen.de</EmailAddress>
- </ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Martin</GivenName>
<SurName>Schmid</SurName>
- <EmailAddress>admin@hs-esslingen.de</EmailAddress>
+ <EmailAddress>mailto:admin@hs-esslingen.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Martin</GivenName>
+ <SurName>Schmid</SurName>
+ <EmailAddress>mailto:aai-support@hs-esslingen.de</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
index 8e44ef54..c811cfb8 100644
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
@@ -1,16 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.ids-mannheim.de/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ids-mannheim.de/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-22T10:22:36Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ids-mannheim.de</saml1md:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+ <mdui:Description xml:lang="de">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
@@ -37,37 +49,86 @@ bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-99YJ9IIzYQ==</ds:X509Certificate>
+99YJ9IIzYQ==
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Institut für Deutsche Sprache - Test SP</md:ServiceName>
- <md:ServiceName xml:lang="en">Institut für Deutsche Sprache - Test SP</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Interface to the Corpus Search, Management and Analysis System COSMAS-II, which offers various possibilities to access the German Reference Corpus DeReKo and other corpora hosted at the IDS. For Humanities and Social Sciences researchers.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Oliver</md:GivenName>
- <md:SurName>Schonefeld</md:SurName>
- <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ids-mannheim.de/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ids-mannheim.de</saml1md:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
+MTgxNDI4MTVaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRwwGgYDVQQDExNpZHAuaWRzLW1hbm5oZWltLmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt7L/7N+17/v7lajOiMdvThxk
+NoiCwy2RDzaDi7IEvJtXmT1CkKXVg84uxCneoixdPwO9EZAyphOGfXyvIWiWOEkB
+8135pYTbKNYPuG0+fIYXPvHE1+oFMca3K21GgssvoOZYJfi/wrORLx77iQXRgGYF
+mRllzaspZriQNbIvCwVsKsoL8zt9TeVa0Ltv6A7dRg/36u8XppG4glE4xuuXQgNI
+mj0qpJ9pV76bgzPKUNm2/aXDiyqoI4qvp2h4vM2sFv2MAguPkHI7PPcVXn1L2q3h
+WpylL+gjjNfZm1TdDww+r1HFdeQDORmjSh+Cd4bbdEeA2bWH3NHjSR6xWwCj/wID
+AQABo4IBvDCCAbgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSg5wzZdnXH5hJRlkFfkCXU0cFr
+4TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zCBkQYDVR0fBIGJMIGG
+MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
+YS9wdWIvY3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUF
+BwEBBIGdMIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2ds
+b2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUH
+MAKGP2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAB1uluFS88lYI
+QPiuEvlALX1GYfNZTNCJogeflb5E59zdd49Y7L5zs9IXbYLUMqSQrbLyv4i4nK4e
+bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
+HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
+xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
+VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
+99YJ9IIzYQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="de">e217</OrganizationName>
+ <OrganizationName xml:lang="en">e217</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache</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>mailto:schonefeld@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Andreas</GivenName>
+ <SurName>Witt</SurName>
+ <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Oliver</GivenName>
+ <SurName>Schonefeld</SurName>
+ <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.gu.se.xml b/swamid-interfederations-2.0/idp.it.gu.se.xml
index 533e3d14..7e402db1 100644
--- a/swamid-interfederations-2.0/idp.it.gu.se.xml
+++ b/swamid-interfederations-2.0/idp.it.gu.se.xml
@@ -9,7 +9,7 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gu.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Göteborgs universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Göteborgs Universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">University of Gothenburg</mdui:DisplayName>
<mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
<mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
@@ -93,7 +93,8 @@ MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">GU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Göteborgs universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">University of Gothenburg</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL>
</Organization>
<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
diff --git a/swamid-interfederations-2.0/idp.it.su.se.xml b/swamid-interfederations-2.0/idp.it.su.se.xml
index b4c8b128..0dc396cf 100644
--- a/swamid-interfederations-2.0/idp.it.su.se.xml
+++ b/swamid-interfederations-2.0/idp.it.su.se.xml
@@ -9,7 +9,7 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Stockholms universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Stockholms Universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Stockholm University</mdui:DisplayName>
<mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Stockholms universitet.</mdui:Description>
<mdui:Description xml:lang="en">The Stockholm University Identity Provider is used by employees and students at the university.</mdui:Description>
@@ -85,6 +85,7 @@ VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">SU</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Stockholms Universitet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Stockholm University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/idp.kb.se.xml b/swamid-interfederations-2.0/idp.kb.se.xml
index 183cafbc..0043cb55 100644
--- a/swamid-interfederations-2.0/idp.kb.se.xml
+++ b/swamid-interfederations-2.0/idp.kb.se.xml
@@ -8,6 +8,18 @@
<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">kb.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Kungliga biblioteket</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">National Library of Sweden</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för Kungliga biblioteket.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for National Library of Sweden.</mdui:Description>
+ <mdui:Logo height="100" width="86">https://idp.kb.se/idp/images/kb-logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>193.10.249.131/32</mdui:IPHint>
+ <mdui:DomainHint>kb.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:59.33822,18.0722617</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -81,7 +93,7 @@ HoPbenzIMS3KvKqUl64+5qwAZhM=
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">KB</OrganizationName>
- <OrganizationDisplayName xml:lang="sv">Kungliga Biblioteket</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Kungliga biblioteket</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">National Library of Sweden</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://kb.se</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
index 31ab5e1b..e2c96df3 100644
--- a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nesc.gla.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for the National e-Science Centre, University of Glasgow.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
</Extensions>
diff --git a/swamid-interfederations-2.0/idp.nordu.net.xml b/swamid-interfederations-2.0/idp.nordu.net.xml
index a86f6af2..6236c27e 100644
--- a/swamid-interfederations-2.0/idp.nordu.net.xml
+++ b/swamid-interfederations-2.0/idp.nordu.net.xml
@@ -89,6 +89,7 @@ JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">NORDUnet</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">NORDUnet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">NORDUnet</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.net.xml b/swamid-interfederations-2.0/idp.shibboleth.net.xml
index 9172b5d3..281af7b9 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.net.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.net/idp/shibboleth">
- <!--
- This is a shibboleth.net Shibboleth IdP for JISC Collections and Janet Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
diff --git a/swamid-interfederations-2.0/idp.student.bth.se.xml b/swamid-interfederations-2.0/idp.student.bth.se.xml
index 185b2ef6..51f14e45 100644
--- a/swamid-interfederations-2.0/idp.student.bth.se.xml
+++ b/swamid-interfederations-2.0/idp.student.bth.se.xml
@@ -77,6 +77,7 @@ nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">STUDENTS-BTH</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/idp.ufpr.br.xml b/swamid-interfederations-2.0/idp.ufpr.br.xml
new file mode 100644
index 00000000..7f392164
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufpr.br.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.ufpr.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">ufpr.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UFPR - Universidade Federal do Parana</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UFPR - Universidade Federal do Parana</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ufpr.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ufpr.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxLzAtBgNVBAoUJlVGUFIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQYXJhbsOhMSswKQYDVQQLFCJDZW50cm8g
+ZGUgQ29tcHV0YcOnw6NvIEVsZXRyw7RuaWNhMRowGAYJKoZIhvcNAQkBFgtjY2VA
+dWZwci5icjERMA8GA1UEBxMIQ3VyaXRpYmExEDAOBgNVBAgUB1BhcmFuw6ExCzAJ
+BgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAudWZwci5icjAeFw0xMjA4MjAyMDIzMzZa
+Fw0xNTA4MjAyMDIzMzZaMIHCMS8wLQYDVQQKFCZVRlBSIC0gVW5pdmVyc2lkYWRl
+IEZlZGVyYWwgZG8gUGFyYW7DoTErMCkGA1UECxQiQ2VudHJvIGRlIENvbXB1dGHD
+p8OjbyBFbGV0csO0bmljYTEaMBgGCSqGSIb3DQEJARYLY2NlQHVmcHIuYnIxETAP
+BgNVBAcTCEN1cml0aWJhMRAwDgYDVQQIFAdQYXJhbsOhMQswCQYDVQQGEwJCUjEU
+MBIGA1UEAxMLaWRwLnVmcHIuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDhSIFAyy4DlsvFhaSd1r3CiUjp//kkxFlfeZmtj5gLGupTk+fQF18j71Go
+K4OwvL82UI/KYE5Me2tlueEJvBExd79by4fBME6SADdHc9Su1w1lctn4s6Mko9ux
+j9WcbrBfncbdj80T6W88EDH+V74oiCEElxBLfBOeXJCuMjc9uSaasbIMWMK+7ExV
+lz7d8ll7umv5AX84tpq8WDkc+7fcP9+p5GMtcTrdPKvL2CvSFmrnz+efKb6cNOT0
+B058D+uHPb0PasA6+xHpO3V3pSbSdcf8IqlvJKvoK8dch4qQ6uZD+Rz8ruxaPpBH
+cJdZk6hk0gc+7axjEWo/89CJauJzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ70
+kkZit+4D85Xi5Ms8+EYCjCo0GfUUp83ASZyPRml/D0VnOHLuj+dbPdQM0znnb5Sg
+7hIbSs/ERqrzKFJMJikpFXm1RQZNNRdf0d0V4nTrliXjGQcPCqXexdXRE6oBMeAi
+apbG2X8rFstwVVghWlbqkUjtko8MgUiD/RyjbAqVBWxqNjRGB3JOVt1g2SJ1tW7x
+pL1kcSedKTjYji+gJ9NLqumL9LTdtlqPzdBlChK4SfIIK/BE3GtD1S6rHn2wX+MC
++anyEs7LQkZJPiqDeo2VM3XLIHdw5VTf8HnFiLJMiDkuIUOj5g77gFFE5HGKPuur
+k+Eyx9965LHHOvpH3Zo=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.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.ufpr.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufpr.br/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufpr.br/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufpr.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">ufpr.br</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxLzAtBgNVBAoUJlVGUFIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQYXJhbsOhMSswKQYDVQQLFCJDZW50cm8g
+ZGUgQ29tcHV0YcOnw6NvIEVsZXRyw7RuaWNhMRowGAYJKoZIhvcNAQkBFgtjY2VA
+dWZwci5icjERMA8GA1UEBxMIQ3VyaXRpYmExEDAOBgNVBAgUB1BhcmFuw6ExCzAJ
+BgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAudWZwci5icjAeFw0xMjA4MjAyMDIzMzZa
+Fw0xNTA4MjAyMDIzMzZaMIHCMS8wLQYDVQQKFCZVRlBSIC0gVW5pdmVyc2lkYWRl
+IEZlZGVyYWwgZG8gUGFyYW7DoTErMCkGA1UECxQiQ2VudHJvIGRlIENvbXB1dGHD
+p8OjbyBFbGV0csO0bmljYTEaMBgGCSqGSIb3DQEJARYLY2NlQHVmcHIuYnIxETAP
+BgNVBAcTCEN1cml0aWJhMRAwDgYDVQQIFAdQYXJhbsOhMQswCQYDVQQGEwJCUjEU
+MBIGA1UEAxMLaWRwLnVmcHIuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDhSIFAyy4DlsvFhaSd1r3CiUjp//kkxFlfeZmtj5gLGupTk+fQF18j71Go
+K4OwvL82UI/KYE5Me2tlueEJvBExd79by4fBME6SADdHc9Su1w1lctn4s6Mko9ux
+j9WcbrBfncbdj80T6W88EDH+V74oiCEElxBLfBOeXJCuMjc9uSaasbIMWMK+7ExV
+lz7d8ll7umv5AX84tpq8WDkc+7fcP9+p5GMtcTrdPKvL2CvSFmrnz+efKb6cNOT0
+B058D+uHPb0PasA6+xHpO3V3pSbSdcf8IqlvJKvoK8dch4qQ6uZD+Rz8ruxaPpBH
+cJdZk6hk0gc+7axjEWo/89CJauJzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ70
+kkZit+4D85Xi5Ms8+EYCjCo0GfUUp83ASZyPRml/D0VnOHLuj+dbPdQM0znnb5Sg
+7hIbSs/ERqrzKFJMJikpFXm1RQZNNRdf0d0V4nTrliXjGQcPCqXexdXRE6oBMeAi
+apbG2X8rFstwVVghWlbqkUjtko8MgUiD/RyjbAqVBWxqNjRGB3JOVt1g2SJ1tW7x
+pL1kcSedKTjYji+gJ9NLqumL9LTdtlqPzdBlChK4SfIIK/BE3GtD1S6rHn2wX+MC
++anyEs7LQkZJPiqDeo2VM3XLIHdw5VTf8HnFiLJMiDkuIUOj5g77gFFE5HGKPuur
+k+Eyx9965LHHOvpH3Zo=
+
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.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">UFPR - Universidade Federal do Parana</OrganizationName>
+ <OrganizationName xml:lang="pt-br">UFPR - Universidade Federal do Parana</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">UFPR - Universidade Federal do Parana</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ufpr.br/</OrganizationURL>
+ <OrganizationURL xml:lang="pt-br">http://www.ufpr.br/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>Antonio Rodrigues Barros</SurName>
+ <EmailAddress>antonio@ufpr.br</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uqam.ca.xml b/swamid-interfederations-2.0/idp.uqam.ca.xml
new file mode 100644
index 00000000..9bde5747
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uqam.ca.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.uqam.ca/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://uqam.ca" registrationInstant="2013-07-22T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="fr">http://www.canarie.ca/templates/services/docs/CAF_join_fr.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdrpi:PublicationInfo publisher="eduGAIN">
+ <mdrpi:UsagePolicy xml:lang="en">
+ http://www.edugain.org/policy/metadata-tou_1_0.txt
+ </mdrpi:UsagePolicy>
+ </mdrpi:PublicationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">uqam.ca</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="es">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Students, employees and other UQAM account holders</mdui:Description>
+ <mdui:Description xml:lang="fr">Ãtudiants, employés et autres détenteurs d'identifiants UQAM</mdui:Description>
+ <mdui:Description xml:lang="es">Los estudiantes, los empleados y otros titulares de identificadores UQAM</mdui:Description>
+ <mdui:Description xml:lang="pt">Os alunos, funcionários e outros detentores de identificação UQAM</mdui:Description>
+ <mdui:Description xml:lang="it">Gli studenti, i dipendenti e gli altri titolari di identificatori UQAM</mdui:Description>
+ <mdui:Keywords xml:lang="en">uqam.ca uqam montreal quebec university</mdui:Keywords>
+ <mdui:Keywords xml:lang="fr">uqam.ca uqam montréal québec université</mdui:Keywords>
+ <mdui:Keywords xml:lang="es">uqam.ca uqam montréal québec universidad</mdui:Keywords>
+ <mdui:Keywords xml:lang="pt">uqam.ca uqam montréal québec universidade</mdui:Keywords>
+ <mdui:Keywords xml:lang="it">uqam.ca uqam montréal québec università</mdui:Keywords>
+ <mdui:Logo height="16" width="48">https://idp.uqam.ca/images/logo_uqam-48x16.png</mdui:Logo>
+ <mdui:Logo height="60" width="182">https://idp.uqam.ca/images/logo_uqam-182x60.png</mdui:Logo>
+ <mdui:Logo height="647" width="1960">https://idp.uqam.ca/images/logo_uqam-1960x647.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="fr">http://www.uqam.ca</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.instances.uqam.ca/ReglementsPolitiquesDocuments/Documents/REGLEMENT_NO_15.pdf</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fr">http://www.instances.uqam.ca/ReglementsPolitiquesDocuments/Documents/REGLEMENT_NO_15.pdf</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="es">http://www.instances.uqam.ca/ReglementsPolitiquesDocuments/Documents/REGLEMENT_NO_15.pdf</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="pt">http://www.instances.uqam.ca/ReglementsPolitiquesDocuments/Documents/REGLEMENT_NO_15.pdf</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="it">http://www.instances.uqam.ca/ReglementsPolitiquesDocuments/Documents/REGLEMENT_NO_15.pdf</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>132.208.0.0/16</mdui:IPHint>
+ <mdui:DomainHint>uqam.ca</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:45.512843,-73.560893</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
+NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALTvLffPT+7KOUB1E4/VfYGDMTj8qyRceKedTLxG
+5y1gVngrl1wi3s3qF7aDV8P0SJmJJTtOplxnNNUCTPFyEtKD8TtUAL00Uk2xqB7c
+zgXjXpa5LB0obAz4tkOrrpD/WAffCfjaxiUY7JngPozOsvjCfCp/Yh77Q7wfa1Zx
+Dx65/vQCcgFUaXxcb7vq6ilohDcjQPzMJJvfFjJK2Rg+uNPoEbms15ebQzHfQ4Ci
+UbE+vQ5LxkruxNnOiq0d/C4hizKn5uC7oPxNjpEFe4y5cv5BG78KHkr9sKcWSVwg
+0k9ZtvXS2zGkQPM24f8g9WaF389JJlExaqKms+NPZyNpBqkCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLnVxYW0uY2GGImh0dHBzOi8vaWRwLnVxYW0uY2EvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFDVR7RoTZA/UsE/TttH8CaUzxeQ/MA0GCSqGSIb3
+DQEBBQUAA4IBAQBoEgpeo8w8SCBHmi/ShGkcMB9A2JFCpUfspkNOQQ7GSAsl2ix1
+/nY0120ooY4V7OWaRyRMkxtL9ycKwMMbJBREj6qiZCeDh4fy5KtyWJePI0+piKUG
+NMl4+fKSXD27kO0aClaPkYiSZeSWfoZEFWq+99FJ8A9uyr9lTyjjkXil87LfoYdg
+iJPe/MZXHYtLYGJcpD8eaIBshbjWWetxlfus6fDAkmu2cVZGwYiMhT/v0CTzhl3C
+l3HcCJmuresheZwe0OdBG9Qh/VHQeOftbJD/6/HhmHBZMJE33H3x8b5ZurP3oxFO
+fiFLy80FQ90W2jDA5xLADjiDZY7BwQMSmzLn
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.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.uqam.ca/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uqam.ca/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uqam.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uqam.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">uqam.ca</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Université du Québec à Montréal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">Université du Québec à Montréal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="es">Université du Québec à Montréal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt">Université du Québec à Montréal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">Université du Québec à Montréal</mdui:DisplayName>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
+NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALTvLffPT+7KOUB1E4/VfYGDMTj8qyRceKedTLxG
+5y1gVngrl1wi3s3qF7aDV8P0SJmJJTtOplxnNNUCTPFyEtKD8TtUAL00Uk2xqB7c
+zgXjXpa5LB0obAz4tkOrrpD/WAffCfjaxiUY7JngPozOsvjCfCp/Yh77Q7wfa1Zx
+Dx65/vQCcgFUaXxcb7vq6ilohDcjQPzMJJvfFjJK2Rg+uNPoEbms15ebQzHfQ4Ci
+UbE+vQ5LxkruxNnOiq0d/C4hizKn5uC7oPxNjpEFe4y5cv5BG78KHkr9sKcWSVwg
+0k9ZtvXS2zGkQPM24f8g9WaF389JJlExaqKms+NPZyNpBqkCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLnVxYW0uY2GGImh0dHBzOi8vaWRwLnVxYW0uY2EvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFDVR7RoTZA/UsE/TttH8CaUzxeQ/MA0GCSqGSIb3
+DQEBBQUAA4IBAQBoEgpeo8w8SCBHmi/ShGkcMB9A2JFCpUfspkNOQQ7GSAsl2ix1
+/nY0120ooY4V7OWaRyRMkxtL9ycKwMMbJBREj6qiZCeDh4fy5KtyWJePI0+piKUG
+NMl4+fKSXD27kO0aClaPkYiSZeSWfoZEFWq+99FJ8A9uyr9lTyjjkXil87LfoYdg
+iJPe/MZXHYtLYGJcpD8eaIBshbjWWetxlfus6fDAkmu2cVZGwYiMhT/v0CTzhl3C
+l3HcCJmuresheZwe0OdBG9Qh/VHQeOftbJD/6/HhmHBZMJE33H3x8b5ZurP3oxFO
+fiFLy80FQ90W2jDA5xLADjiDZY7BwQMSmzLn
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.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">Université du Québec à Montréal</OrganizationName>
+ <OrganizationName xml:lang="fr">Université du Québec à Montréal</OrganizationName>
+ <OrganizationName xml:lang="es">Université du Québec à Montréal</OrganizationName>
+ <OrganizationName xml:lang="pt">Université du Québec à Montréal</OrganizationName>
+ <OrganizationName xml:lang="it">Université du Québec à Montréal</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="es">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="it">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</OrganizationURL>
+ <OrganizationURL xml:lang="fr">http://www.uqam.ca</OrganizationURL>
+ <OrganizationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</OrganizationURL>
+ <OrganizationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <EmailAddress>shibboleth@uqam.ca</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.iay.org.uk.xml b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
index 5c919468..f3d6419f 100644
--- a/swamid-interfederations-2.0/idp2.iay.org.uk.xml
+++ b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.iay.org.uk/idp/shibboleth">
- <!--
- This is an SDSS project test IdP running outside the University environment.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
</Extensions>
diff --git a/swamid-interfederations-2.0/idp2.kau.se.xml b/swamid-interfederations-2.0/idp2.kau.se.xml
index e25e22e1..9e3a3ffd 100644
--- a/swamid-interfederations-2.0/idp2.kau.se.xml
+++ b/swamid-interfederations-2.0/idp2.kau.se.xml
@@ -9,7 +9,7 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kau.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Karlstads Universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName>
<mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description>
<mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description>
@@ -100,6 +100,7 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">KAU</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Karlstads Universitet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
</Organization>
diff --git a/swamid-interfederations-2.0/issues.shibboleth.net.xml b/swamid-interfederations-2.0/issues.shibboleth.net.xml
index 7a89c6ea..076bc9bd 100644
--- a/swamid-interfederations-2.0/issues.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/issues.shibboleth.net.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://issues.shibboleth.net/shibboleth">
- <!--
- This is a Shibboleth Federated Issue Tracking Shibboleth SP for JISC Collections and Janet Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
diff --git a/swamid-interfederations-2.0/kiidp.ki.se.xml b/swamid-interfederations-2.0/kiidp.ki.se.xml
index c0a708dd..ac9f44be 100644
--- a/swamid-interfederations-2.0/kiidp.ki.se.xml
+++ b/swamid-interfederations-2.0/kiidp.ki.se.xml
@@ -8,6 +8,31 @@
<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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Karolinska Institutet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Karolinska Institutet</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description>
+ <mdui:Logo height="146" width="292">https://kiidp.ki.se/images/ki_logo_292x146.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
+ <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
+ <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
+ <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
+ <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
+ <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
+ <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
+ <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
+ <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
+ <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
+ <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
+ <mdui:DomainHint>ki.se</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -81,6 +106,7 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
</md:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">KI</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/login.du.se.xml b/swamid-interfederations-2.0/login.du.se.xml
index b8338659..3591e642 100644
--- a/swamid-interfederations-2.0/login.du.se.xml
+++ b/swamid-interfederations-2.0/login.du.se.xml
@@ -95,7 +95,8 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
</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>
+ <OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Dalarna University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.du.se</OrganizationURL>
</Organization>
<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
diff --git a/swamid-interfederations-2.0/login.liu.se.xml b/swamid-interfederations-2.0/login.liu.se.xml
index 64a81b62..04758b00 100644
--- a/swamid-interfederations-2.0/login.liu.se.xml
+++ b/swamid-interfederations-2.0/login.liu.se.xml
@@ -9,7 +9,7 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liu.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Linköpings Universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
<mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
<mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
@@ -100,12 +100,12 @@ dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
<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">LiU</OrganizationName>
<OrganizationName xml:lang="sv">LiU</OrganizationName>
+ <OrganizationName xml:lang="en">LiU</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Linköpings Universitet</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="sv">Linköpings universitet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.liu.se?l=en</OrganizationURL>
<OrganizationURL xml:lang="sv">http://www.liu.se?l=sv</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.liu.se?l=en</OrganizationURL>
</Organization>
<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
<Company>Linköping University</Company>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no.xml b/swamid-interfederations-2.0/openwiki.uninett.no.xml
index 8e67777f..0d66e714 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no.xml
@@ -1,8 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T11:34:54Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor>
- <ds:KeyInfo>
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UNINETT OpenWiki</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="no">UNINETT OpenWiki</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
+ <mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
</ds:X509Data>
@@ -12,24 +32,27 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
<md:AttributeConsumingService index="0">
<md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
- <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a wikifarm where Feide users can create their own wiki.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikifarm hvor Feidebrukere kan lage egne wikier.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="nn">UNINETT OpenWiki er ein wikifarm der Feidebrukarar kan lage eigne wikiar.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+ <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+ <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+ </md:Organization>
<md:ContactPerson contactType="technical">
- <md:Company>UNINETT AS</md:Company>
- <md:GivenName>Andreas</md:GivenName>
- <md:SurName>Solberg</md:SurName>
- <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
- <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+ <md:GivenName>Feide Support</md:GivenName>
+ <md:EmailAddress>support@feide.no</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repos.ids-mannheim.de.xml b/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
index 65c902b6..661ec61d 100644
--- a/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
@@ -7,7 +7,7 @@
</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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
</Extensions>
diff --git a/swamid-interfederations-2.0/rr.funet.fi.xml b/swamid-interfederations-2.0/rr.funet.fi.xml
index 931402cb..4353f71e 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" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rr.funet.fi/attribute-test">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
<mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
@@ -12,13 +17,9 @@
<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>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEzDCCA7SgAwIBAgIRANkuMGk/HlexnQRYLfLoQaEwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -48,104 +49,104 @@ rpMTlKYf36DnHsyERNItnzU02J686VAecWTuNgUwHHI3LzZCWVncQm+I6veK43Ct
PahX4Y7zrHlQEDDBvQM0uwFM4Dgy07Qk3EwVXCs+46U=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
- <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>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>
+ </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/saml-1.sys.kth.se.xml b/swamid-interfederations-2.0/saml-1.sys.kth.se.xml
index 908d8bc8..5e950e67 100644
--- a/swamid-interfederations-2.0/saml-1.sys.kth.se.xml
+++ b/swamid-interfederations-2.0/saml-1.sys.kth.se.xml
@@ -9,7 +9,9 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kth.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:Description xml:lang="en">The KTH Royal Institute of Technology Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:DisplayName xml:lang="sv">Kungliga Tekniska Högskolan</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
+ <mdui:Description xml:lang="en">KTH Royal Institute of Technology Identity Provider is used by employees and students at the university.</mdui:Description>
<mdui:InformationURL xml:lang="sv">https://saml-1.sys.kth.se/om.html</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">https://saml-1.sys.kth.se/about.html</mdui:InformationURL>
<mdui:Logo height="82" width="82">https://saml-1.sys.kth.se/logo-main.png</mdui:Logo>
@@ -116,7 +118,8 @@ sdhdXg==
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">KTH</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Kungliga Tekniska högskolan</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska Högskolan</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
</Organization>
<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
diff --git a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml b/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
index 0cfc6ca5..a96b5a1f 100644
--- a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
+++ b/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
@@ -9,7 +9,7 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oru.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Örebro Universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
<mdui:Description xml:lang="en">The Örebro University Identity Provider is used by employees and students at the university.</mdui:Description>
<mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
@@ -88,7 +88,8 @@ Pz8R3A==</ds:X509Certificate>
</AttributeAuthorityDescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">ORU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Örebro Universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Örebro Universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
</Organization>
<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
diff --git a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
index a504ad06..69a10d63 100644
--- a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp-dev.cf.ac.uk/shibboleth">
- <!--
- This is a Shib 2 Test SP owned by Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
</Extensions>
diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
index bd7f0926..e00cf585 100644
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
- <!--
- This is a Shibboleth IdP for The University of Manchester.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
</Extensions>
@@ -36,36 +33,34 @@
<mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
</mdui:DiscoHints>
</Extensions>
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEvzCCA6egAwIBAgIQLnN/xcI/Xs3CPSU+WOVMZTANBgkqhkiG9w0BAQUFADA2
+ MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEwMDkxMDAwMDAwMFoXDTEzMDkwOTIzNTk1OVowgZQxCzAJBgNV
- BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
- MSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0eSBvZiBNYW5jaGVzdGVyMRQwEgYDVQQL
- EwtJVCBTZXJ2aWNlczEeMBwGA1UEAxMVc2hpYi5tYW5jaGVzdGVyLmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+5jTMZQrSd7hG0fSjcZeMMXa
- UaH+A8qCgrvxXwcryA36/cweR9j/JhkHzg9KOPcYhJBQnZaM1WvH/Gt8jY2N6R4I
- mxCDF0idUGpT/gqyDa/2t9jvFmFfWQNsN65EoILVscZlQxx0Pbn05dpZr5BoNWdP
- t1QonOZhBAxwylypuAlqOQhp0/Pxc0w9rCXxnUrH4tVgypOhn3/ob/VWQo1s0iYF
- 7bi4GD+WXvWXA4HCrqpcJaTszjujRDCPHc3xzKfsky/uASWmoRdMz7jrHyRXYuv6
- +RrJlS7SV4kLj7LUT1U8G/ZkLoTpgwuM2HD34wOPco6pwq3iUwAib+meNq5rUQID
- AQABo4IBaDCCAWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYD
- VR0OBBYEFDcK/i8sny58zSGKte9rTVhg19rSMA4GA1UdDwEB/wQEAwIFoDAMBgNV
- HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAE
- ETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
- dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1
- BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAG
- A1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rlci5hYy51azANBgkqhkiG9w0BAQUFAAOC
- AQEATgcGt1SIaqePVFQx4NyK3i6G1Jm+L/+AOAOwMznYzxSPU6JVYX+xWLhDBTaw
- vBHWR4+KKKmKpumfInTVPHBFOIH1qhHbEtZjFJU67y1H0KacftFOdVP6O3KD2jep
- s6F/P4ioVtk/djtSKW0KO/ejOP5UoPM9xmls6rGf+fwfDY+5XRFN0JRIFhBy+Ejx
- WaVcxswtlMYB7ecmfIuUkhGjsmaZP3bfY6ThpkUFw+fajNfBPNJarmN6FXQYIUyz
- OqOnjEJ/2UdVSaMlZCk6DeqMOxpeSg1hAq1m1OiyUepzJZ4zo6W5a90/Q56hPaYE
- hCCkj8L8NyX2H2RPH9QLJpIbVg==
+ U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
+ CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
+ ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
+ lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
+ lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
+ HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
+ k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
+ JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
+ reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
+ AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+ AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+ HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+ Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+ Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+ Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
+ ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
+ PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
+ nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
+ 7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
+ G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
+ VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -83,36 +78,34 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEvzCCA6egAwIBAgIQLnN/xcI/Xs3CPSU+WOVMZTANBgkqhkiG9w0BAQUFADA2
+ MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEwMDkxMDAwMDAwMFoXDTEzMDkwOTIzNTk1OVowgZQxCzAJBgNV
- BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
- MSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0eSBvZiBNYW5jaGVzdGVyMRQwEgYDVQQL
- EwtJVCBTZXJ2aWNlczEeMBwGA1UEAxMVc2hpYi5tYW5jaGVzdGVyLmFjLnVrMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+5jTMZQrSd7hG0fSjcZeMMXa
- UaH+A8qCgrvxXwcryA36/cweR9j/JhkHzg9KOPcYhJBQnZaM1WvH/Gt8jY2N6R4I
- mxCDF0idUGpT/gqyDa/2t9jvFmFfWQNsN65EoILVscZlQxx0Pbn05dpZr5BoNWdP
- t1QonOZhBAxwylypuAlqOQhp0/Pxc0w9rCXxnUrH4tVgypOhn3/ob/VWQo1s0iYF
- 7bi4GD+WXvWXA4HCrqpcJaTszjujRDCPHc3xzKfsky/uASWmoRdMz7jrHyRXYuv6
- +RrJlS7SV4kLj7LUT1U8G/ZkLoTpgwuM2HD34wOPco6pwq3iUwAib+meNq5rUQID
- AQABo4IBaDCCAWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYD
- VR0OBBYEFDcK/i8sny58zSGKte9rTVhg19rSMA4GA1UdDwEB/wQEAwIFoDAMBgNV
- HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAE
- ETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
- dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1
- BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAG
- A1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rlci5hYy51azANBgkqhkiG9w0BAQUFAAOC
- AQEATgcGt1SIaqePVFQx4NyK3i6G1Jm+L/+AOAOwMznYzxSPU6JVYX+xWLhDBTaw
- vBHWR4+KKKmKpumfInTVPHBFOIH1qhHbEtZjFJU67y1H0KacftFOdVP6O3KD2jep
- s6F/P4ioVtk/djtSKW0KO/ejOP5UoPM9xmls6rGf+fwfDY+5XRFN0JRIFhBy+Ejx
- WaVcxswtlMYB7ecmfIuUkhGjsmaZP3bfY6ThpkUFw+fajNfBPNJarmN6FXQYIUyz
- OqOnjEJ/2UdVSaMlZCk6DeqMOxpeSg1hAq1m1OiyUepzJZ4zo6W5a90/Q56hPaYE
- hCCkj8L8NyX2H2RPH9QLJpIbVg==
+ U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
+ CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
+ ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
+ lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
+ lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
+ HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
+ k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
+ JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
+ reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
+ AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+ AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+ HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+ Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+ Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+ Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
+ ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
+ PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
+ nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
+ 7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
+ G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
+ VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index b80de835..a6452c31 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,9 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.catalog.clarin.eu">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor>
- <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.catalog.clarin.eu">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-29T11:20:42Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://catalog.clarin.eu/Shibboleth.sso/DS" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Clarin Catalog Service Provider</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Clarin Catalog Service Provider</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</mdui:Description>
+ <mdui:Description xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
+ <mdui:InformationURL xml:lang="de">http://www.clarin.eu</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.clarin.eu</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>catalog.clarin.eu</ds:KeyName>
<ds:X509Data>
+ <ds:X509SubjectName>CN=catalog.clarin.eu,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
<ds:X509Certificate>MIIE3DCCA8SgAwIBAgIED+aV9jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMDA0MTUxMzQ1
@@ -29,37 +54,91 @@ s6fNqdPrhNcEN8KweZh9HyOgNpTEJPJpfwb4XR3pzfSRyPotr2GL80NVXTDA+YQs
fPO0WLU0KduZtyfl1QGnYZcIpBAN53M+EvMk0Q9ruOP3FZazLPscULJnqW8Ks8/v
ijthUt3XZFCR66qbNf7HeyS7zzYYMkyRDJN9PixRyiEAWHifqXJQzNI9dlqcy+Aq
nnDbttGYLUyhuuT+CqcBRWJButW9x4BFUDNHrgfcPWwFhUGx3hqI2U6zqrTgesWg
-hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI</ds:X509Certificate>
+hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Catalog Clarin</md:ServiceName>
- <md:ServiceName xml:lang="en">Catalog Clarin</md:ServiceName>
- <md:ServiceName xml:lang="sv">Catalog Clarin</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Catalog Clarin</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">CMDI Component Registry - web application for managing, creating and editing metadata components.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Tobias</md:GivenName>
- <md:SurName>Vanvalkenhoef</md:SurName>
- <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>catalog.clarin.eu</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=catalog.clarin.eu,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
+ <ds:X509Certificate>MIIE3DCCA8SgAwIBAgIED+aV9jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMDA0MTUxMzQ1
+MTFaFw0xNTA0MTQxMzQ1MTFaMH8xCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
+dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxGjAYBgNVBAMTEWNhdGFsb2cuY2xhcmlu
+LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0SxoF+pHBBTzECbn
+IK3k+WuiRpZCv/ECHgUqSq5mw+5x1ZOrP3qW1c/BL+mh8rPM3twPw1zh7faycCzb
+Wg6xjkzbvfnidFq394JdJ8OYHHd4629vF/QQlDiPU/WXNL1PWqh+JNoVbBeZI8Uz
++xglMyPaLn2rOTcVm5fqk6Do8DrubkZ7fxZ/4CkzJ8rTlFNOCcN8x5G2rWtcJYHa
+xS0ZBhmMt1AmqzWh7ZJCvgS9Wma4ZOhuh3xZSlaEB8o3HWAYprR6g7L+HFvmKdfK
+8oGbBViHUqsslr80Mtli15ZzxkkBH95fzYPdJTCAMccaqLhvQfjuChy7FsDYI5cV
+fvhaJQIDAQABo4IBfzCCAXswCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPV/s0egKEIbVq/6uW/GqGNX3RInMB8G
+A1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMHcGA1UdHwRwMG4wNaAzoDGG
+L2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/Bggr
+BgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCyMBGsYojEQdaSJnym2OQQ
+s6fNqdPrhNcEN8KweZh9HyOgNpTEJPJpfwb4XR3pzfSRyPotr2GL80NVXTDA+YQs
+fPO0WLU0KduZtyfl1QGnYZcIpBAN53M+EvMk0Q9ruOP3FZazLPscULJnqW8Ks8/v
+ijthUt3XZFCR66qbNf7HeyS7zzYYMkyRDJN9PixRyiEAWHifqXJQzNI9dlqcy+Aq
+nnDbttGYLUyhuuT+CqcBRWJButW9x4BFUDNHrgfcPWwFhUGx3hqI2U6zqrTgesWg
+hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="de">Clarin Catalog Service Provider</ServiceName>
+ <ServiceName xml:lang="en">Clarin Catalog Service Provider</ServiceName>
+ <ServiceDescription xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</ServiceDescription>
+ <ServiceDescription xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</ServiceDescription>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="de">e235</OrganizationName>
+ <OrganizationName xml:lang="en">e235</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <GivenName>Daan</GivenName>
+ <SurName>Broeder</SurName>
+ <EmailAddress>mailto:Daan.Broeder@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Tobias</GivenName>
+ <SurName>van Valkenhoef</SurName>
+ <EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Dieter</GivenName>
+ <SurName>Van Uytvanck</SurName>
+ <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lat.csc.fi.xml b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
index 96d91258..7c77aa06 100644
--- a/swamid-interfederations-2.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
@@ -1,28 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sp.lat.csc.fi">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sp.lat.csc.fi">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.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="fi">LAT-palvelussa tutkijat voivat tallentaa ja käsitellä video- ja äänimateriaalia.</mdui:Description>
<mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
+ <mdui:Description xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja käsitellä video- ja äänimateriaalia.</mdui:Description>
<mdui:Logo height="41" width="100">https://lat.csc.fi/gif/LA.png</mdui:Logo>
- <mdui:InformationURL xml:lang="sv">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
<mdui:InformationURL xml:lang="fi">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="sv">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
</mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEuDCCA6CgAwIBAgIRAJRkURURLhdqLNjrk9ROa4QwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMTA1MTgwMDAwMDBaFw0xMzA1MTcyMzU5NTlaMIGXMQswCQYD
+VQQGEwJGSTEOMAwGA1UEERMFMDIxMDExEDAOBgNVBAgTB1V1c2ltYWExDjAMBgNV
+BAcTBUVzcG9vMRYwFAYDVQQJEw1LZWlsYXJhbnRhIDE0MSkwJwYDVQQKEyBDU0Mg
+LSBJVCBDZW50ZXIgZm9yIFNjaWVuY2UgTHRkLjETMBEGA1UEAxMKbGF0LmNzYy5m
+aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMX3OzBEWbhIY+MDtbzF
+7Ys8fDjznPWCT08RkgnTr/lkGl3qUMzx7pjRUtYVi/tdZFxsc3U4NzsfKUW2fYSZ
+IjWL/wZmvXyb/B6YuOTYcPa8R19ocvzU4b1bhA8XPgRKQqDDydJivAkBJEfJ6ZKH
+rtM1Z1u/n9abYwM0KMnqkznF9CtWarR+OdehBpuyKkxC3nJeM+cGVHfGHgrebiZ3
+YGmACWUk/1TEPGfINA3TNya6LSrZAjWlkHt0l6ETMjfsn1qbcx88bTVSq3bMV8ex
+IW2UW4GOENmMbBTEaiMzQmeNkHxQIRUrxNA8+jUhsZGXdwaLmFltqSOJBtgGd6Zf
+KesCAwEAAaOCAV0wggFZMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+MB0GA1UdDgQWBBRoExciww04irlvIesUmJQ9EUtNSTAOBgNVHQ8BAf8EBAMCBaAw
+DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYD
+VR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
+Y3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRh
+MF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+U1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9y
+ZzAVBgNVHREEDjAMggpsYXQuY3NjLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQBAGJq7
+lQ6NKPiVSlp9N1V6EVDnYlioyqv/pabKKivWlvl+MAAjZlfk8OmdWsBYUgH2aeM5
+1nKz8gFBnwI7up2OjpdrJRGAkyyXbnQt34vT81vEF+otLvAmilNwRPAi29zWnrGl
+37mjTjfziOeHZPLX59q/CGJxibFk1l1G01YzLstT+MYdWI30MhZg//vK96RZaRog
+Q76UgcYknkN+Trpc4n8TExlhXZw881XVdm/hKgaRDnS4obofKFpZyqTtVNekHMr6
+0/tukGQvVEp3KmukbhzJ2Oa4d4Q0sIZctuU8RRh62IqbBKkSAQx/kw9dF43X8rmf
+gIbcJY1SYVwxxDSg</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -50,42 +88,42 @@ CiBkuiUynwqLsQKjfkcSZa5W9a8spV7y8LmCAEtDk8l03p45TKRvWIgMAexg/60h
TE5WJb+s+lUOs3IoVL33fpbG+Aor</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">LAT – Language Archive Tools</md:ServiceName>
- <md:ServiceName xml:lang="en">LAT – Language Archive Tools</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Tero</md:GivenName>
- <md:SurName>Aalto</md:SurName>
- <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Martin</md:GivenName>
- <md:SurName>Matthiesen</md:SurName>
- <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Tero</md:GivenName>
- <md:SurName>Aalto</md:SurName>
- <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="fi">LAT – Language Archive Tools</ServiceName>
+ <ServiceName xml:lang="en">LAT – Language Archive Tools</ServiceName>
+ <ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</ServiceDescription>
+ <ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</ServiceDescription>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+ <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <GivenName>Tero</GivenName>
+ <SurName>Aalto</SurName>
+ <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Martin</GivenName>
+ <SurName>Matthiesen</SurName>
+ <EmailAddress>mailto:martin.matthiesen@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Tero</GivenName>
+ <SurName>Aalto</SurName>
+ <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index 62c8e7de..7f9a49b4 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,9 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.lux17.mpi.nl">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor>
- <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lux17.mpi.nl">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-04-27T09:05:42Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lux17.mpi.nl/Shibboleth.sso/DS" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</mdui:Description>
+ <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</mdui:Description>
+ <mdui:Logo height="90" width="90">https://lux17.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>lux17.mpi.nl</ds:KeyName>
<ds:X509Data>
+ <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
<ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxMzQ4
@@ -29,37 +55,91 @@ LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
-0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==</ds:X509Certificate>
+0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">IMDI Browsable Corpus</md:ServiceName>
- <md:ServiceName xml:lang="en">IMDI Browsable Corpus</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Repository of Linguistic Resources. For Humanities and Social Sciences researchers.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Tobias</md:GivenName>
- <md:SurName>van Valkenhoef</md:SurName>
- <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>lux17.mpi.nl</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
+ <ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxMzQ4
+MTBaFw0xNDAzMTcxMzQ4MTBaMHoxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
+dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0wTdnMTgPC8/x6+0reirYB
+bifyQwbOLHE0bOtHD6et5oT9WPRosJFpFxnxs2aF/SqR7Kar4Z/7lMBFbL3vdgrJ
+h6fCNVofBI/Zs7d8aCwfcc6aMJORJPlTtFElmNvZD8TE035qzRNfkwqPOYkmwqlC
+CP9pJwebt3kEJSHHOVngydBJaVzSDayJLp1WzQ2FyEVfbPyUaQ2z2RyPGG0C1yX4
+Thin64YaRlBH78INIlCf8NpQwc+CCG7SgVSuDq1DEZXbm7z789kUJtqnlNe2Nahj
+inYfMr4Jtc27TwD+We9cs14LjSst4L3gd0kT511Wycs53+BpMWRWVKD4tFMva+EC
+AwEAAaOCAX8wggF7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBRY3hAzheVZXJug0vL3ndQWl8CAjTAfBgNVHSME
+GDAWgBQC1h5uCau/WGWnCjxIM2HRzn3DWzB3BgNVHR8EcDBuMDWgM6Axhi9odHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOg
+MYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NybC9jYWNybC5j
+cmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPwYIKwYBBQUH
+MAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbTiXJjoL5ulDq6yP3g2cBE4tpXN/
+LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
+3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
+A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
+7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
+0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</ServiceName>
+ <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</ServiceName>
+ <ServiceDescription xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</ServiceDescription>
+ <ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</ServiceDescription>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="de">e235</OrganizationName>
+ <OrganizationName xml:lang="en">e235</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Tobias</GivenName>
+ <SurName>van Valkenhoef</SurName>
+ <EmailAddress>mailto:Tobias.vanValkenhoef@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Dieter</GivenName>
+ <SurName>Van Uytvanck</SurName>
+ <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Dieter</GivenName>
+ <SurName>Van Uytvanck</SurName>
+ <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swamid.user.uu.se.xml b/swamid-interfederations-2.0/swamid.user.uu.se.xml
index 2b484779..51ca9a72 100644
--- a/swamid-interfederations-2.0/swamid.user.uu.se.xml
+++ b/swamid-interfederations-2.0/swamid.user.uu.se.xml
@@ -1,13 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://swamid.user.uu.se/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid.user.uu.se/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Uppsala Universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
+ <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://cas.user.uu.se/cas/om.html</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://cas.user.uu.se/cas/about.html</mdui:InformationURL>
+ <mdui:Logo height="125" width="125">https://cas.user.uu.se/cas/uu_img/125_uu_logo_white.gif</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>uu.se</mdui:DomainHint>
+ <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
+ <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
+ <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
+ <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
+ <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
+ <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
+ <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -24,27 +52,30 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==</ds:X509Certificate>
+2DlT+A==
+
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+ </KeyDescriptor>
+ <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
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -61,23 +92,26 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==</ds:X509Certificate>
+2DlT+A==
+
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Uppsala universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:Company>Uppsala universitet</md:Company>
- <md:SurName>AKKA SAML2</md:SurName>
- <md:EmailAddress>akka-datordrift@its.uu.se</md:EmailAddress>
- </md:ContactPerson>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">UU</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Uppsala Universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <Company>Uppsala universitet</Company>
+ <SurName>AKKA SAML2</SurName>
+ <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+ </ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org.xml
index 7b64359e..430368fb 100644
--- a/swamid-interfederations-2.0/terena.org.xml
+++ b/swamid-interfederations-2.0/terena.org.xml
@@ -1,32 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">TERENA Service Provider Proxy</mdui:DisplayName>
+ <mdui:Description xml:lang="en">A service provider proxy for all TERENA federated services</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p</mdui:PrivacyStatementURL>
+ <mdui:Logo height="94" width="350">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
<md:KeyDescriptor use="signing">
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
<md:AttributeConsumingService index="0">
<md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
- <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>TERENA</md:GivenName>
+ <md:SurName>AAI team</md:SurName>
+ <md:EmailAddress>aai@terena.org</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
index be47203e..71232072 100644
--- a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
+++ b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ukfederation.org.uk/entity">
- <!--
- This is a UK federation Shibboleth 2 test SP.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T11:19:55Z"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
diff --git a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
index 68bc8647..399c2265 100644
--- a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
@@ -1,32 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://uat.leeds1.emeraldinsight.com/entity">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.leeds1.emeraldinsight.com/entity">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" index="1"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" index="2"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" index="3"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/UKFederation"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" index="4"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" index="5"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
+ <ds:X509Certificate>
+ MIIDWzCCAkOgAwIBAgIJAOAh4h4v+OW9MA0GCSqGSIb3DQEBBQUAMC0xKzApBgNV
+ BAMTImVtLXVhdC1yaC1zdnIwMy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTEwNzI3
+ MTQyNjE0WhcNMjEwNzI0MTQyNjE0WjAtMSswKQYDVQQDEyJlbS11YXQtcmgtc3Zy
+ MDMuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAnGjTgEi/bQRHpc9poXHq5QlfQomoyoCO5et3+VB4J65HOpP/PkxPE6ah
+ kBTrzJstsD7SDatrcRM2aL28yjT+pj+mHR0x57JIMH8bC64Wy6xxC2/aj1dBZ1J8
+ xo4tLJuy3ojfb7eNSHg8UuJO3pRWIC3TtzXJfQuNiTY/8M32u3i4aY+1rss87BQ6
+ F+4G4MDC7EnjEm0f28WtweCC9+S5sm3AuxVEAwJuLMYJLJPfz5tgwDKYAeU9DmST
+ kLiPgzr1roGEd6Bz6/o6t8rbaSUX4S7Dk6K/gVAJf9wFFvina/M2krLJC0yODqXY
+ p2/8hVVm3uw02XRULx6nv8VRzQ+iuwIDAQABo34wfDBbBgNVHREEVDBSgiJlbS11
+ YXQtcmgtc3ZyMDMuZW1lcmFsZGluc2lnaHQuY29thixodHRwczovL3VhdC5sZWVk
+ czEuZW1lcmFsZGluc2lnaHQuY29tL2VudGl0eTAdBgNVHQ4EFgQUwEzN/hOiH7zK
+ 9Mrx+j9GNUPpbUEwDQYJKoZIhvcNAQEFBQADggEBABmXktnHYciTi91g9J/lveDc
+ ZwLUQ9gwi/CrLe1SX1vxI9Zou1qt4WEVXcltofO5JQ4wbbJKOgB6avy56iY6qAcw
+ +3A16o6lZHP+0Q/pomdZPiIxHCe5ZVjlk9OXhBRiAZiY9dI1VNKM3suGkGsDoQQm
+ dojusN4+Hfv/E2gQi4iCJWmWvUbT7rTNkyVeWGBMEUJRCCAHUP5aZcqMVGwqvVlG
+ RqkhtZpBnQu/XTEhKw9xhlpid8XUUEwAz+hfY/Hzf1YhyKCmLc9q709/sPOfnqTq
+ ONpDCEUvKV32/tyP4qR7RwMnwVEtN29Vrc9XZQ+n6zgm47u4WotML5m4gmr0Wqw=
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">EmeraldInsight</md:ServiceName>
- <md:ServiceName xml:lang="da">EmeraldInsight</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to provide personalized access to journals and papers on social sciences</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">at give adgang til EmeraldInsights tidsskrifter og artikler inden for socialvidenskab</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Emerald Group Publishing Ltd: UAT Site</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://uat.leeds1.emeraldinsight.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Rob</GivenName>
+ <SurName>Wood</SurName>
+ <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Laurence</GivenName>
+ <SurName>Parkin</SurName>
+ <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vea-idp.lanet.lv.xml b/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
new file mode 100644
index 00000000..ce9ecce7
--- /dev/null
+++ b/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vea-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://vea-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://vea-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 - VEA</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Ventspils University College - VEA 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 9c97e6f6..a3b0c536 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,173 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.wayf.dk">
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wayf.wayf.dk">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">hi.is</shibmd:Scope>
- <shibmd:Scope regexp="false">ruc.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">tietgen.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">orphanage.wayf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ucl.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">aau.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">viauc.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">phmetropol.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ihk.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ucc.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">drlund-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">iha.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">uni-login.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sdu.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">itu.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">frberg-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ags.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">nordfyns-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">midtfyns-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">middelfart-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">opengym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">maribo-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">mulerne-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">nakskov-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">norreg.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">nyborg-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ribekatedralskole.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sctknud-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">svendborg-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">tgy.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">tornbjerg-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vestfyns-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vucfyn.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sosufyn.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sopu.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sosufh.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">faaborg-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">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">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">kea.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">wayf.dk</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo>
<ds:X509Data>
@@ -194,4 +32,9 @@
<md:OrganizationURL xml:lang="da">http://wayf.dk/index.php/da</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://wayf.dk/index.php/en</md:OrganizationURL>
</md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>WAYF</md:GivenName>
+ <md:SurName>Operations</md:SurName>
+ <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
index 14fee192..5fa87a74 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,19 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://weblicht.sfs.uni-tuebingen.de">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">weblicht</mdui:DisplayName>
- </mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-06-11T09:42:51Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
</saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">WebLicht</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">WebLicht</mdui:DisplayName>
+ <mdui:Description xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+ <mdui:Description xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+ <mdui:InformationURL xml:lang="de">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>emailAddress=eh@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=WebLicht,OU=DSPIN,OU=Seminar fuer Sprachwissenschaft,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMTAwNDE5MTMyNjA3WhcNMTUwNDE4MTMyNjA3WjCByzEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xKDAm
+BgNVBAsTH1NlbWluYXIgZnVlciBTcHJhY2h3aXNzZW5zY2hhZnQxDjAMBgNVBAsT
+BURTUElOMREwDwYDVQQLEwhXZWJMaWNodDEmMCQGA1UEAxMdd2VibGljaHQuc2Zz
+LnVuaS10dWViaW5nZW4uZGUxJjAkBgkqhkiG9w0BCQEWF2VoQHNmcy51bmktdHVl
+YmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJJ+lISL
+liCGHMdtC5EKdkSPkZIEfGf6u0I2YT+u/bX37XL4yOvmMxJxRLQM4oEvnE67n8k8
+4qe06B8xErFh3KqgC5Q5keUlQmXJu4wvABnk9AuxlwJKuGXI3PetBYfhid10A7Iu
+3Ki0s3j7+7yYTG6xXJt4qrE7rV/v79zBQcoKOwu1AMdfV9q8GRShEXCQ82P4IITT
+Q4z513p1e0mscDdBIunH6aThNCJA9rUBwEVX90HX5KHaOPSksHISylhjl/++XJFy
+/0wBpiZ4+7pN2S/go9J8A153NZSPhF2M5deyWgjT/K2LSudLnegIlRFTq1Kv89eE
+bF/ZaHuNvakbqQIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRmWkIAb3Vr
+zkTtELxvwSx4nngcUDAfBgNVHSMEGDAWgBSwwbtoNX/i1kGcGnGv4PxBNM3DqDAi
+BgNVHREEGzAZgRdlaEBzZnMudW5pLXR1ZWJpbmdlbi5kZTCBkwYDVR0fBIGLMIGI
+MEKgQKA+hjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVlLWNh
+L3B1Yi9jcmwvZ19jYWNybC5jcmwwQqBAoD6GPGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBrAYIKwYB
+BQUHAQEEgZ8wgZwwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+Y2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYB
+BQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2Ev
+cHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGxJyokA
+uUwUFzvszzutQNicSlWWHmrB6g63cRkbgBMsNGFwIyhrizCJtPYTDAbJ1lG2PrYj
+YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
++Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
+kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
+NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
+wN2yHSwHNNMiiGY=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
<ds:X509Data>
+ <ds:X509SubjectName>emailAddress=eh@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=WebLicht,OU=DSPIN,OU=Seminar fuer Sprachwissenschaft,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
@@ -44,41 +98,38 @@ YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
+Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
-wN2yHSwHNNMiiGY=</ds:X509Certificate>
+wN2yHSwHNNMiiGY=
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">WebLicht</md:ServiceName>
- <md:ServiceName xml:lang="en">WebLicht</md:ServiceName>
- <md:ServiceName xml:lang="sv">WebLicht</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Web-based linguistic chaining tool.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Web-based linguistic chaining tool.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="sv">Web-based linguistic chaining tool.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Thomas</md:GivenName>
- <md:SurName>Zastrow</md:SurName>
- <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Thomas</md:GivenName>
- <md:SurName>Zastrow</md:SurName>
- <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="de">WebLicht</ServiceName>
+ <ServiceName xml:lang="en">WebLicht</ServiceName>
+ <ServiceDescription xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</ServiceDescription>
+ <ServiceDescription xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</ServiceDescription>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="de">e60</OrganizationName>
+ <OrganizationName xml:lang="en">e60</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Universität Tübingen</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">University of Tuebingen</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.uni-tuebingen.de/en/landingpage.html</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Thomas</GivenName>
+ <SurName>Zastrow</SurName>
+ <EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Department of Linguistics, General and Computational Linguistics</GivenName>
+ <SurName>Support</SurName>
+ <EmailAddress>mailto:webapplications@sfs.uni-tuebingen.de</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml b/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml
new file mode 100644
index 00000000..b5590de0
--- /dev/null
+++ b/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.dir.garr.it:12081/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-07-30T13:14: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">WIFI - GARR</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">WIFI - GARR</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This service enables the authentication by IDEM credentials at wireless network in GARR</mdui:Description>
+ <mdui:Description xml:lang="it">Questo servizio abilita l'autenticazione mediante credenziali IDEM presso la rete wireless della Direzione GARR</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.garr.it/wifi/info</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="it">http://www.garr.it/wifi/info</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="it">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
+ </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://wifi.dir.garr.it:12081/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/WAYF"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>wifi.dir.garr.it</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=wifi.dir.garr.it,OU=Domain Control Validated</ds:X509SubjectName>
+ <ds:X509Certificate>MIIEbjCCA1agAwIBAgIRALxMXgZtagsFRXGxHmc7ojQwDQYJKoZIhvcNAQEFBQAw
+ NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+ IFNTTCBDQTAeFw0xMzA3MDUwMDAwMDBaFw0xNjA3MDQyMzU5NTlaMD4xITAfBgNV
+ BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQd2lmaS5kaXIu
+ Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM1nKllgz7Q6
+ u14Q9efpbAAculFFENIAIIJQVCU/rE7HFPGxxaEDxpBWpq7oUAd9wYT+sFiQk1Zf
+ kFwWCxbpwqftLBytbCpOFmzqxcKqtaBX4d8qkBI8v4fIOjYPeC6inMXLZOf+3/QL
+ ITNjj70N2S3GXm+JvNBhVik1UiQ3HxVJbjUHAyj33RaMfQGQNonu4H1YOBWTTtXw
+ FY1hHAERTRfJBDv7LzGoYo1e6gOYyz2QHNJO3hzHWG+MHZfAA1RpIHO6v9Xs67ZG
+ uN9FoeAQMZ89L7Xc8a4b+paS2ShD4BZcw5Htxn8qhdbWfhBfZOUbK+8TQWUO6MNT
+ ri2whivd78cCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+ R+qQ47ntMB0GA1UdDgQWBBR6K1Z+w6BoJOYYHclzDHTOD4QsETAOBgNVHQ8BAf8E
+ BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+ AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+ MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+ cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+ c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQd2lmaS5kaXIuZ2Fyci5pdDAN
+ BgkqhkiG9w0BAQUFAAOCAQEApWK44BT0P8QiG0UbsMl3x8nW93tHdrIeuXd/2ET1
+ 43pIBU6o+cvCZolOzzmU5D3tQuvG3+Uhs5aBKDA3sdklV1wK85Tf/FrVGw5OFlxn
+ UCXWIXAHYqZrUZVSBJiUsGLhyNxtME/wL5vgjBFtnBUagkYZAoSI6HIAPFC4WmAG
+ T7jgUwih9oD9bZqNGy3q8QsJZlAuj65RmLJUTz4XUcS5RJrePlQSMj3WQklkoKkO
+ 3/o35Z0PboOdmDyvBkGP7vdkZ3xuBH9F8C3FZ91t5F0hieeFnFOEXyZcPq14vQ5C
+ Jp4P35Fmyp0bxWiEwrpCwV8TZ5lpllIJvrB1rVPxSYE80w==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">WIFI-GARR</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Wifi access for guests</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+ <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Consortium GARR</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="it">Consortium GARR</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.garr.it</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="it">http://www.garr.it/b/eng</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>system.support@garr.it</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.edugain.org.xml b/swamid-interfederations-2.0/wiki.edugain.org.xml
index 2b63d76a..f1104ea4 100644
--- a/swamid-interfederations-2.0/wiki.edugain.org.xml
+++ b/swamid-interfederations-2.0/wiki.edugain.org.xml
@@ -1,20 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://wiki.edugain.org/shibboleth" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.edugain.org/shibboleth" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.edugain.org/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.edugain.org/Shibboleth.sso/Login" index="1"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:PrivacyStatementURL xml:lang="en">http://wiki.edugain.org/index.php/Privacy_Statement</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://wiki.edugain.org/eduGAIN:Privacy_policy</mdui:PrivacyStatementURL>
<mdui:DisplayName xml:lang="en">eduGAIN Wiki</mdui:DisplayName>
- <mdui:Description xml:lang="en">Provides recommendations instructions on how to eduGAIN-enable a web service.</mdui:Description>
+ <mdui:Description xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</mdui:Description>
<mdui:DisplayName xml:lang="de">eduGAIN Wiki</mdui:DisplayName>
- <mdui:Description xml:lang="de">Dieses Wiki enthält Empfehlungen und Anleitungen um einen Webdienst für eduGAIN anzupassen.</mdui:Description>
+ <mdui:Description xml:lang="de">Dieses Wiki enthält Empfehlungen und Anleitungen um Webdienste für eduGAIN anzupassen.</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">eduGAIN Wiki</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Ce wiki met à disposition des recommandations et instructions expliquant comment intégrer des services web dans eduGAIN.</mdui:Description>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
@@ -51,13 +58,13 @@ nzhoxAesljRTtndfuhYcEnXorpwi2N+4SCaYnF1inyMnJz7xau5lKyxPhA==
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/Artifact" index="5"/>
<AttributeConsumingService index="1">
<ServiceName xml:lang="en">eduGAIN Wiki</ServiceName>
- <ServiceDescription xml:lang="en">Provides recommendations and instructions on how to eduGAIN-enable a web service.</ServiceDescription>
- <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <RequestedAttribute FriendlyName="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="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <ServiceDescription xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</ServiceDescription>
<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="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="email" 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"/>
+ <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
</AttributeConsumingService>
</SPSSODescriptor>
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
@@ -70,4 +77,9 @@ nzhoxAesljRTtndfuhYcEnXorpwi2N+4SCaYnF1inyMnJz7xau5lKyxPhA==
<SurName>Integration</SurName>
<EmailAddress>mailto:edugain-integration@geant.net</EmailAddress>
</ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <GivenName>eduGAIN</GivenName>
+ <SurName>Operation</SurName>
+ <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
+ </ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.shibboleth.net.xml b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
index 017eb51f..f85b8d02 100644
--- a/swamid-interfederations-2.0/wiki.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.shibboleth.net/shibboleth">
- <!--
- This is a Shibboleth.net Wiki Shibboleth SP for JISC Collections and Janet Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -26,7 +23,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
<mdui:Description xml:lang="en"> The wiki hosting the documentation for Shibboleth.
- Unauthenticated user may view the existing documentation. Authenticated users
+ Unauthenticated users may view the existing documentation. Authenticated users
may create new documentation pages and edit existing ones.
</mdui:Description>
<mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com.xml b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
index 912d6501..ef322fcf 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
@@ -1,32 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/entity">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/entity">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" index="1"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" index="2"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" index="3"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/UKFederation"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" index="4"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" index="5"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
+ <ds:X509Certificate>
+ MIIDUTCCAjmgAwIBAgIJANuHp/m5TCXsMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
+ BAMTIWVtLWwxLXJoLXN2cjAxLmVtZXJhbGRpbnNpZ2h0LmNvbTAeFw0xMTA4MTEw
+ ODM1MTJaFw0yMTA4MDgwODM1MTJaMCwxKjAoBgNVBAMTIWVtLWwxLXJoLXN2cjAx
+ LmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ ggEBAL7nJHjWMmZxHtjdwAYdXKCZwObQn8nDKWS71kULyYRgcxkVxULE+Q8sazuA
+ 0bsX3Q4PQUeP6C+xuyBXzHi9XZy6Ef4hoIHo6p9qI7EboB7Qu1MebGROWca0Dtd9
+ zyadDe4y61J8BlE5euVCvbpGkHSSuFVvz0ThhTdC61vAPzvl71R5sqWxUm8xIPDT
+ 0TryzRgOA0LsOH3tXsaxQ5Jb5d6G+X6+6K2flFCY8QKbrnxcMKXvTbPpMprTIa1N
+ bUT+XFONWmplOvyjHQH1GdIDQCPKc4aT3WyIA3MxnWfzpPsP8Sdi7Z+QyhXGEgOP
+ obM+cagbqe/E/Om1gUgI3a6F/z0CAwEAAaN2MHQwUwYDVR0RBEwwSoIhZW0tbDEt
+ cmgtc3ZyMDEuZW1lcmFsZGluc2lnaHQuY29thiVodHRwczovL3d3dy5lbWVyYWxk
+ aW5zaWdodC5jb20vZW50aXR5MB0GA1UdDgQWBBT8iPZbLVpj12PDMabI7c5IEAQ0
+ +zANBgkqhkiG9w0BAQUFAAOCAQEAVMg4wyJ1FHeFYIuJ/zBzqPgZRD/dRQ/P64Bg
+ lkM/XKtTEkDL5nizTdMcm5qUB8sSLUpZIyuPUSy8AmYZ+FgvU6SqjW1WIhRzlnYG
+ yl3bKyl0Ji8r7We5lAhLgLnr1FTo3r9ROVd+S/BC3J7CZVE8Jcqo6AS66gTtGBja
+ xwoQYnowMJKcoCFqPkRlPL25ystxifcSpgaaRnVJMik/JHO2IwLLti+WAUj6kwCM
+ uCbrLPgzpR6W8YOkDzUH3rvANVZ5GKgqWNA/u8NfC6WRcA1Sktx2nLnK8Mw3d14g
+ MvgwMr/rwl/SPLLZ0KDGqJ8iSYjIZQKsJ/JXP9xmaeEQW6v35w==
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">EmeraldInsight</md:ServiceName>
- <md:ServiceName xml:lang="da">EmeraldInsight</md:ServiceName>
- <md:ServiceDescription xml:lang="en">provide personalized access to journals and papers on social sciences</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">give adgang til EmeraldInsights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Emerald Live Site</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.emeraldinsight.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Rob</GivenName>
+ <SurName>Wood</SurName>
+ <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Laurence</GivenName>
+ <SurName>Parkin</SurName>
+ <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es.xml b/swamid-interfederations-2.0/www.rediris.es.xml
index 38c31e6f..eac93c8d 100644
--- a/swamid-interfederations-2.0/www.rediris.es.xml
+++ b/swamid-interfederations-2.0/www.rediris.es.xml
@@ -18,7 +18,30 @@
<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:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
+c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
+DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
diff --git a/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml b/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml
index 2f1ad4e2..6b1694cc 100644
--- a/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml
+++ b/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml
@@ -1,87 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/metadata.php">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-11T14:59:01Z">
+ <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">uni-erlangen.de</saml1md:Scope>
+ <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.de</saml1md:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Universität Erlangen-Nürnberg</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Universität Erlangen-Nürnberg</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
+ <mdui:InformationURL xml:lang="de">https://www.sso.uni-erlangen.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.sso.uni-erlangen.de</mdui:InformationURL>
+ </mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>www.sso.uni-erlangen.de</ds:KeyName>
+ <ds:KeyName>www.sso.fau.de</ds:KeyName>
<ds:X509Data>
- <ds:X509SubjectName>CN=www.sso.uni-erlangen.de,OU=Regionales Rechenzentrum Erlangen (RRZE),O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIEDNx+ZTANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNVBAoT
-H1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJSWkUx
-DzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmktZXJs
-YW5nZW4uZGUwHhcNMDgwOTAyMDkwMTEwWhcNMTMwOTAxMDkwMTEwWjCBsDELMAkG
-A1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAm
-BgNVBAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxMTAvBgNVBAsT
-KFJlZ2lvbmFsZXMgUmVjaGVuemVudHJ1bSBFcmxhbmdlbiAoUlJaRSkxIDAeBgNV
-BAMTF3d3dy5zc28udW5pLWVybGFuZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA7ZK6l0S0z5W/y6WmBnaeCPwqtCv98rcGwpMSqcOFXZq2jf3Z
-vk3GjT+wC6UAnNXFYE1A4LMeg8bKwe03WfYEgC4Lms7HKAnq51q83Fxa1cOvxHsc
-FyXciv7ohOhOMLaINF5CHfysg9pC1G18gqrihwsMDTPx6E6nM6p5egg8rt2iI3Bz
-H3exTb0ot9acXLkWnrhr1cdSSlLzXO40l7irUmVz4c3/1KZxBtXyTdqCI0VIawC8
-77OXpIbYXZmFD7v7b4YsWguhcy2iKeEMrDkebqinv+L8l5UOmJLHkbmsCeMUOMZI
-6FjstpBZ25a15+wgFz57qAVCj6C+cK2XYuwaaQIDAQABo4ICADCCAfwwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBSU/R53bBkEXqYy1dlF5FN/Ci2NfjAfBgNVHSMEGDAWgBT0c/P6
-xkKzxlxpwFi+dDj5YSuOYjAmBgNVHREEHzAdgRtpZG1vbmVAcnJ6ZS51bmktZXJs
-YW5nZW4uZGUwgZ8GA1UdHwSBlzCBlDBIoEagRIZCaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS91bmktZXJsYW5nZW4tbnVlcm5iZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MEigRqBEhkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVy
-bmJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwgbgGCCsGAQUFBwEBBIGrMIGoMFIG
-CCsGAQUFBzAChkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1u
-dWVybmJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MFIGCCsGAQUFBzAChkZo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVybmJlcmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAR6jF33PmW
-3vFZCK7WwdERUVTPfxQMrdTWR5CaSfz1s4733V1e/zZdZrkgZVfbqW13jPiTXuTK
-MWJBMZluOr3Mipa+toGWV7Nng/JzyfHh3r1ymCeYKOtfiLV0JMm66BQ2678n+MHC
-vFwHs3l6nLx8K1rt6UdQXhsNtjKVS4Zn4sgnbWglA1yYxudGXvoDD62X1igubs0c
-S+V7E+DocEr+wK+V6TTIcUc5PJ+d85yGBjGxaAagw7WFSB/1kqk8e8Hm6UKDTlOj
-BdbyQDI4AYCeewd/9CT6UTcWzYTMgaAZajq6xUdtdsUj9phyrVtTt3LCrDpwKsVU
-2aijG0o5Oc1U
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>www.sso.uni-erlangen.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.sso.uni-erlangen.de,OU=Regionales Rechenzentrum Erlangen (RRZE),O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIEDNx+ZTANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNVBAoT
-H1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJSWkUx
-DzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmktZXJs
-YW5nZW4uZGUwHhcNMDgwOTAyMDkwMTEwWhcNMTMwOTAxMDkwMTEwWjCBsDELMAkG
-A1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAm
-BgNVBAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxMTAvBgNVBAsT
-KFJlZ2lvbmFsZXMgUmVjaGVuemVudHJ1bSBFcmxhbmdlbiAoUlJaRSkxIDAeBgNV
-BAMTF3d3dy5zc28udW5pLWVybGFuZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA7ZK6l0S0z5W/y6WmBnaeCPwqtCv98rcGwpMSqcOFXZq2jf3Z
-vk3GjT+wC6UAnNXFYE1A4LMeg8bKwe03WfYEgC4Lms7HKAnq51q83Fxa1cOvxHsc
-FyXciv7ohOhOMLaINF5CHfysg9pC1G18gqrihwsMDTPx6E6nM6p5egg8rt2iI3Bz
-H3exTb0ot9acXLkWnrhr1cdSSlLzXO40l7irUmVz4c3/1KZxBtXyTdqCI0VIawC8
-77OXpIbYXZmFD7v7b4YsWguhcy2iKeEMrDkebqinv+L8l5UOmJLHkbmsCeMUOMZI
-6FjstpBZ25a15+wgFz57qAVCj6C+cK2XYuwaaQIDAQABo4ICADCCAfwwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBSU/R53bBkEXqYy1dlF5FN/Ci2NfjAfBgNVHSMEGDAWgBT0c/P6
-xkKzxlxpwFi+dDj5YSuOYjAmBgNVHREEHzAdgRtpZG1vbmVAcnJ6ZS51bmktZXJs
-YW5nZW4uZGUwgZ8GA1UdHwSBlzCBlDBIoEagRIZCaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS91bmktZXJsYW5nZW4tbnVlcm5iZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MEigRqBEhkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVy
-bmJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwgbgGCCsGAQUFBwEBBIGrMIGoMFIG
-CCsGAQUFBzAChkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1u
-dWVybmJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MFIGCCsGAQUFBzAChkZo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVybmJlcmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAR6jF33PmW
-3vFZCK7WwdERUVTPfxQMrdTWR5CaSfz1s4733V1e/zZdZrkgZVfbqW13jPiTXuTK
-MWJBMZluOr3Mipa+toGWV7Nng/JzyfHh3r1ymCeYKOtfiLV0JMm66BQ2678n+MHC
-vFwHs3l6nLx8K1rt6UdQXhsNtjKVS4Zn4sgnbWglA1yYxudGXvoDD62X1igubs0c
-S+V7E+DocEr+wK+V6TTIcUc5PJ+d85yGBjGxaAagw7WFSB/1kqk8e8Hm6UKDTlOj
-BdbyQDI4AYCeewd/9CT6UTcWzYTMgaAZajq6xUdtdsUj9phyrVtTt3LCrDpwKsVU
-2aijG0o5Oc1U
+ <ds:X509SubjectName>CN=www.sso.fau.de,OU=Regionales Rechenzentrum Erlangen (RRZE),O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIHCTCCBfGgAwIBAgIHFVh6d4xjCjANBgkqhkiG9w0BAQUFADCBozELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNV
+BAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJS
+WkUxDzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmkt
+ZXJsYW5nZW4uZGUwHhcNMTMwMzA3MjA0NzM2WhcNMTgwMzA2MjA0NzM2WjCBpzEL
+MAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4x
+KDAmBgNVBAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxMTAvBgNV
+BAsTKFJlZ2lvbmFsZXMgUmVjaGVuemVudHJ1bSBFcmxhbmdlbiAoUlJaRSkxFzAV
+BgNVBAMTDnd3dy5zc28uZmF1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAs/qsX/p+z8uxh3feD2sZWdb/NpOI5/YkPeXYQPQAdlRKBijHLohlLRAz
+CNFU7YWhy/FxY4uLE97h0hPVpoxCPlOW5qh56C1ZEWGBdhJImfYpzJbB2UIIUUR2
+WXLjZPyQObzxocui2M3XWa/uhpc3nPvBC/HLzr4fbU0f20D9hr0MXFurfuhGID+j
+t1jRsVWTjMWEVDAXDduKYUCAqrp1RlSc/H6z4WFeiQ92+4Q/+axig6KRkg0e0LBh
+MDA3ozIODmfFDIuo++rGvHWG47GLbLQyJLLeGkPlxxqo8uvVhtENxd5jrIkZrRd8
+y+dFr+jRh36DMmJGTzVkeweZPT2ZpQIDAQABo4IDOjCCAzYwOQYDVR0gBDIwMDAR
+Bg8rBgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFGL4MCMuRKr8cD0oslgL7QGRYj+uMB8GA1UdIwQYMBaA
+FPRz8/rGQrPGXGnAWL50OPlhK45iMIHvBgNVHREEgecwgeSCDW9wZW5pZC5mYXUu
+ZGWCD29wZW5pZC5ycnplLm5ldIIec3NvLXByb3h5LnJyemUudW5pLWVybGFuZ2Vu
+LmRlggpzc28uZmF1LmRlghhzc28ucnJ6ZS51bmktZXJsYW5nZW4uZGWCE3Nzby51
+bmktZXJsYW5nZW4uZGWCEXd3dy5vcGVuaWQuZmF1LmRlghN3d3cub3BlbmlkLnJy
+emUubmV0gg53d3cuc3NvLmZhdS5kZYIXd3d3LnNzby51bmktZXJsYW5nZW4uZGWB
+FnNzby1hZG1pbnNAcnJ6ZS5mYXUuZGUwgZ8GA1UdHwSBlzCBlDBIoEagRIZCaHR0
+cDovL2NkcDEucGNhLmRmbi5kZS91bmktZXJsYW5nZW4tbnVlcm5iZXJnLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMEigRqBEhkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
+aS1lcmxhbmdlbi1udWVybmJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwge0GCCsG
+AQUFBwEBBIHgMIHdMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
+L09DU1AtU2VydmVyL09DU1AwUgYIKwYBBQUHMAKGRmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdW5pLWVybGFuZ2VuLW51ZXJuYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwUgYIKwYBBQUHMAKGRmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWVy
+bGFuZ2VuLW51ZXJuYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
+hvcNAQEFBQADggEBALIsNWnuaDrQA7Tu1ReusFhrkdOKpIH90mMWOBXZoUTPxEaK
+n86rjUAoFj1u1NlWyUrMYRWneXlvy3jQ3KEo7H6nJiEoa7LH1siTNcmOjDiN1dqA
+PO6+zAiESP5Xwsr2D1msyPXade0ra2PFSeG4XZ6hF/KEEYN0xxFpPbrvBD/fa+MU
+fp8NqxF7uANosdABgJs9RFmEmGuWd/Rc3aGzd3+dGwh9nFnKxON9fTrOlXNxa9Og
+jO0N75bg2RQTXLaMZLlUoVGE7n6FljoKjyiXlvUBSSeErakYPLpvgolN6QwAkM2j
+c/GLdms9imUWk7YQ8hzH7aUxdRWOmXLmc+2n/lY=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -93,13 +73,16 @@ BdbyQDI4AYCeewd/9CT6UTcWzYTMgaAZajq6xUdtdsUj9phyrVtTt3LCrDpwKsVU
<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.sso.uni-erlangen.de/simplesaml/shib13/idp/SSOService.php"/>
</IDPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="de">Universität Erlangen-Nürnberg</OrganizationName>
- <OrganizationDisplayName xml:lang="de">Universität Erlangen-Nürnberg</OrganizationDisplayName>
+ <OrganizationName xml:lang="de">e131</OrganizationName>
+ <OrganizationName xml:lang="en">e131</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Friedrich-Alexander-Universität Erlangen-Nürnberg</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Friedrich-Alexander-Universität Erlangen-Nürnberg</OrganizationDisplayName>
<OrganizationURL xml:lang="de">https://www.sso.uni-erlangen.de</OrganizationURL>
+ <OrganizationURL xml:lang="en">https://www.sso.uni-erlangen.de</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
<GivenName>Frank</GivenName>
<SurName>Tröger</SurName>
- <EmailAddress>sso-admins@rrze.uni-erlangen.de</EmailAddress>
+ <EmailAddress>mailto:sso-admins@rrze.fau.de</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.videotorium.hu.xml b/swamid-interfederations-2.0/www.videotorium.hu.xml
index 595e84be..fc5fb219 100644
--- a/swamid-interfederations-2.0/www.videotorium.hu.xml
+++ b/swamid-interfederations-2.0/www.videotorium.hu.xml
@@ -8,7 +8,6 @@
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <mdui:Logo height="86" width="100">https://metadata.eduid.hu/logos/videotorium.png</mdui:Logo>
<mdui:InformationURL xml:lang="hu">http://www.videotorium.hu</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="hu">http://www.niif.hu/</mdui:PrivacyStatementURL>
</mdui:UIInfo>
@@ -23,16 +22,16 @@
</KeyDescriptor>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST" index="7"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST" index="6"/>
<AttributeConsumingService index="1" isDefault="true">
<ServiceName xml:lang="hu">Videotorium</ServiceName>
<ServiceName xml:lang="en">VideoPortal</ServiceName>
@@ -56,15 +55,15 @@
<OrganizationURL xml:lang="en">http://www.niif.hu</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
- <SurName>Kovács András</SurName>
- <EmailAddress>mailto:akov@niif.hu</EmailAddress>
+ <SurName>Videotorium Admin</SurName>
+ <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
- <SurName>Kovács András</SurName>
- <EmailAddress>mailto:akov@niif.hu</EmailAddress>
+ <SurName>Videotorium Admin</SurName>
+ <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="administrative">
- <SurName>Kovács András</SurName>
- <EmailAddress>mailto:akov@niif.hu</EmailAddress>
+ <SurName>Videtorium Admin</SurName>
+ <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
</ContactPerson>
</EntityDescriptor>