summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0
diff options
context:
space:
mode:
Diffstat (limited to 'swamid-interfederations-2.0')
-rw-r--r--swamid-interfederations-2.0/.xml214
-rw-r--r--swamid-interfederations-2.0/aai-logon.fhsg.ch.xml124
-rw-r--r--swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml78
-rw-r--r--swamid-interfederations-2.0/appdb.egi.eu.xml78
-rw-r--r--swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/cafe.uesc.br.xml54
-rw-r--r--swamid-interfederations-2.0/community.ja.net.xml3
-rw-r--r--swamid-interfederations-2.0/core.uwap.org.xml22
-rw-r--r--swamid-interfederations-2.0/dev.emeraldinsight.com.xml3
-rw-r--r--swamid-interfederations-2.0/doit.swisdom.org.xml4
-rw-r--r--swamid-interfederations-2.0/educonf-directory.geant.net.xml3
-rw-r--r--swamid-interfederations-2.0/edugate.itb.ie.xml62
-rw-r--r--swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml3
-rw-r--r--swamid-interfederations-2.0/filesender.funet.fi.xml116
-rw-r--r--swamid-interfederations-2.0/fod.geant.net.xml114
-rw-r--r--swamid-interfederations-2.0/foodl.org.xml57
-rw-r--r--swamid-interfederations-2.0/gidp.geant.net.xml130
-rw-r--r--swamid-interfederations-2.0/iam.cf.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp.cardiff.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp.company.ja.net.xml3
-rw-r--r--swamid-interfederations-2.0/idp.cs.cas.cz.xml113
-rw-r--r--swamid-interfederations-2.0/idp.csc.fi.xml75
-rw-r--r--swamid-interfederations-2.0/idp.dante.net.xml3
-rw-r--r--swamid-interfederations-2.0/idp.ebi.ac.uk.xml100
-rw-r--r--swamid-interfederations-2.0/idp.ed.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp.elte.hu.xml50
-rw-r--r--swamid-interfederations-2.0/idp.epfl.ch.xml142
-rw-r--r--swamid-interfederations-2.0/idp.feide.no.xml705
-rw-r--r--swamid-interfederations-2.0/idp.hslu.ch.xml124
-rw-r--r--swamid-interfederations-2.0/idp.ids-mannheim.de.xml149
-rw-r--r--swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/idp.shibboleth.net.xml3
-rw-r--r--swamid-interfederations-2.0/idp.ufe.cas.cz.xml113
-rw-r--r--swamid-interfederations-2.0/idp.uoa.gr.xml4
-rw-r--r--swamid-interfederations-2.0/idp1.uwaterloo.ca.xml102
-rw-r--r--swamid-interfederations-2.0/idp2.iay.org.uk.xml3
-rw-r--r--swamid-interfederations-2.0/issues.shibboleth.net.xml3
-rw-r--r--swamid-interfederations-2.0/login.helsinki.fi.xml73
-rw-r--r--swamid-interfederations-2.0/meta.cesnet.cz.xml88
-rw-r--r--swamid-interfederations-2.0/openwiki.uninett.no.xml61
-rw-r--r--swamid-interfederations-2.0/portal.clarin.inl.nl.xml110
-rw-r--r--swamid-interfederations-2.0/qub.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/quod.lib.umich.edu.xml3
-rw-r--r--swamid-interfederations-2.0/rems.elixir-finland.org.xml99
-rw-r--r--swamid-interfederations-2.0/rr.funet.fi.xml230
-rw-r--r--swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/shib.manchester.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/shibbo.ltu.se.xml118
-rw-r--r--swamid-interfederations-2.0/shibboleth.ad.cybera.ca.xml108
-rw-r--r--swamid-interfederations-2.0/sp.catalog.clarin.eu.xml156
-rw-r--r--swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml198
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/sp.korp.csc.fi.xml106
-rw-r--r--swamid-interfederations-2.0/sp.lat.csc.fi.xml106
-rw-r--r--swamid-interfederations-2.0/sp.lux17.mpi.nl.xml219
-rw-r--r--swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml46
-rw-r--r--swamid-interfederations-2.0/sp24-test.garr.it.xml21
-rw-r--r--swamid-interfederations-2.0/sso.utu.fi.xml85
-rw-r--r--swamid-interfederations-2.0/terena.org.xml51
-rw-r--r--swamid-interfederations-2.0/test-bod-gui.geant.net.xml3
-rw-r--r--swamid-interfederations-2.0/test.ukfederation.org.uk.xml3
-rw-r--r--swamid-interfederations-2.0/uat-adfs.geant.net.xml3
-rw-r--r--swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml3
-rw-r--r--swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml142
-rw-r--r--swamid-interfederations-2.0/wayf.wayf.dk.xml17
-rw-r--r--swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml171
-rw-r--r--swamid-interfederations-2.0/weblogin.uu.se.xml6
-rw-r--r--swamid-interfederations-2.0/weblogin2.geant.net.xml3
-rw-r--r--swamid-interfederations-2.0/wiki.moonshot.ja.net.xml3
-rw-r--r--swamid-interfederations-2.0/wiki.shibboleth.net.xml3
-rw-r--r--swamid-interfederations-2.0/www.emeraldinsight.com.xml176
-rw-r--r--swamid-interfederations-2.0/www.knodium.com.xml3
-rw-r--r--swamid-interfederations-2.0/www.portal.euromonitor.com.xml3
-rw-r--r--swamid-interfederations-2.0/www.qoam.eu.xml10
-rw-r--r--swamid-interfederations-2.0/www.rediris.es.xml24
-rw-r--r--swamid-interfederations-2.0/www.scran.ac.uk.xml3
-rw-r--r--swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml4
80 files changed, 3496 insertions, 1755 deletions
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index 094f0d01..870700aa 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,33 +1,183 @@
<?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="2014-07-04T11: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/sso/wayf/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" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="urn:mace:kuleuven.be:kulassoc:kuleuven.be">
+ <Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">kuleuven.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">groept.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">vives.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">KU Leuven Association</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="nl">Associatie KU Leuven</mdui:DisplayName>
+ <mdui:Description xml:lang="en">KU Leuven and the associated university colleges</mdui:Description>
+ <mdui:Description xml:lang="en">KU Leuven en de geassocieerde hogescholen</mdui:Description>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcFJpZ2h0czpNYXJrZWQ9IlRydWUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RDUwMUMyNENENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RDUwMUMyNERENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENTAxQzI0QUQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpENTAxQzI0QkQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnDgVQAAAAIVSURBVHjadFLNaxNBFJ+dnd3ZbDeaRJuvGhoPGqGt0iqpgpJ68NRj8aIInsSLqFSPFf8CPXrwIB6KYCXSqwcVpILUQz0EvJaINYY0CU33a3ZmfJtE3UL7Y5mdeR/zfu/9Rrn9vokiUBBiQoq/ew0raC9I9ABen0s3kKQfx6WElaqKkAck+Bx5HN2bPpyOqXB0Avl0o7vLZIz8r4OjZFouLyW1s2laiBP4Tia1mTRtOjxKC0fp24EsZ2i05vksJRjJfRNsJgsWuZDbkzCR0k8k9K4nIn32gbHScsX0qG5p4RW/bFHv8cEYZjO040uMh5HETCVDOio20G45O5zBVxu3fXTDCvflLF3dkjRlYRHWIZ9fLMOv1bWL+eTMpauDhMdLz+vNnesr9+Ha8TgRXz6uftvMpA9BN6T27gNU69Q25xYXcH/8LOCTJiseQa7HTEMHy5TuvFqutiaLUkhlbO4h4+J3o71efXRuYhzth/rWdml+iRr6CO1L32x0Ls6eOigaUMil5iunOz+3w6ZBdtmz71y7/M+9cPfZj0YbnkVx7OjrJ7cGxsWbV968XQsCQXwWJAqjwHXjex0csFZXPqFYSH19rfayMnWmdCx8NSzIH885jqfkKw90XXNcv2d74BBCJOImUTEID913dxxQAOwxqlkmhTQCtBh4uDBoKIKKsapiAYRggqoaHzG4GMrsBxzG+EeAAQCt0M7G/zjX3wAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABLCAYAAAA1fMjoAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDozMkNEMEY5MDg3OUQxMURDOTFDN0UzMEIyRjdCQjM1QyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5QzUzODlCMkQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5QzUzODlCMUQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBJbGx1c3RyYXRvciBDUzUuMSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+R5rIdQAADfdJREFUeNrsXV1oHNcVHtlSYtlyIrW1caChu41bSJw2kh/8EEorOQ8tdaBKUxIKBdslfSgJxKIBQ0tjy6UPhhS54LyVWC70IaHBNsQlfXBXgSYQPdhKK8tQN5WKCzF2QJv4R2tLtnq/2XvXV3fPnbnzu6vd88Gw2tHMmftz/s+dux3Ly8sesLVQnBcfIx//d27cS4gfnvl02WMwWgBrtL+nxHHska8USuIo8NAwGJqACMsxJD6eEUe/OM4JIdnHw8Nod3QoF6ujo8P/FILRKz4OiGOftCpl7Xq4YFPsYjHa0cWi0MtDxGhndOpfhPUYFh9j4kAMMiqsxUEeIgYLSFU4ToiPYelWDbi4UgxGO1mQYbYaDIZdQIpCOOaaoVGFnk5vQ1dH3fnz84vONHZsus/b1tvlFTeuNWgseR9eve3NXV/KhQawobOjRmtz972w78rCXe98edGbFLRuLEXLa1Btu7G4LNp0xyt9UvGuVO5GGtu5a0vWNqD9hY2ddeevLtype87mdWu8Td1rY899tQ9LVjp6O7f1dcV+TlB/dazIYgk3q19akpOg4VWzWThXltbFye1KmsX647e/4E+KiaMXrovJvxXKOHu/tsEf4CCAMY/OXCcZKQ0aCs8X13u7Hl5H9qfGFGKiTl+qeG/O3nQSDJe2QegwXiYTHNr+gC9YJl4997lVAT0t2o9nmkC/f/7BfF1/nyt2x557jOmrZz+30tHb+fbOL8Z+TlB/dazRYhC4VuekUOATMYmqhQyKoyRTwJkCDGBjph1fui/w3qGH7vf2f2NjKPP42kcwyWs7euuuTYOG0rq/2/GgP8lBwqGuxXVg3qBrX3q0x7ltGMcweq7AmFBAO2CRWhn6SP9AWo4+WAspFCOygDjgVVO+/Vk3aGjL/bGEB+cpLRfGmC891pMqDYX939wYmXkgcBACCmiXjVGDXFW0I6m7G9SPqG1azQIC5j8lBALu1BF5znep8opNlK8ephltE0UJD1wMmG1bvODHBVIjp0FDuSSUG+NqQU2mg68NmnGAdiTx1cMEIGy+WilI92TcAYEoC3cq98a4DDbcLCoOoe6Fj/zKZLnmh9t8aQSgVyq3U6EB7Hq42xprvCXijFkRSBd71gq3aj0pkDiv9/HpL68LjF2mhfBCQNEuih7uj5LgiDInys1SyuNK5Y6vTOqCfMIKYWyviut1zF67k4iHMCYuyRMkA+IISEMRFmPobpZLBsKfPMG4ijmm55fqJk9NYFo00D4qRkB7EXyqyQM90KLiBNwPOgi0g6zq4X9eq7XrvGQuxD11ViSmBQFTu8Q7sDLHLlb7BcE2FRief2jggbr7JsR1LomJSNkpMb4Y56wsSMmwHKW8LImLe6ULSVg2q5a1ERMDTQVmUxmSqIhCw+ZaQdObmg3f0Q/KfSoK5sTzbMyNdphWAfRwjzmOcQN11/iiKiA3Wt7FGnUR0MyCc2IyoHUpBsJ3U0B8ZrIwJ7Qg7lF0cO3kp7czoWHWTBRQN6EAGpSAbOsTUzNbFRRSQOaXrFYlyzl5a3ahLv2qlNukpY95AvMXlv5FH1wtV230G11BpyZDaWyTgZTp1+sPYFSbT09ZIBy4/vA/rtU0exo0gkw/zejxYoPp8mKm82HLGKIIuWNTV11MAfe4GQQkyyxWw2DLp1NuhC14NH181+ciBlDPToNGq4CKB6GQqq7mYttks5pCQGyDq5ZgUEExZXHA2L+Y/MyvILtqM2jJn359fao0osZeed6XZE7UeExbkhStKCRNofYoZodQqEwVFRtQbpbubuHQ10AFFRnxfzMzFpeG1TcWwTZlDW1BuEpD3li6a30eJcBwRylGfeNfN50to62fiJeUW4ixMq9pBjfLJc17pXJn9QiIrVLrEmxhIt+5VPEFjBIyxeR+IH2hKoi2WoG/vql7TSIa1XTwEhnoY4UAJSC21LaymqiZ2PpOZY5Qg6FSszeX7rorLMtqBipVWydYFzsiL7xME1mnedWCxUHv3tuEEyKAn8jTergCzAAB2bxuLcmU1aLTrRXMjudR14Lhk9KA1ke2ilpkh3vA9HrWyybYujtj09aqMKgLCayHrQYTtKAyLVdJ3euagl91LpYQjmPiY49xzQFxHktO9mbxElUSv1UF9/CJn/NoplS1BvXdlsZ9538Vsi1RaNSKgKI91DVYZ+ULCqxMX6eVDu7XGRo1FEroIBCP93X6QXOhZ21gLJfHfCiL2EgBcfE8ANdUr/5G4T4pHKiHHJFrsnAe5/AaLoRnIG33yqVSG2aBoEXBUCYtfyGhYErbAkCdgaCpk9JQeFMM/qGBLusEhq3TQrywQngvLViXzIctJqwyw81IDJ5U4bmudFhtFgSrecfNegg2khNCMudVq+r9aVoRm3sBhjd9bww6lnrbfHEc1P9dgjowtHpuUhrKLaIKai5A9swMMkEf5+O0Dfclda/Qnjcu1gsZ1nhR17eSm6WrS8Qd71EXaTFIqu+D2KrniCvAZPoxaXmDT7lZ6gWhqIytM2QaNO5ZkZuRl18EvRCGtqFKHkUzQ0ijMKpNYYGGOR84SpdvZWKFmjYG8TJcSuKcSgzwl7G4j3In1GI5TCSC6ueF5g7ypcFkeA5cD1O7pkHjnmtU8dscRgt0YIHC0pO47pVrZb96H5TcQAwDelGr9Daa0/PRVgG0kpvVoe3Niz9GPPkOCKVIMIYuGa1m2DhOvUf9uObvo6YA182VcdKgsSJL1te1Ym3VrBAIlaVKo3/+UvP5RWeXihFdQEKVzGoREAYjbRdryOF63iuL0Z4WRO3NmwbYgjBaBfquJsviGNS+H9R/BsH8P4PRVgJCANv/FHiIGCwgDAaDBYTBiIpMlrtj20gGoxWQSR1kWRFlMFrIgqS2q8no8b/xyDJay4KkWQfxBn/JFoTRWkE61zkYjAABYTAYLCAMRuwgHQjbi3coyw0cGIxmF5Cg90E8j1fzMtpcQKbYQjAYHIMwGJEtyFCeLtTBPU95B3bvrDuPIuPB8TO17/1bH/JKYy94vT30rywNjfzBm5iarQZQ4rrB/mLdNR1Dv6o7Z7tWp+eK5dJvyfPUc6PScIE5ZhQt9Al9i9L2fT960ht7cVfd/478+QNv5PXTzrSKP37NK2zp9cc8LvR5wbzZaOFZc5fnQ9tljlmoBZGuVa/cH8uHfCcEgfsJueNiroBQHNv/rFU49h5+OzIzM9xx8u8XyPOUYqHO+T77vz+pY9gsQSndVFwsuUEcuG1MCYdXfSdE/bptLj8DrQPaCxaEAjTY+LtnmYszBBibYm7Miam0Bvu/StI49f6FXNu853vbhbXqyyQGgWDAiijq2EgO+/JiN0W1o+Jwnh3FQQGCATPPaKQVWSkQ33miaLl/Jvc2j734/UwEBNZhVP7CrbIax6X7VZbxSSGPDkJDUb6vEg64Vox88N5HtAtrCgTlYpWvV3wXK28Mf+sxq8uXJEhf0V8V2xkClDke3GCPOzDYVHDYyogS6GdjQWYsTPhobS5szOhiPWzJg+SxyFOCdnK6ugWBldgtrcfLcEGF5ZiT8cigtCiZZ7mQOaHiDggHBhJaidF4IYGfr3z9Zok/TIuWhhXRLQiq6PrPH4xK4ShJi4Ii4slGdRhuVTsKR1hqNA+rCjcLbgvFhOPvzlvjj4mp/zi502F9PP7Xs7ESMmlYEf1Xbsfl74AME8Lg/yRCIxll93e3C2Y43XYCkpYvnTRQp2JCCAYYl2ojrI6LQoMrHdZHWxyUhxVZEYPInzaYMs4NNQOjwPU69f4M1z0aAJXuNdOnQQwYl6mTAAJpxq6wImnFIHCnUCg8Jo5Z+QLVsiwSDjfDRAUVDRnZWxEqDoFld70+a8CamXWbpBZELxQiCJ+VMciE5lbhPIRkrNGThAmJoxFYqJKPgc0iULWqvKvnCp/dqKS+H4LuYkEAkMkaUNkrFbzL3y7cJz5/b/wvE6AICMmnsllxXC3QMa/H2iDanSg3FWOnlealxtJWcaaYO0rBL8rcpJ3mhRXBcpO0qunmL0yNUAIgzu31qjua7MnelM/4WZmgzExUV8tMQ4JZojBHqwb8qGVEURKuQoKsUyMx8vpfMrEgnrQg1lgtj8599PHlmmaBNqBMuHK1TCGCG0D5nGoBG9KO1Xt35iIcYelLF83psgLWTPVi7KhxOPGbn/jXoZ9QGi8/+2SkcbCle81AOUr13CXNq4TONdULQbaNQVIBKQT1RRyn8tUEp/0JoawF5WphYGzMj/NhKz3TzpClMUFxaGBcqPvU6ui48YbL+ERde+WS5g1qkw2jx88Iui8kHn/dxULdY4xa1i5jkF55TW6ANoriakFzJWHyVtnwDpo2blEV1sOmqV2C70ZWz01hTkPh6QIyIl2sc/IdkIMy5TsvY4+9eQTo1GTbOkplteJW3HFfq8Qf6H+cBZ2475lf/ymRlXWpnufpgaQmIJL5saxdbUF6QLpVsBrYzWS8GTtqrt0Ckw/87Kiz9sD1YIpWe7cErg5iHFehV9mksPghyEK4Vs/zAvqSdF4btvVodbFbL5lBcX1Jx+UexDBPPLJF3Ntd59NiANN4XyFurKELcZJ4JSwwxhhgLMw1U+XrC35SBGPgGlhjDmwvsdnmIew+N0V2j7aNFvX8KNcGCsjWQnHQRSjluyGJBYTBWA3Qs1glh+uxLmuCh43RjgJiLkosefUbyfHGcYz2FBBzwzi5BSlvJMdoa/DGcQwGCwiDkdDFsvx4Tr+x27tbFovBaMEgncpime+AcBaL0Vb4vwADAI6r9hTmuAw9AAAAAElFTkSuQmCC</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://associatie.kuleuven.be/eng</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="nl">http://associatie.kuleuven.be/over</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:IPHint>134.58.0.0/16</mdui:IPHint>
+ <mdui:IPHint>193.190.168.0/23</mdui:IPHint>
+ <mdui:IPHint>193.190.176.0/22</mdui:IPHint>
+ <mdui:IPHint>193.190.180.0/23</mdui:IPHint>
+ <mdui:IPHint>193.190.253.0/24</mdui:IPHint>
+ <mdui:IPHint>193.190.146.160/27</mdui:IPHint>
+ <mdui:IPHint>193.190.57.0/26</mdui:IPHint>
+ <mdui:IPHint>193.190.57.192/27</mdui:IPHint>
+ <mdui:IPHint>193.190.57.224/27</mdui:IPHint>
+ <mdui:IPHint>193.190.58.0/26</mdui:IPHint>
+ <mdui:IPHint>193.190.59.0/24</mdui:IPHint>
+ <mdui:IPHint>193.190.255.0/25</mdui:IPHint>
+ <mdui:IPHint>193.190.138.0/24</mdui:IPHint>
+ <mdui:IPHint>193.191.187.0/25</mdui:IPHint>
+ <mdui:IPHint>193.190.77.0/26</mdui:IPHint>
+ <mdui:IPHint>193.190.224.0/24</mdui:IPHint>
+ <mdui:IPHint>193.190.225.0/24</mdui:IPHint>
+ <mdui:IPHint>193.190.130.128/26</mdui:IPHint>
+ <mdui:IPHint>2a02:2c40::/32</mdui:IPHint>
+ <mdui:DomainHint>kuleuven.be</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:50.9378101,4.0409517000000505</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.2194475,4.40246430000002</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.209348,3.2246995000000424</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:50.84999999999999,4.350000000000023</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:50.91083,5.4133600000000115</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:50.98965,5.050160000000005</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:50.8464506,4.262063000000012</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.16257,4.990839999999935</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.0543422,3.717424299999948</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:50.93069,5.332480000000032</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:50.8194776,3.2577263000000584</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:50.87822088437878,4.702697216918987</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.1302138,4.571509200000037</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.0258761,4.477536200000031</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.2166667,2.8999999999999772</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:50.94990869999999,3.129447099999993</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:50.8674164,4.377298099999962</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.07045,4.53135999999995</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.1558839,4.15444100000002</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:50.940892,4.904695599999968</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.06498,3.101570000000038</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.3216509,4.93755770000007</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:51.2025247,4.770882700000016</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:50.8134333,4.324834399999986</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
+DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
+WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
+CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
+KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
+GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
+d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
+bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
+llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
+AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
+vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
++yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
+yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
+5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be: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.kuleuven.be/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kuleuven.be/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">kuleuven.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">groept.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">vives.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
+ <shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
+DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
+WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
+CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
+KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
+GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
+d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
+bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
+llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
+AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
+vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
++yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
+yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
+5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be: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="nl">KU Leuven / Associatie KU Leuven</OrganizationName>
+ <OrganizationDisplayName xml:lang="nl">KU Leuven / Associatie KU Leuven</OrganizationDisplayName>
+ <OrganizationURL xml:lang="nl">https://admin.kuleuven.be/icts/servicepunt</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>AAI team</GivenName>
+ <EmailAddress>shib@kuleuven.be</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>ICTS Servicepunt</GivenName>
+ <EmailAddress>servicepunt@icts.kuleuven.be</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.fhsg.ch.xml b/swamid-interfederations-2.0/aai-logon.fhsg.ch.xml
new file mode 100644
index 00000000..9f0374c9
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.fhsg.ch.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.fhsg.ch/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-06-11T14:39:45Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor errorURL="http://portal.fhsg.ch/it" 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">fhsg.ch</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">FHS St. Gallen</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">FHS St.Gallen</mdui:DisplayName>
+ <mdui:Description xml:lang="de">FHS St. Gallen - Hochschule für Angewandte Wissenschaften</mdui:Description>
+ <mdui:Description xml:lang="en">FHS St. Gallen - University of Applied Sciences St. Gallen</mdui:Description>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAG/SURBVHicYvj//z8Dg5JFCQpWtixhkNTUZgACTk4uBiiQVFVV8/X19W8sLCrZmpmV8wwoxs0ANiBjxX8UnLX6P4NPdQJMZ0RktNW8+Yv+r1m38f/2nXv+7z945P+CRUuAGhmsIAbkrP+PgvM2/2fwb4QbkJScyrt3/6G/u/ce+L9rz/7/IHrt+k3/1TU0cqAGrPuPgvM2AQ1ogBtgZ2fPsHnrjlsgzTAMcomPr99cHC5ANYCbm4dh+co1q/bsOwh3wb4Dh//nFRSegxiQDbQVGeeiGgACM2bNqTxw6Oj/nbv3/d+4edvzpctWbk5Lz6yEGGAczIuCTUJ4GVRtWUEaGRkZwQYkp6SpVdfUBQADVMbE1AxhMtgAXICFHUxxcXFjlQYbjtcAYgBeA1g5GRiYmIkwIKKvFgVHTqxlcMjQhysSkmNgCGpNYYjoh6oB0mE9tQwq1u4QA0ChjowLtv5nCGhKgBsgrsbAkLbsDDiBgeRB0QyKbl2vCUSlAwZxVQaGlMVnGHI2INRkrQEa4DmBqJRI2IDs9YhERJYLstf+R8G5G/8z+NWjGbDoDFgjWA3QokxgjtXxmAAAAAD//wMANOlXl/E5lXoAAAAASUVORK5CYII=</mdui:Logo>
+ <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAgNSURBVHic7JhZUFRXGsfzNnk0VvIQM5maVCWVROMwqLhkIIiOqYHBgbBjwMSJ6IPKk+IWFM0AQdlESwERZF8CJSDY3bLJ3s3ayL4JKossooKiIsr84Pbc3GacmaQqw9S091+nTt177ndOn/+3ne/0azOvGF77X29goSETNnTIhA0dMmFDh0zY0CETNnTIhA0dMmFDh0zY0CET/sl4+vTps2fPfsGtLAx0hPtHxoNT1NL2fUJ5eeNtqeiLFy8mJyeHhoY6OjpramoLC4t6e3vnLZeZecnf3++7745fuXKlq6szMTGRwYmJiYiIiHv37j169Cg8/Nz+/fsVCoU4BcXFx8d7eXmlpqaKI9I179y5ExYWduDAAXoWmfeLSqUyPz9/eHg4MjJi3sR/R1jd3L/IMnCRZdAbVrr2Kwt/37gyUe7x48dqtaagoFClylMoVErlVfr6eu285RwcHFxdXYKDg9lEZmamhYWFsONly5beuHGDTVtZWbLvmJgYcUpISPCnn647c+bM2bNneQ0PDw8KChK/9vT0mJqa7tjhERkZuXfv3ra2tnlK2bdv7+HDh5qbm01MTNAsI9PT08InLET//PnzlxCuah1454tT73wR9ms7XVtsFXQiqVKUw3uLi0vgefVqvtBgXlpaNs+rnZ2dk5KShOesrCxLS0t+dXBw0MRkFYSdnBwPHTo0T0eennu2bNmi07tabWz8e2Nj4/j4OGHEy2vf9u3bpfK3b9/28PBwdHTAlaampr799vCxYz6tra3m5p+hBRTt4uLs7u7W3t5eVlb21Sy2sn5HR8fPIwy0Wq2U8GzLy3/w4IFUhuXXrl1jbW2dkZFRUFDwwQfvOzjYb968eenSj2/evFlVVbV6tYmzsxPkxSnszMJi/eefb6qvr8fnd+3atWfP7rt37womwiOSkhJ5OHjwIDyvX7/OJ6KpsrJyzZrVGo3m2CxmCa9fb37r1i0zM1O2GBwc9PXXX12+nL18+fKGhoYvv9yyc+fOn00Y78KNpYThj76lMq6urr6+f6urqyPUc3IuwwQ1FRYWrlhh3Nk5q2PGPXZ4QIMYEWeNj49jeQjgk97e3kePHhE/2dnZEQI85OXl4bSs2dXVBZlvvvmrkdHvSktLjx8/LhDeuHFjTU3NJ58s27ZtG/bfunVrWlqqvb0dc318jrq4uOgR1rQOvG0T+rbNqSW2urboT4EBiRVSMmNjY7ix6M+wzc1VNDRcl8o4OTmJ3ii4NA+jo6MrV67AkgMDA7zCn5BmUBBDBcQFLvfRRx/29/fDnJhkvLu7m9fo6GghHBixtbUlF3p6ehK3Dx8+3LBhw7Vr12bt63O0tbUF5UIbzaIFctjg4J1Lly7Z2PyFibg9ltAjXNcx+LFbOG3pP9p7jqdPp1dLyRAhRUXXMHJeXkFJSWltbV1XV7fgeyLc3d2FzCwQtrGxESiZmv6hp2c2aaGCdevWkqiEjALIcPgzAiRqEkxCQryRkRGJYPfuXb6+voywXTMzM1tbm1WrVhIUJHNzc3MPj+1Ee3l5mZ+fHz7V3t62adMf8ZrAwEB+ws3NLS4uTqVSkTX4CXSC2fUIP52a5mSStr7h8fFHT2b0gaZ7e2/ev3+fbDHzMmBDMarxz76+vpm5hMcBxhQm4uGYTjoFWzU2NrJj4ZUcS8olz5HbR0ZGhEHinzDB4IKacJbOzk5kiPnROWAMAlj8StzyiZWFDbAOwnqEXx3IhA0dOsKTT6ZaekZaen9sTTeGh8YeSkUH704wKJVp7hlholRmYg5irQMIPKkASU4skghpDqT/Cq1/DR3h6raBd+3D3rU//RsHXXvLOjgwWe8c9rlQ8qZ1sCiA8G8dTzd2D4kC5AxOgtTUFEoIqhyO6OrqakpcjUbd0KAlf9TW1mZnZ//wQxpJiDRWVFSkVldyipBdFpowhccS29AltmHUHkJ7wzIwQL/w8I4qZlAU4KymPsHmUpnY2FhK4oSEhLS0tFOnQjm6eL5w4QKHTWJiQm5uLvR45ejiwoBMTEw0Z88t/eplgQj/x0rrSFQxg6IAwjjFPMIcORRkLS0tCoWS44Eao6m5uam5STMH6gRqQ75yDsEWR6BUQObJk/nn3/8NYQ5AXFc89GbmCtKfvhvOcE5yMQUQ8LwSGpzJ0jVfCn5IVByzmpqaXnpd/yUJk41CQkKKi4sxpkqpojZgB1RClI3cJaqrqyjrMTI90avRVOHe1BgUycR2SkoKzxcvXoyKisL4FEnsmInnzp2jFEtPTycpIIlCKyoqSA34BZfqwkJuKAVU17ySOwgoUgM3ZKoxIot1mMI1g+nM0iOsbulfbBXINXjxn3Xt9Q3f+8WXSwkfjChiUBRAmBzW0KWXtLKzszIy0mPjYs+fP08GhvnJkyehAZ/YWPrkiMgIf39/pUp14sQJymAUwQPXY0IaqvTJycnUldSLlZUVVEtHjniHhoaQCEiH8MnJyaG6pjJFjEQAJVaOijqPguBMOQk3VMygQqlAht8SJgYEBOgRHhqbiM7VSltEVl1tm54XaZr7IrPrfpTJ0cbkakcfTEplcD/u6CUlJWh6evo5PbQJWvyNZ5hAieoSFyV6MSm1KjbHRD1zYNOMYEbhvoUGiXm+siyJncsQiwt9a1sbtSSDJAIEuEjTU/ayJo7DUng1c7Xa+t45MK5HeGGAk//zfzQLjFe10np1IBM2dMiEDR0yYUOHTNjQIRM2dMiEDR0yYUOHTNjQIRM2dPwdAAD//wMANQzGak+BGLgAAAAASUVORK5CYII=</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>195.176.16.0/24</mdui:IPHint>
+ <mdui:IPHint>195.176.16.0/25</mdui:IPHint>
+ <mdui:IPHint>195.176.17.0/24</mdui:IPHint>
+ <mdui:IPHint>195.176.18.200/30</mdui:IPHint>
+ <mdui:IPHint>195.176.18.204/31</mdui:IPHint>
+ <mdui:IPHint>195.176.19.0/25</mdui:IPHint>
+ <mdui:IPHint>195.176.19.128/27</mdui:IPHint>
+ <mdui:IPHint>195.176.19.160/28</mdui:IPHint>
+ <mdui:IPHint>195.176.19.0/25</mdui:IPHint>
+ <mdui:IPHint>195.176.19.128/27</mdui:IPHint>
+ <mdui:IPHint>195.176.19.160/28</mdui:IPHint>
+ <mdui:IPHint>195.176.19.0/28</mdui:IPHint>
+ <mdui:DomainHint>fhsg.ch</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:47.425413,9.371350</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLzCCAhegAwIBAgIUE/551Fka5VCfxZWiNziJRRpSEdQwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwHhcNMTExMTAxMTUxNDQ5
+WhcNMTQxMTAxMTUxNDQ5WjAcMRowGAYDVQQDExFhYWktbG9nb24uZmhzZy5jaDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKmopa29dNq2NlZIAVsF3tjx
+tVG6BHupDp1wzYpAGLBjyLrByHL/EBFRtcgz7U0Or3AKG0zpnR/EabOM0wSGNp92
+DE5xGLHHKJJN8B9CtxCu9ewhTgqx+4xoc4SohczUzB8kZi/JoAO01Cvr8rX41a7h
+Ci5SET1ZiIqFX1qJC2UK2H/KmAjkPSN/fXSHJfkOCNC8ehKUE7nd4b5tcqa03bNV
+xKOFoh7wT1u9oQWY7TKKdem8CpQuHPoQmeMuohsezyecnpUvf18UmzRF+67/vBrO
+m9tJbUVhrv0pZyapY3135AY3eCMswF8pOt4IKFAXDDESuAXAYBQGSdBL0mdwTEMC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRYWFpLWxvZ29uLmZoc2cuY2iGKGh0dHBzOi8v
+YWFpLWxvZ29uLmZoc2cuY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHBBA2d2
+gvzXzgAdQYH6V54gtUwkMA0GCSqGSIb3DQEBBQUAA4IBAQBybl04VwGusWH5nGPZ
+yWsdpF+JztkTTG26GQ6Q1lsxh6JengePKlyj6c025W4KZIyt+5GGnJM0ajuxfJAF
+K8rr4DHrSIWk9Uy1KftCVarvI5OaerfigyWcpiLqEwxqZBs+xg5OgQPvh82AHBN5
+E2pYy5nmp6uWR0ZSJ4BaEDGZrwsQ6qdGnqKqnXLq8nkWW2L7cliA7+I+XhzqSY9b
+KdGVOXBU38qRDKSyAPOO3MkITWzcVQNWm0PEv3MCXE10JTX3XEGwD/PKbSICCWO3
+BUDpYrVzuDOgWLoHLaAx4dS+gByfs/VsK6nPKVjY9lOu0HLxf21Y6jj570C+J8nc
+8/18
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.fhsg.ch/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.fhsg.ch/idp/profile/SAML2/Redirect/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.fhsg.ch/idp/profile/SAML2/POST/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">fhsg.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLzCCAhegAwIBAgIUE/551Fka5VCfxZWiNziJRRpSEdQwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwHhcNMTExMTAxMTUxNDQ5
+WhcNMTQxMTAxMTUxNDQ5WjAcMRowGAYDVQQDExFhYWktbG9nb24uZmhzZy5jaDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKmopa29dNq2NlZIAVsF3tjx
+tVG6BHupDp1wzYpAGLBjyLrByHL/EBFRtcgz7U0Or3AKG0zpnR/EabOM0wSGNp92
+DE5xGLHHKJJN8B9CtxCu9ewhTgqx+4xoc4SohczUzB8kZi/JoAO01Cvr8rX41a7h
+Ci5SET1ZiIqFX1qJC2UK2H/KmAjkPSN/fXSHJfkOCNC8ehKUE7nd4b5tcqa03bNV
+xKOFoh7wT1u9oQWY7TKKdem8CpQuHPoQmeMuohsezyecnpUvf18UmzRF+67/vBrO
+m9tJbUVhrv0pZyapY3135AY3eCMswF8pOt4IKFAXDDESuAXAYBQGSdBL0mdwTEMC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRYWFpLWxvZ29uLmZoc2cuY2iGKGh0dHBzOi8v
+YWFpLWxvZ29uLmZoc2cuY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHBBA2d2
+gvzXzgAdQYH6V54gtUwkMA0GCSqGSIb3DQEBBQUAA4IBAQBybl04VwGusWH5nGPZ
+yWsdpF+JztkTTG26GQ6Q1lsxh6JengePKlyj6c025W4KZIyt+5GGnJM0ajuxfJAF
+K8rr4DHrSIWk9Uy1KftCVarvI5OaerfigyWcpiLqEwxqZBs+xg5OgQPvh82AHBN5
+E2pYy5nmp6uWR0ZSJ4BaEDGZrwsQ6qdGnqKqnXLq8nkWW2L7cliA7+I+XhzqSY9b
+KdGVOXBU38qRDKSyAPOO3MkITWzcVQNWm0PEv3MCXE10JTX3XEGwD/PKbSICCWO3
+BUDpYrVzuDOgWLoHLaAx4dS+gByfs/VsK6nPKVjY9lOu0HLxf21Y6jj570C+J8nc
+8/18
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhsg.ch: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">fhsg.ch</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">FHS St. Gallen</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">FHS St.Gallen</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.fhsg.ch/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.fhsg.ch/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Hotline</GivenName>
+ <SurName>Support Contact</SurName>
+ <EmailAddress>mailto:switchaai@fhsg.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>SWITCHaai Team</GivenName>
+ <SurName>Informatik</SurName>
+ <EmailAddress>mailto:aai@switch.ch</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml
new file mode 100644
index 00000000..85259e17
--- /dev/null
+++ b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb-dev.marie.hellasgrid.gr/edugain-sp">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+ <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">
+ http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
+ </mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">
+ http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">EGI Applications Database (DEV)</mdui:DisplayName>
+ <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance)</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+ <mdui:Logo height="128" width="120">https://appdb-dev.marie.hellasgrid.gr/images/appdblogo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-sp/artifact" index="3"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">EGI Applications Database (DEV)</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance)</md:ServiceDescription>
+ <md:RequestedAttribute 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 Name="urn:oid:2.5.4.3" 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: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:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.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.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" 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:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Marios</md:GivenName>
+ <md:SurName>Chatziangelou</md:SurName>
+ <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Marios</md:GivenName>
+ <md:SurName>Chatziangelou</md:SurName>
+ <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb.egi.eu.xml b/swamid-interfederations-2.0/appdb.egi.eu.xml
new file mode 100644
index 00000000..299074d5
--- /dev/null
+++ b/swamid-interfederations-2.0/appdb.egi.eu.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb.egi.eu/edugain-sp">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+ <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">
+ http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
+ </mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">
+ http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">EGI Applications Database</mdui:DisplayName>
+ <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+ <mdui:Logo height="128" width="120">https://appdb.egi.eu/images/appdblogo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIRAIXc8Krve5VuXkhnojBEvuAwDQYJKoZIhvcNAQEFBQAwczELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxGTAXBgNVBAMTEFBvc2l0aXZlU1NMIENBIDIwHhcNMTMxMDAzMDAwMDAwWhcNMTQxMDAzMjM1OTU5WjBQMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRUwEwYDVQQDEwxhcHBkYi5lZ2kuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9RMFe27ucrw5Uv2oCmfxIB2O4q/dwFNZVZmTWfiRisOyvSUtooCDneO4vhvt6h9YP7zAjPjfBA6SruBKtfXH5j3uPEEllpV4jq4mPJBo0D0P1aPq9ibbh0DrO+XRlcjjXAKYmlBZxa2oIjiFD7MgxAzf6VkTHCNDN/tGLFxCv1+/ExvPpOUZTPBkiGXkEDyJATpepFxROVoo7IZf5Azqpy3lLSMiqbTEKkQXbcW8egmP6wmMpUaNRYHtwNiU3qRVKrZw/322P2yYuFLUpCHPjTNKW4SMlhbt4RyMtO0LnIAJt9DgcMaiha2EDcaojV1fq7pFZzCg1YC6uvFG9atkxAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBSZ5EBfaxRePgXZ3dNjVPxiuPcArDAdBgNVHQ4EFgQUtxGXMez+256VFqWJT7kEz3zY5EEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYLKwYBBAGyMQECAgcwLDAqBggrBgEFBQcCARYeaHR0cDovL3d3dy5wb3NpdGl2ZXNzbC5jb20vQ1BTMAgGBmeBDAECATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcmwwbAYIKwYBBQUHAQEEYDBeMDYGCCsGAQUFBzAChipodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTApBgNVHREEIjAgggxhcHBkYi5lZ2kuZXWCEHd3dy5hcHBkYi5lZ2kuZXUwDQYJKoZIhvcNAQEFBQADggEBAJTG+QIH44hiyl/vxEncKy6vAib3n7PbqphVmA4NDf0peKp8xdYoG23YnHG72aGsUwg9031RtN/1LqaAgb2A3JOF5of1pobqQbwPUC6mSNuXFm1cOtZR8gG5e6G3mwB9FWb0P6WK+yzsBhz3ekSziv4PgZjd1HIiSLUg1YwpWYvBIdi+MCDZVSgNmJr9QKsv+N50fcYuGYSmXOEnLNchyMUPcQzzSO/xI0JkeiQkAQ5WfCV03ykmBxSvefeJo35GMzGEIpxrQ/DgyvKIwkFtBf/ESA4ID3JN7+iZJs2XjWRgFZx5mKCwr5uY2tNmvbFvM7g1zFwOyLdlEV45Dp3d9bk=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIRAIXc8Krve5VuXkhnojBEvuAwDQYJKoZIhvcNAQEFBQAwczELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxGTAXBgNVBAMTEFBvc2l0aXZlU1NMIENBIDIwHhcNMTMxMDAzMDAwMDAwWhcNMTQxMDAzMjM1OTU5WjBQMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRUwEwYDVQQDEwxhcHBkYi5lZ2kuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9RMFe27ucrw5Uv2oCmfxIB2O4q/dwFNZVZmTWfiRisOyvSUtooCDneO4vhvt6h9YP7zAjPjfBA6SruBKtfXH5j3uPEEllpV4jq4mPJBo0D0P1aPq9ibbh0DrO+XRlcjjXAKYmlBZxa2oIjiFD7MgxAzf6VkTHCNDN/tGLFxCv1+/ExvPpOUZTPBkiGXkEDyJATpepFxROVoo7IZf5Azqpy3lLSMiqbTEKkQXbcW8egmP6wmMpUaNRYHtwNiU3qRVKrZw/322P2yYuFLUpCHPjTNKW4SMlhbt4RyMtO0LnIAJt9DgcMaiha2EDcaojV1fq7pFZzCg1YC6uvFG9atkxAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBSZ5EBfaxRePgXZ3dNjVPxiuPcArDAdBgNVHQ4EFgQUtxGXMez+256VFqWJT7kEz3zY5EEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYLKwYBBAGyMQECAgcwLDAqBggrBgEFBQcCARYeaHR0cDovL3d3dy5wb3NpdGl2ZXNzbC5jb20vQ1BTMAgGBmeBDAECATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcmwwbAYIKwYBBQUHAQEEYDBeMDYGCCsGAQUFBzAChipodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTApBgNVHREEIjAgggxhcHBkYi5lZ2kuZXWCEHd3dy5hcHBkYi5lZ2kuZXUwDQYJKoZIhvcNAQEFBQADggEBAJTG+QIH44hiyl/vxEncKy6vAib3n7PbqphVmA4NDf0peKp8xdYoG23YnHG72aGsUwg9031RtN/1LqaAgb2A3JOF5of1pobqQbwPUC6mSNuXFm1cOtZR8gG5e6G3mwB9FWb0P6WK+yzsBhz3ekSziv4PgZjd1HIiSLUg1YwpWYvBIdi+MCDZVSgNmJr9QKsv+N50fcYuGYSmXOEnLNchyMUPcQzzSO/xI0JkeiQkAQ5WfCV03ykmBxSvefeJo35GMzGEIpxrQ/DgyvKIwkFtBf/ESA4ID3JN7+iZJs2XjWRgFZx5mKCwr5uY2tNmvbFvM7g1zFwOyLdlEV45Dp3d9bk=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-sp/artifact" index="3"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">EGI Applications Database</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace</md:ServiceDescription>
+ <md:RequestedAttribute 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 Name="urn:oid:2.5.4.3" 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: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:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.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.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" 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:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Marios</md:GivenName>
+ <md:SurName>Chatziangelou</md:SurName>
+ <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Marios</md:GivenName>
+ <md:SurName>Chatziangelou</md:SurName>
+ <md:EmailAddress>appdb-support@iasa.gr</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 ef926099..2226fdb1 100644
--- a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.shib.manchester.ac.uk/shibboleth">
- <!--
- This is a "beta" Shibboleth IdP for The University of Manchester.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-06T16:24:24Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/cafe.uesc.br.xml b/swamid-interfederations-2.0/cafe.uesc.br.xml
index e535a7c0..ae1e5cb2 100644
--- a/swamid-interfederations-2.0/cafe.uesc.br.xml
+++ b/swamid-interfederations-2.0/cafe.uesc.br.xml
@@ -23,23 +23,27 @@
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>
- MIIC/jCCAeYCAQAwDQYJKoZIhvcNAQEFBQAwRTEfMB0GA1UECxMWRGVwYXJ0YW1l
-bnRvOiBOVEkvVUVTQzELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
-cjAeFw0xMzA5MjAxOTEwMjlaFw0xNjA5MTkxOTEwMjlaMEUxHzAdBgNVBAsTFkRl
-cGFydGFtZW50bzogTlRJL1VFU0MxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
+ MIIDvjCCAqYCAQAwDQYJKoZIhvcNAQEFBQAwgaQxMzAxBgNVBAoTKlVFU0MgLSBV
+TklWRVJTSURBREUgRVNUQURVQUwgREUgU0FOVEEgQ1JVWjEMMAoGA1UECxMDQ09J
+MRowGAYJKoZIhvcNAQkBFgtDT0lAVUVTQy5CUjEPMA0GA1UEBxMGSUxIRVVTMQ4w
+DAYDVQQIEwVCQUhJQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
+cjAeFw0xNDA0MTAxMjAyMzRaFw0xOTA0MDkxMjAyMzRaMIGkMTMwMQYDVQQKEypV
+RVNDIC0gVU5JVkVSU0lEQURFIEVTVEFEVUFMIERFIFNBTlRBIENSVVoxDDAKBgNV
+BAsTA0NPSTEaMBgGCSqGSIb3DQEJARYLQ09JQFVFU0MuQlIxDzANBgNVBAcTBklM
+SEVVUzEOMAwGA1UECBMFQkFISUExCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
-F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADxbQRK6vSslFHfXl2hB
-570269W5Y6SzRDM13EUHyINWHWJ7ka3hpWCEA2RpgnmdNPFcbFp7ioyujOJR6moV
-tklji0Sdw9LqVSkACERmCKSa/2gpqIHoSgV+Ddk5VPkt0ATKwvZzyDxk0otvjERQ
-rwO6bZq50HzeV3wx4/P3MGbuaXuxSgP6yNVt9cZskilkG/+QDivmKjK753GbhdfW
-nyAmvI387XNCfg75p89Av9ZvmlAILKkg6XzImyCi27mWB5ANncpv9BH3Ko+Mbs4B
-rcmV/VA5EH2YQ5DgoadWHBSHIZ+ZJJiRFSkFfFyqsCMY5AbVw2kQmS7Og4WC3aYK
-RHc=
+F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACAUW1b9UNotRq7BlSiy
+C4ATLQ4qidg/8vCZu1AqreLXU71C3SHnOFl+C+JhorczJyo4lLVJmoIZRvjmedZT
+RNpeSsT4NBPxFpfhjk+e5RbrQJFa2qw4AansX/ErUhvRDaI9yy5gE1YdiOeK58Pc
+Yr8RJQdsCybLWTCSlVWJbRzvv05uUlJNnNSuxvYBeY727sDomtaj6WsPy99HPEY+
+r5nqp5LUU4AWUhpm8faNRFZia439GTSibCoICMRy4WBe1HvAi2ljKA4uRXKgJQsq
+Vv4jw5WtdCEE2lDlRADuHz5lbijCzXEikhEBFAcDWGmdFTtXMvcAUqaCTVUkQDUE
+9N8=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -62,24 +66,28 @@ RHc=
<ds:X509Data>
<ds:X509Certificate>
-MIIC/jCCAeYCAQAwDQYJKoZIhvcNAQEFBQAwRTEfMB0GA1UECxMWRGVwYXJ0YW1l
-bnRvOiBOVEkvVUVTQzELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
-cjAeFw0xMzA5MjAxOTEwMjlaFw0xNjA5MTkxOTEwMjlaMEUxHzAdBgNVBAsTFkRl
-cGFydGFtZW50bzogTlRJL1VFU0MxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
+MIIDvjCCAqYCAQAwDQYJKoZIhvcNAQEFBQAwgaQxMzAxBgNVBAoTKlVFU0MgLSBV
+TklWRVJTSURBREUgRVNUQURVQUwgREUgU0FOVEEgQ1JVWjEMMAoGA1UECxMDQ09J
+MRowGAYJKoZIhvcNAQkBFgtDT0lAVUVTQy5CUjEPMA0GA1UEBxMGSUxIRVVTMQ4w
+DAYDVQQIEwVCQUhJQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
+cjAeFw0xNDA0MTAxMjAyMzRaFw0xOTA0MDkxMjAyMzRaMIGkMTMwMQYDVQQKEypV
+RVNDIC0gVU5JVkVSU0lEQURFIEVTVEFEVUFMIERFIFNBTlRBIENSVVoxDDAKBgNV
+BAsTA0NPSTEaMBgGCSqGSIb3DQEJARYLQ09JQFVFU0MuQlIxDzANBgNVBAcTBklM
+SEVVUzEOMAwGA1UECBMFQkFISUExCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
-F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADxbQRK6vSslFHfXl2hB
-570269W5Y6SzRDM13EUHyINWHWJ7ka3hpWCEA2RpgnmdNPFcbFp7ioyujOJR6moV
-tklji0Sdw9LqVSkACERmCKSa/2gpqIHoSgV+Ddk5VPkt0ATKwvZzyDxk0otvjERQ
-rwO6bZq50HzeV3wx4/P3MGbuaXuxSgP6yNVt9cZskilkG/+QDivmKjK753GbhdfW
-nyAmvI387XNCfg75p89Av9ZvmlAILKkg6XzImyCi27mWB5ANncpv9BH3Ko+Mbs4B
-rcmV/VA5EH2YQ5DgoadWHBSHIZ+ZJJiRFSkFfFyqsCMY5AbVw2kQmS7Og4WC3aYK
-RHc=
-
+F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACAUW1b9UNotRq7BlSiy
+C4ATLQ4qidg/8vCZu1AqreLXU71C3SHnOFl+C+JhorczJyo4lLVJmoIZRvjmedZT
+RNpeSsT4NBPxFpfhjk+e5RbrQJFa2qw4AansX/ErUhvRDaI9yy5gE1YdiOeK58Pc
+Yr8RJQdsCybLWTCSlVWJbRzvv05uUlJNnNSuxvYBeY727sDomtaj6WsPy99HPEY+
+r5nqp5LUU4AWUhpm8faNRFZia439GTSibCoICMRy4WBe1HvAi2ljKA4uRXKgJQsq
+Vv4jw5WtdCEE2lDlRADuHz5lbijCzXEikhEBFAcDWGmdFTtXMvcAUqaCTVUkQDUE
+9N8=
+
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/community.ja.net.xml b/swamid-interfederations-2.0/community.ja.net.xml
index 1bd9eebb..538bffd8 100644
--- a/swamid-interfederations-2.0/community.ja.net.xml
+++ b/swamid-interfederations-2.0/community.ja.net.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://community.ja.net/shibboleth">
- <!--
- This is a Janet Community Shibboleth 2 SP for JISC Collections and Janet Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-14T17:37:40Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/core.uwap.org.xml b/swamid-interfederations-2.0/core.uwap.org.xml
index ac7aacde..8039d387 100644
--- a/swamid-interfederations-2.0/core.uwap.org.xml
+++ b/swamid-interfederations-2.0/core.uwap.org.xml
@@ -1,27 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-10-17T11:25:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
- <mdui:UIInfo>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">UWAP</mdui:DisplayName>
<mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
<mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
<mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</mdui:Description>
</mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
- </saml:Attribute>
</md:Extensions>
<md:KeyDescriptor use="signing">
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
index 803bf9de..c8444be0 100644
--- a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.emeraldinsight.com/entity">
- <!--
- This is a Shibboleth SP for Emerald Group Publishing Ltd.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-09T12:25:06Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/doit.swisdom.org.xml b/swamid-interfederations-2.0/doit.swisdom.org.xml
index 6563a007..2629ce99 100644
--- a/swamid-interfederations-2.0/doit.swisdom.org.xml
+++ b/swamid-interfederations-2.0/doit.swisdom.org.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://doit.swisdom.org/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-12-30T19:03:54Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-06-24T10:09:34Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
@@ -107,6 +107,6 @@ MwW3NDMLS+8yP8MK9rI=
<ContactPerson contactType="technical">
<GivenName>DOIT</GivenName>
<SurName>Support</SurName>
- <EmailAddress>mailto:doit@derm.uzh.ch</EmailAddress>
+ <EmailAddress>mailto:vahid.djamei@uzh.ch</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/educonf-directory.geant.net.xml b/swamid-interfederations-2.0/educonf-directory.geant.net.xml
index 81a6c4ea..ddb75036 100644
--- a/swamid-interfederations-2.0/educonf-directory.geant.net.xml
+++ b/swamid-interfederations-2.0/educonf-directory.geant.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://educonf-directory.geant.net/simplesaml/module.php/saml/sp/metadata.php/eduCONF">
- <!--
- This is a "GÉANT" simpleSAMLphp SP for the Delivery of Advanced Network Technology to Europe Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-28T13:11:24Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/edugate.itb.ie.xml b/swamid-interfederations-2.0/edugate.itb.ie.xml
new file mode 100644
index 00000000..55e773f1
--- /dev/null
+++ b/swamid-interfederations-2.0/edugate.itb.ie.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.itb.ie/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2011-03-08T00:00:00Z"/>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">itb.ie</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:Logo height="65" width="235">https://edugate.heanet.ie/rr3/logos/itb.png</mdui:Logo>
+ <mdui:DisplayName xml:lang="en">Institute of Technology Blanchardstown</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.itb.ie</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:GeolocationHint>geo:53.40572644015631,-6.378046274185181</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDIzCCAgugAwIBAgIUWE0VPYPdB8l/5af8W6PkkZDYFm4wDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOZWR1Z2F0ZS5pdGIuaWUwHhcNMTEwNjAxMTQ1NjA1WhcN
+MzEwNjAxMTQ1NjA1WjAZMRcwFQYDVQQDEw5lZHVnYXRlLml0Yi5pZTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJg3AH4MXYhZXU7pdFdV6lhsNB0/Qjqg
+eYSiWfLoZydHcJXTJw7Tfk2/8iX/NkLiyX+zouYTuw99HJtb+oZ4WzW3vwD0pupy
+eM4eteWkGycQBoW7aE+KAH8Qrsj3xiGSv0A6Yod6wHn7KyCAmxUb7wPOCf/yuj5z
+SvxZwdQWUXRqlirDhJgLsOSedru92hVRXbo8uMvnkdkWbwggBd5UMNGPZsPRBPKN
+P+nw5Ccvw2GWCZkpel4nqoIFu+8GbJVHYOrUliVLgNcv+lL22SlmI4ahqZDHTToC
+AzfRGuYUOtkpHlBp/H3ZQLEQ/61o5HWYB7RAtQNRCMU0u145/2uJ2TcCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOZWR1Z2F0ZS5pdGIuaWWGJWh0dHBzOi8vZWR1Z2F0ZS5p
+dGIuaWUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFARmPTDY2ovy8VOaLRwUc5al
+PqZNMA0GCSqGSIb3DQEBBQUAA4IBAQAZIThM8v0IQ++IyxuLKCPziFcDdl3Cptbv
+0LHvMWnVhskz5hxqaFBIyCCXtBwsVOMMGX5gNWtUm+7l+toa3AWC6bvjzDTCU64Z
+LW30XFU05arBASH+s1VNeOVnKHunsK1PN6qDH1VrXKkREyfDNWhQDHm1TE8JlBxY
+gbKMqJzGMLYTLc7xwiEn2qRh4Yh9TaoYwBHlPVTKR0Zd+p4N1xh3Bu5hr/V3MeHD
+6H4JYebKv15gO1dpxnngMQsnFs9lUqkcoMvPsJXj81AAO2WQUK4RC8SH+CL+pzqZ
+hj8bmirIgUuG9EBuz/X57eigHOWaytDx61rjjuvtKOWT2LgfwXqY
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edugate.itb.ie/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edugate.itb.ie/idp/profile/SAML2/POST/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Institute of Technology Blanchardstown</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Institute of Technology Blanchardstown</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.itb.ie</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Dave</md:GivenName>
+ <md:SurName>Curran</md:SurName>
+ <md:EmailAddress>dave.curran@itb.ie</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Eamonn</md:GivenName>
+ <md:SurName>O'Brien</md:SurName>
+ <md:EmailAddress>Eamonn.OBrien@itb.ie</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
index 5bffe413..56d2736a 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">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/filesender.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index da3a3dbe..57c474ac 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" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://filesender.funet.fi">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="fi">Funet FileSender</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Funet FileSender</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Funet FileSender</mdui:DisplayName>
@@ -14,12 +24,8 @@
<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>
+ </Extensions>
+ <KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
@@ -50,47 +56,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/fod.geant.net.xml b/swamid-interfederations-2.0/fod.geant.net.xml
new file mode 100644
index 00000000..67abef6c
--- /dev/null
+++ b/swamid-interfederations-2.0/fod.geant.net.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fod.geant.net/shibboleth">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+ <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">
+ http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
+ </mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">
+ http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <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://fod.geant.net/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">GÉANT FoD pilot</mdui:DisplayName>
+ <mdui:Description xml:lang="en">GÉANT FoD pilot</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://fod.geant.net/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://fod.geant.net/</mdui:PrivacyStatementURL>
+ <mdui:Logo height="45" width="220" xml:lang="en">https://fod.geant.net/static/fodlogo2.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>fod.geant.net</ds:KeyName>
+ <ds:KeyName>https://fod.geant.net/shibboleth</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=fod.geant.net</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJALpwpqVM41ahMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+ BAMTDWZvZC5nZWFudC5uZXQwHhcNMTQwNjIzMTAwMDQ3WhcNMTkwNjIyMTAwMDQ3
+ WjAYMRYwFAYDVQQDEw1mb2QuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+ AQ8AMIIBCgKCAQEA7xERTh1Nm2VyuqI9t3nPILhB0OT2gwNZZYQ7S0YWDbwQSZu8
+ 98n9ky46onJm6ie3hA3CQKO86/0IqoF8idhnMFrODrvVNL+MTXj/kfb3oRwm0HzR
+ ZXOExZM4zCLCaAAmlIvkYASjjRrY8tZnyXkw1IXE/wApfU4foL8as0Wskq3vQgvm
+ dL9xXc+T7CsR7ZkvzgekLw8IhXT8zwoiKKWzw7cNJMr0yvkow2El0GJevpT4H1n4
+ B0L4WeipLH3grmBa4vL7fjOnBomnou6mjbfeKy3e0sbeMq64fLeJoJyDdoxx8s3r
+ uketgyYh5BG7Z6tFpHVrrQ5lxqAk8eSOC+tziwIDAQABo10wWzA6BgNVHREEMzAx
+ gg1mb2QuZ2VhbnQubmV0hiBodHRwczovL2ZvZC5nZWFudC5uZXQvc2hpYmJvbGV0
+ aDAdBgNVHQ4EFgQUWYtmspsehNvR1pD1f1+qEUfoDEIwDQYJKoZIhvcNAQEFBQAD
+ ggEBAHV/TTiiQGeGW3YhuyV5dA+FkSNPMJbYPi38Oy36Vv732NYv22ONtKjop45I
+ LVz6tPVLtpV+TVwtSGw+Rca79FwDf6g3tu2rLN+xElLk8M7gYtoRY2kdoq1A/UaO
+ 51L2b9wEqYcXQMig2hRwdtxSUgfRcGSwDO75us6b6OsSs3L1UZoWgsHbyynT04Hz
+ +pgaYx67ZJZZ7Mb26w1ScHJUenjHhFY3Xqr/yG6+cwmA/7ihdnpwyOp8VGLA8kKD
+ Faf69w08P93wE8CS9U+gcN8RdvhC9W+iYhGRLHCPg7o6gRjeFB+p6zeyb/kNuuLU
+ VYAFoJvsnMeKzPxMe+iSHgeolLI=
+ </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://fod.geant.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fod.geant.net/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fod.geant.net/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/Shibboleth.sso/SLO/Artifact"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fod.geant.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fod.geant.net/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fod.geant.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="0" isDefault="true">
+ <md:ServiceName xml:lang="en">GÉANT FoD pilot</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">GÉANT FoD pilot</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"/>
+ <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <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"/>
+ <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <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="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <OrganizationName xml:lang="en">Greek Research and Technology Network</OrganizationName>
+ <OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.grnet.gr/</OrganizationURL>
+ <OrganizationURL xml:lang="el">http://www.grnet.gr/</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <GivenName>Leonidas</GivenName>
+ <SurName>Poulopoulos</SurName>
+ <EmailAddress>leopoul@noc.grnet.gr</EmailAddress>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ <GivenName>Leonidas</GivenName>
+ <SurName>Poulopoulos</SurName>
+ <EmailAddress>leopoul@noc.grnet.gr</EmailAddress>
+ </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/foodl.org.xml b/swamid-interfederations-2.0/foodl.org.xml
index 91edbfcc..ba803cd9 100644
--- a/swamid-interfederations-2.0/foodl.org.xml
+++ b/swamid-interfederations-2.0/foodl.org.xml
@@ -1,15 +1,36 @@
<?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:UIInfo>
+ </md:Extensions>
<md:KeyDescriptor use="signing">
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
</ds:X509Data>
@@ -22,20 +43,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/gidp.geant.net.xml b/swamid-interfederations-2.0/gidp.geant.net.xml
index 6db4290b..7eb2b294 100644
--- a/swamid-interfederations-2.0/gidp.geant.net.xml
+++ b/swamid-interfederations-2.0/gidp.geant.net.xml
@@ -1,102 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.geant.net">
- <!--
- This is a "GEANT Identity Provider" simpleSAMLphp IdP for Delivery of Advanced Network Technology to Europe Limited.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T11:50:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.geant.net/sp/module.php/saml/sp/metadata.php/default-sp">
+ <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>
- </Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gidp.geant.net</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">GEANT Identity Provider</mdui:DisplayName>
- <mdui:Logo height="69" width="199">https://www.edugain.org/GIdP.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>
- MIIEkzCCA3ugAwIBAgIRAMu+xHPPachtpqZqP5LsTqswDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzEyMTMwMDAwMDBaFw0xNjEyMTIyMzU5NTlaMDwxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOZ2lkcC5nZWFu
- dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGyGX8egmFqg1S
- BpnwdMh7Gwco3avst57R/6TTgnGeajqjk5q7E6kzT33UHXG37kXJehuA2NBIhwoo
- S8vBpMfsdhgj1ta98d9VdpjM84vJI8qj5zdOV1t+rQ1RejXxla5Fp0Rpj7BoKFye
- WQ/vKrdk/G9rhpZS8DiIKqmNtkakxigm9aGse5r3zaYE6rb2Pb7VXBGkEVq96s5v
- Z/iN6eGWfGy28XopRKboHpjVdR/AkyMARfFd1qLtGh3OddXykKgkwbKfYY3sKUYK
- rqoeq1J6vF3KYYc1WlHuldnW0X+YjskiwX40USuZklxbv2mXublmhk1H5IgN7F2D
- X8jJ124bAgMBAAGjggGUMIIBkDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
- kOO57TAdBgNVHQ4EFgQUCsQex91m+Wk7E+C4/38Sf3T80yAwDgYDVR0PAQH/BAQD
- AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
- MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
- L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
- MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
- ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
- LnRjcy50ZXJlbmEub3JnMEIGA1UdEQQ7MDmCDmdpZHAuZ2VhbnQubmV0ghNwcm9k
- LWdpZHAuZ2VhbnQubmV0ghJ1YXQtZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEF
- BQADggEBAB3iJ9REvIWq6OkRaiGMBN5wrH8RY0QulseOufbf7Cclx58+Y5hqf+bZ
- 1gNQQfGQB8wFw2HaHg/X7RyHA6GRPgjz2w6hLQqI5aWdoKpF26jSbfnQ0Ia+Ko6J
- 9JTawaCJzEqDOYO0vfdK19sOtouZoMpFyj5IGKUhJQfnXl4IxRAKbxOsdmZnlKfC
- MHfKZ3Hkd137e5Vl6PPCD1SgKKyxklGL7kvUJLaI5H+fmyUZhYdLkabuViam16ok
- ulsPPNORMXuSAaPbctgKJYdjK3D608c8SiZpm3hV/XBMYgDBb5NBTq3UZBbUsYRm
- dDPF827oNvkbCcANbb1YmRBmFHWFe+E=
- </ds:X509Certificate>
+ <ds:X509Certificate>MIIFUzCCBDugAwIBAgIRAOipFX0RJIRenc077AEf/TMwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDEyMjIwMDAwMDBaFw0xMzEyMjEyMzU5NTlaMIHwMRswGQYDVQQDExJ3d3cuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDIuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDEuZ2lkcC5nZWFudC5uZXQxCzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5DYW1icmlkZ2VzaGlyZTESMBAGA1UEBxMJQ2FtYnJpZGdlMUIwQAYDVQQKEzlEZWxpdmVyeSBvZiBBZHZhbmNlZCBOZXR3b3JrIFRlY2hub2xvZ3kgdG8gRXVyb3BlIExpbWl0ZWQxFzAVBgNVBAMTDmdpZHAuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxshl/HoJhaoNUgaZ8HTIexsHKN2r7Lee0f+k04Jxnmo6o5OauxOpM0991B1xt+5FyXobgNjQSIcKKEvLwaTH7HYYI9bWvfHfVXaYzPOLySPKo+c3Tldbfq0NUXo18ZWuRadEaY+waChcnlkP7yq3ZPxva4aWUvA4iCqpjbZGpMYoJvWhrHua982mBOq29j2+1VwRpBFaverOb2f4jenhlnxstvF6KUSm6B6Y1XUfwJMjAEXxXdai7RodznXV8pCoJMGyn2GN7ClGCq6qHqtSerxdymGHNVpR7pXZ1tF/mI7JIsF+NFErmZJcW79pl7m5ZoZNR+SIDexdg1/IydduGwIDAQABo4IBnzCCAZswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFArEHsfdZvlpOxPguP9/En90/NMgMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFcGA1UdEQRQME6CDmdpZHAuZ2VhbnQubmV0ghNpZHAxLmdpZHAuZ2VhbnQubmV0ghNpZHAyLmdpZHAuZ2VhbnQubmV0ghJ3d3cuZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEFBQADggEBAH56nltzImiMVOv5DJxcTo2cpGBWPO+OI7S1Ns76cS6PzWbkm/zjPPZI871Pfgw6n3Q3V3Kpc48hRyx3WPH/9nk+YnFEUjkjaRCzeWR6A2oYSb83iI2n/33+E2AmyZ1FX5E1nfxRtSBLYyHPdXYQ6A/TN4qtm/9QHrbcISPEQJwvJn4/BOQDrvsjZDJeq7Srrr2An//RpNdC9cA4wU+m0oJPbPHGl32ENO6JVK7gJPYw2WBDER1SMwAEThtUthQyZhp1z6jA/hoeHfM4QR2/mT458LpRXs1c5VGAeC+4pjfJ4skXAU17Nq+ut8+fJMjjQSXOpv10kS2jNq2XfPmN+K4=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>
- MIIEkzCCA3ugAwIBAgIRAMu+xHPPachtpqZqP5LsTqswDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzEyMTMwMDAwMDBaFw0xNjEyMTIyMzU5NTlaMDwxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOZ2lkcC5nZWFu
- dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGyGX8egmFqg1S
- BpnwdMh7Gwco3avst57R/6TTgnGeajqjk5q7E6kzT33UHXG37kXJehuA2NBIhwoo
- S8vBpMfsdhgj1ta98d9VdpjM84vJI8qj5zdOV1t+rQ1RejXxla5Fp0Rpj7BoKFye
- WQ/vKrdk/G9rhpZS8DiIKqmNtkakxigm9aGse5r3zaYE6rb2Pb7VXBGkEVq96s5v
- Z/iN6eGWfGy28XopRKboHpjVdR/AkyMARfFd1qLtGh3OddXykKgkwbKfYY3sKUYK
- rqoeq1J6vF3KYYc1WlHuldnW0X+YjskiwX40USuZklxbv2mXublmhk1H5IgN7F2D
- X8jJ124bAgMBAAGjggGUMIIBkDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
- kOO57TAdBgNVHQ4EFgQUCsQex91m+Wk7E+C4/38Sf3T80yAwDgYDVR0PAQH/BAQD
- AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
- MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
- L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
- MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
- ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
- LnRjcy50ZXJlbmEub3JnMEIGA1UdEQQ7MDmCDmdpZHAuZ2VhbnQubmV0ghNwcm9k
- LWdpZHAuZ2VhbnQubmV0ghJ1YXQtZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEF
- BQADggEBAB3iJ9REvIWq6OkRaiGMBN5wrH8RY0QulseOufbf7Cclx58+Y5hqf+bZ
- 1gNQQfGQB8wFw2HaHg/X7RyHA6GRPgjz2w6hLQqI5aWdoKpF26jSbfnQ0Ia+Ko6J
- 9JTawaCJzEqDOYO0vfdK19sOtouZoMpFyj5IGKUhJQfnXl4IxRAKbxOsdmZnlKfC
- MHfKZ3Hkd137e5Vl6PPCD1SgKKyxklGL7kvUJLaI5H+fmyUZhYdLkabuViam16ok
- ulsPPNORMXuSAaPbctgKJYdjK3D608c8SiZpm3hV/XBMYgDBb5NBTq3UZBbUsYRm
- dDPF827oNvkbCcANbb1YmRBmFHWFe+E=
- </ds:X509Certificate>
+ <ds:X509Certificate>MIIFUzCCBDugAwIBAgIRAOipFX0RJIRenc077AEf/TMwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDEyMjIwMDAwMDBaFw0xMzEyMjEyMzU5NTlaMIHwMRswGQYDVQQDExJ3d3cuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDIuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDEuZ2lkcC5nZWFudC5uZXQxCzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5DYW1icmlkZ2VzaGlyZTESMBAGA1UEBxMJQ2FtYnJpZGdlMUIwQAYDVQQKEzlEZWxpdmVyeSBvZiBBZHZhbmNlZCBOZXR3b3JrIFRlY2hub2xvZ3kgdG8gRXVyb3BlIExpbWl0ZWQxFzAVBgNVBAMTDmdpZHAuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxshl/HoJhaoNUgaZ8HTIexsHKN2r7Lee0f+k04Jxnmo6o5OauxOpM0991B1xt+5FyXobgNjQSIcKKEvLwaTH7HYYI9bWvfHfVXaYzPOLySPKo+c3Tldbfq0NUXo18ZWuRadEaY+waChcnlkP7yq3ZPxva4aWUvA4iCqpjbZGpMYoJvWhrHua982mBOq29j2+1VwRpBFaverOb2f4jenhlnxstvF6KUSm6B6Y1XUfwJMjAEXxXdai7RodznXV8pCoJMGyn2GN7ClGCq6qHqtSerxdymGHNVpR7pXZ1tF/mI7JIsF+NFErmZJcW79pl7m5ZoZNR+SIDexdg1/IydduGwIDAQABo4IBnzCCAZswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFArEHsfdZvlpOxPguP9/En90/NMgMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFcGA1UdEQRQME6CDmdpZHAuZ2VhbnQubmV0ghNpZHAxLmdpZHAuZ2VhbnQubmV0ghNpZHAyLmdpZHAuZ2VhbnQubmV0ghJ3d3cuZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEFBQADggEBAH56nltzImiMVOv5DJxcTo2cpGBWPO+OI7S1Ns76cS6PzWbkm/zjPPZI871Pfgw6n3Q3V3Kpc48hRyx3WPH/9nk+YnFEUjkjaRCzeWR6A2oYSb83iI2n/33+E2AmyZ1FX5E1nfxRtSBLYyHPdXYQ6A/TN4qtm/9QHrbcISPEQJwvJn4/BOQDrvsjZDJeq7Srrr2An//RpNdC9cA4wU+m0oJPbPHGl32ENO6JVK7gJPYw2WBDER1SMwAEThtUthQyZhp1z6jA/hoeHfM4QR2/mT458LpRXs1c5VGAeC+4pjfJ4skXAU17Nq+ut8+fJMjjQSXOpv10kS2jNq2XfPmN+K4=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/simplesamlphp/saml2/idp/SSOService.php"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
- <OrganizationDisplayName xml:lang="en">GEANT Identity Provider</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>eduGAIN OT</GivenName>
- <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>eduGAIN OT</GivenName>
- <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gidp.geant.net/sp/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://gidp.geant.net/sp/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://gidp.geant.net/sp/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://gidp.geant.net/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">GEANT SP Proxy</md:ServiceName>
+ <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="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="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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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="false"/>
+ <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <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="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">GEANT</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">GEANT</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.geant.net</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>edugain-ot@geant.net</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iam.cf.ac.uk.xml b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
index e3f54037..123d41e3 100644
--- a/swamid-interfederations-2.0/iam.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iam.cf.ac.uk/sp/shibboleth">
- <!--
- This is a IAM@Cardiff Shibboleth SP for Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-22T13:42:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
index 59b543d0..6139f822 100644
--- a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dev.cardiff.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth 2 test IdP for Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-20T15:18:56.122159Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
index 546b3910..348badbd 100644
--- a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-preprod.cardiff.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth test IdP (clustered with Terracotta 3.0) for Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-25T18:02:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml
index 98f5ead2..0aaf6de9 100644
--- a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-test.ucs.ed.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-test.ucs.ed.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for the University of Edinburgh.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-30T17:05:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
index 2e3a2ed9..f497452e 100644
--- a/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.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.cardiff.ac.uk/shibboleth">
- <!--
- This is a Shibboleth IdP (running clustered with Terracotta 3.0) for Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-10-23T17:54:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.company.ja.net.xml b/swamid-interfederations-2.0/idp.company.ja.net.xml
index 7f61c336..6863a333 100644
--- a/swamid-interfederations-2.0/idp.company.ja.net.xml
+++ b/swamid-interfederations-2.0/idp.company.ja.net.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.company.ja.net/idp/shibboleth">
- <!--
- This is a Janet Shibboleth IdP for JISC Collections and Janet Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-30T16:21:51Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.cs.cas.cz.xml b/swamid-interfederations-2.0/idp.cs.cas.cz.xml
new file mode 100644
index 00000000..bd19da5a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cs.cas.cz.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.cs.cas.cz/idp/shibboleth">
+ <Extensions>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ <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>
+ <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">cs.cas.cz</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Institute of Computer Science AS CR</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Ústav informatiky AV ČR</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider ICS AV CR employees.</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance UI AV ČR</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ustavinformatiky.cz/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://www.ustavinformatiky.cz/</mdui:InformationURL>
+ <mdui:Logo height="44" width="50">https://jiftach.cas.cz/loga/logo-ui-44.png</mdui:Logo>
+ <mdui:Logo height="400" width="450">https://jiftach.cas.cz/loga/logo-ui-400.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVAKK9oHWp4NhakdhRINFSNcMlO+RbMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC5jcy5jYXMuY3owHhcNMTQwNDIzMDk0MjA0WhcN
+MzQwNDIzMDk0MjA0WjAYMRYwFAYDVQQDEw1pZHAuY3MuY2FzLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjjkBmvDKH/5+UN1okmPOjP4WiCHwmGw7
+KQ9Zxk/myiYmAgk9qF/0PTHMdli5C4rbSbffG+G+28B6N+hJL8GoCL5+BSfKxjsq
+0EkXH81pbIl6/V9X888aitvMa8sKYcI5SUaTdv5DfO9KPizzDh4q7ckC3pyYvYT9
+fM30sxWOSoNHgMCPEg6kUt7BViZCGqzuucqJ/OIh01GLcsu56YH7FYWSQZ6gxCjk
+mqAPSwsFveWweKxIzv/Fudact5JA2OPv6E0QtxiZl2IrrbszCTfiihqvd4Kkh2gz
+3KAI7B8HS0obOhYoi6VSNVJ2CpyQOff2M1HmIeyTe0up4bEGnbu81QIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAuY3MuY2FzLmN6hiRodHRwczovL2lkcC5jcy5jYXMu
+Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO+bvv+xOMV6uPQ6HEydpZESVVHW
+MA0GCSqGSIb3DQEBBQUAA4IBAQAIvc78aeMLcz35NBrOwdpFTkyjxddzw8In/WkZ
+f460lIhMMqc4wBe2fdqUx6OOkGDOGFTt4nWhLxp5+RI4v6ZwawGmZBxTBWxJgCrI
+2wOrZ+LAjcah4H+dESHtufvkv5GpcpHaqclECIJBSdBw40JO0GaIRHfNAnpLW8Uu
+QMhmIIxoZBWR/Fw+FJbKlseHsLR67FxmkuIrj9a+R3tL63j6xktGkzh3pvmjzTu9
+V7TvWrHG4VLa2B+cw1DTHx53iXciC7lcUmrv6FmsoEn023Vo9SMPCCpyoYGnKmRl
+DWUUP6NhKsUBrx0ErS47MREL3/a9Ck6rJ1bJssJLAir38Sk4
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.cas.cz: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>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cs.cas.cz/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.cas.cz/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">cs.cas.cz</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVAKK9oHWp4NhakdhRINFSNcMlO+RbMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC5jcy5jYXMuY3owHhcNMTQwNDIzMDk0MjA0WhcN
+MzQwNDIzMDk0MjA0WjAYMRYwFAYDVQQDEw1pZHAuY3MuY2FzLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjjkBmvDKH/5+UN1okmPOjP4WiCHwmGw7
+KQ9Zxk/myiYmAgk9qF/0PTHMdli5C4rbSbffG+G+28B6N+hJL8GoCL5+BSfKxjsq
+0EkXH81pbIl6/V9X888aitvMa8sKYcI5SUaTdv5DfO9KPizzDh4q7ckC3pyYvYT9
+fM30sxWOSoNHgMCPEg6kUt7BViZCGqzuucqJ/OIh01GLcsu56YH7FYWSQZ6gxCjk
+mqAPSwsFveWweKxIzv/Fudact5JA2OPv6E0QtxiZl2IrrbszCTfiihqvd4Kkh2gz
+3KAI7B8HS0obOhYoi6VSNVJ2CpyQOff2M1HmIeyTe0up4bEGnbu81QIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAuY3MuY2FzLmN6hiRodHRwczovL2lkcC5jcy5jYXMu
+Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO+bvv+xOMV6uPQ6HEydpZESVVHW
+MA0GCSqGSIb3DQEBBQUAA4IBAQAIvc78aeMLcz35NBrOwdpFTkyjxddzw8In/WkZ
+f460lIhMMqc4wBe2fdqUx6OOkGDOGFTt4nWhLxp5+RI4v6ZwawGmZBxTBWxJgCrI
+2wOrZ+LAjcah4H+dESHtufvkv5GpcpHaqclECIJBSdBw40JO0GaIRHfNAnpLW8Uu
+QMhmIIxoZBWR/Fw+FJbKlseHsLR67FxmkuIrj9a+R3tL63j6xktGkzh3pvmjzTu9
+V7TvWrHG4VLa2B+cw1DTHx53iXciC7lcUmrv6FmsoEn023Vo9SMPCCpyoYGnKmRl
+DWUUP6NhKsUBrx0ErS47MREL3/a9Ck6rJ1bJssJLAir38Sk4
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.cas.cz: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">Institute of Computer Science Academy</OrganizationName>
+ <OrganizationName xml:lang="cs">Ústav informatiky AV ČR</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Institute of Computer Science Academy of Sciences of the Czech Republic</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="cs">Ústav informatiky AV ČR, v.v.i.</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ustavinformatiky.cz/</OrganizationURL>
+ <OrganizationURL xml:lang="cs">http://www.ustavinformatiky.cz/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Petr</GivenName>
+ <SurName>Vaníček</SurName>
+ <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index c7c70c4c..c26902b0 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi.xml
@@ -1,32 +1,33 @@
<?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>
+<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" 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 regexp="false">csc.fi</shibmd:Scope>
<shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
+ <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>
+ <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
<mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
<mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
- <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
<mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
<mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
<mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
</mdui:UIInfo>
- <mdui:DiscoHints>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DomainHint>csc.fi</mdui:DomainHint>
<mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
<mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
</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>
+ </Extensions>
+ <KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
@@ -62,27 +63,27 @@ OrrMi7TzCc5DvLYpuskPWaTstbxW2d+c/wWX+2eaC51BUS4SRgc2QXGj4YgEmYvT
yfHB/Vk5J4H+DO2SNiPj868WRhf2sTanPMS7LxqSsL+wiOXVBbISe+c=</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.dante.net.xml b/swamid-interfederations-2.0/idp.dante.net.xml
index 69539885..505407b5 100644
--- a/swamid-interfederations-2.0/idp.dante.net.xml
+++ b/swamid-interfederations-2.0/idp.dante.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.dante.net/idp/shibboleth">
- <!--
- This is a DANTE Shibboleth IdP for Delivery of Advanced Network Technology to Europe Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T09:32:28Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.ebi.ac.uk.xml b/swamid-interfederations-2.0/idp.ebi.ac.uk.xml
new file mode 100644
index 00000000..eae2d04f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ebi.ac.uk.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ebi.ac.uk/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-04T10:43:30Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ebi.ac.uk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">European Molecular Biology Laboratory - EBI</mdui:DisplayName>
+ <mdui:Logo height="30" width="95">https://idp.ebi.ac.uk/images/EMBL_EBI_logo_95x30.png</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://idp.ebi.ac.uk/images/EMBL_EBI_icon_16x16.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDHzCCAgegAwIBAgIUWQaCmO3/wgoyUm1kMsbfovSvHTcwDQYJKoZIhvcNAQEF
+ BQAwGDEWMBQGA1UEAxMNaWRwLmViaS5hYy51azAeFw0xMjAzMjIxNzE4NTVaFw0z
+ MjAzMjIxNzE4NTVaMBgxFjAUBgNVBAMTDWlkcC5lYmkuYWMudWswggEiMA0GCSqG
+ SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMiq+DPwgvEvXHVvsqsWViCDVZv/q+qWZf
+ AAFse/KaiA0HPbdailVUaFg/s3ce4elzfWpEbHBoeb+SIVkQPNwmtpVgix92H7dj
+ 0YEkYBiSvTDTp54b76yKjFKOpWGGYis+pWY8D8WwWeHce+nHxrCOHB0oCHageY1j
+ bONXdq3AI4153yWAX62za7/F7bdOM+RuDzCj+ezqzRJEk2pP49ZFsaAbVbLfFMqt
+ IgCEclMephDqXLM8MlgP3KIzaq9PhSC4vXS3xxKTbMfRqT+Dzgt1pZvY3jY2T702
+ i99SOhame/gdYXiILCD2XjKnjZhFSNMfvy/FfQDCpx++yFTXEFZzAgMBAAGjYTBf
+ MD4GA1UdEQQ3MDWCDWlkcC5lYmkuYWMudWuGJGh0dHBzOi8vaWRwLmViaS5hYy51
+ ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdskpfLSwe6x0/paoWOMdXjPcSZ4w
+ DQYJKoZIhvcNAQEFBQADggEBAA7P/MO6GYM8Qev0usgkT58VRk1uRQMqFUc+cGUP
+ QEhjFILRIwlAKyQzT5hg6wMRdFcgbye5NSDx23GCL3UqqoNpMmZ/wd/cSNuwd/TZ
+ ZDLn4NCFoBv/MbHzKwQPa0E4lD5eiPtwtm3SlRqfSCAL/FMK2RC5DtmKKVPIzBoN
+ XjfN5xEXaK1Fqt+IcN1iKY7gEs115CL5oeing5GRNtUpW2/FGPKy2OYFhmIQs93n
+ xDj3eBfFJMqdPg8M/NzlVInJNekNUhBnfSMA15q8OUd02msz0euhp0hZeA90XAuV
+ TswW9HqCAz4FI9WefVN4dcmt6/h29ZZTyHBqC8AhQpJlvuc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ebi.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ebi.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDHzCCAgegAwIBAgIUWQaCmO3/wgoyUm1kMsbfovSvHTcwDQYJKoZIhvcNAQEF
+ BQAwGDEWMBQGA1UEAxMNaWRwLmViaS5hYy51azAeFw0xMjAzMjIxNzE4NTVaFw0z
+ MjAzMjIxNzE4NTVaMBgxFjAUBgNVBAMTDWlkcC5lYmkuYWMudWswggEiMA0GCSqG
+ SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMiq+DPwgvEvXHVvsqsWViCDVZv/q+qWZf
+ AAFse/KaiA0HPbdailVUaFg/s3ce4elzfWpEbHBoeb+SIVkQPNwmtpVgix92H7dj
+ 0YEkYBiSvTDTp54b76yKjFKOpWGGYis+pWY8D8WwWeHce+nHxrCOHB0oCHageY1j
+ bONXdq3AI4153yWAX62za7/F7bdOM+RuDzCj+ezqzRJEk2pP49ZFsaAbVbLfFMqt
+ IgCEclMephDqXLM8MlgP3KIzaq9PhSC4vXS3xxKTbMfRqT+Dzgt1pZvY3jY2T702
+ i99SOhame/gdYXiILCD2XjKnjZhFSNMfvy/FfQDCpx++yFTXEFZzAgMBAAGjYTBf
+ MD4GA1UdEQQ3MDWCDWlkcC5lYmkuYWMudWuGJGh0dHBzOi8vaWRwLmViaS5hYy51
+ ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdskpfLSwe6x0/paoWOMdXjPcSZ4w
+ DQYJKoZIhvcNAQEFBQADggEBAA7P/MO6GYM8Qev0usgkT58VRk1uRQMqFUc+cGUP
+ QEhjFILRIwlAKyQzT5hg6wMRdFcgbye5NSDx23GCL3UqqoNpMmZ/wd/cSNuwd/TZ
+ ZDLn4NCFoBv/MbHzKwQPa0E4lD5eiPtwtm3SlRqfSCAL/FMK2RC5DtmKKVPIzBoN
+ XjfN5xEXaK1Fqt+IcN1iKY7gEs115CL5oeing5GRNtUpW2/FGPKy2OYFhmIQs93n
+ xDj3eBfFJMqdPg8M/NzlVInJNekNUhBnfSMA15q8OUd02msz0euhp0hZeA90XAuV
+ TswW9HqCAz4FI9WefVN4dcmt6/h29ZZTyHBqC8AhQpJlvuc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">European Molecular Biology Laboratory</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">European Molecular Biology Laboratory - EBI</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Jenny</GivenName>
+ <SurName>Martin</SurName>
+ <EmailAddress>mailto:jenny@ebi.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Jenny</GivenName>
+ <SurName>Martin</SurName>
+ <EmailAddress>mailto:jenny@ebi.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ed.ac.uk.xml b/swamid-interfederations-2.0/idp.ed.ac.uk.xml
index 0a96e7f9..19d446f1 100644
--- a/swamid-interfederations-2.0/idp.ed.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.ed.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.ed.ac.uk/shibboleth">
- <!--
- This is a Shibboleth IdP for the University of Edinburgh.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-10T09:51:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.elte.hu.xml b/swamid-interfederations-2.0/idp.elte.hu.xml
new file mode 100644
index 00000000..a9dccbf7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.elte.hu.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.elte.hu/auth/saml2/idp/metadata.php">
+ <Extensions>
+ <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">elte</ns9:MetadataSet>
+ <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+ <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+ <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elte.hu</shibmd:Scope>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <mdui:GeolocationHint>geo:47.49005,19.05955</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFYzCCBEugAwIBAgIQLIaNDr+iCPZ0Iz6P3Q9VqTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowOTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuZWx0ZS5odTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANI/ii7DympWU2khMzlPc5m0zeArm9zB6yLik398aLncEEXj9uAXqmZlzD3PlmEehRV554zhjuzPxGS1poQHM/em9ctBQXH3sdcNmTi3aRUldO0nr3uH/g38SF2lfZdw+A8wlLYHu3e3nxHKrwIFxRR7pNdB1DitfWZ7VArrxt2djsaIOXsECEtos3AyEospySVC/pGwimJv/z3AgykdeBVpHB6X9ftn4ptuM+0/ZQgaN7ktP+sR2mcOdgu+ip28rxLS4hd2NNMmfsb1jy14YMKKD8ryWb0fI0yyaKKz3AC9DBdKB4o8i/jpBQTsjq0MppL6LT6iDEBb1IO7OagN0eAPTt+lMPmW2EPUg3HLZVPYKRHqsaUdE3+gMTTOd8HEc39oRDLaFjsD0H7hoLY9DL3Q/CcwYOyCNYbLdzXFn1Cj04T2Oxj94Xw0zAp2Pw0WE9iIzpi/izca7DW8WiEEFIPLCDVIqi80GY4AZWFEbTV+I3wDCTfF5lNY67XhH7pWhU5dWJaD5XPYahQd1kvejA1+hviqhMQkZvkRTmCMZHpv9amjmFg1CEgk7XGSO5/Rj7fNjSTZ5Ysuh2wjjDWdIn5sIe1UCVJEqEVCZj1iBU3WXvpDv6Kn6Vr2Zz2jgm4S9CjGOIpueB4MjInVoJFOHOsKB63tpuDNSJGj7E/XKCWlAgMBAAGjggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUb9JqTdA6YG8FiGd1gBUvIHMdjA8wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBYGA1UdEQQPMA2CC2lkcC5lbHRlLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQBOvYggdrH+sTjvU6TRdCOUAFs5YOK//s0xCbiC/E1rfb04dSPDSUdjLwOv6bP06N64EugFZakJIweWUPREy5lNP1F3d9JClPMmCJNYlbNJ7R750lWHudqTvJ1AU3emNED+Vgp2iBtdyYZHrHMHi+z296f4HxF3V95hhCswMCMaw3+NC4WTr7Y84ygGprMRQDWhQTwx06glpjl8h59UdtS9EjSB6KBjkgrG/+S37MMUrppeyFis715FtYLoBjz/oLvqNch2KYKThfoW1BrTQZpCq+sot1908yBhyUSJRsLqWra9NGM1E1Y+4NLbGwAHhPtuRMGIYDWks3zoyVFm6PvO</ds:X509Certificate>
+ </ds:X509Data>
+ <ds:KeyName>idp.elte.hu</ds:KeyName>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.elte.hu/auth/saml2/idp/ArtifactResolutionService.php" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elte.hu/auth/saml2/idp/SingleLogoutService.php"/>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elte.hu/auth/saml2/idp/SSOService.php"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="hu">Eötvös Loránd Tudományegyetem</OrganizationName>
+ <OrganizationName xml:lang="en">Eötvös Loránd University Budapest</OrganizationName>
+ <OrganizationDisplayName xml:lang="hu">Eötvös Loránd Tudományegyetem</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Eötvös Loránd University Budapest</OrganizationDisplayName>
+ <OrganizationURL xml:lang="hu">http://iig.elte.hu</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://iig.elte.hu</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>ELTE IIG Informatikai Szolgáltatási Osztály</SurName>
+ <EmailAddress>mailto:system@caesar.elte.hu</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <SurName>ELTE IIG Informatikai Szolgáltatási Osztály</SurName>
+ <EmailAddress>mailto:system@caesar.elte.hu</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <SurName>ELTE IIG Ügyféltámogatási Osztály</SurName>
+ <EmailAddress>mailto:operator@caesar.elte.hu</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.epfl.ch.xml b/swamid-interfederations-2.0/idp.epfl.ch.xml
new file mode 100644
index 00000000..13241ee3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.epfl.ch.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.epfl.ch/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-06-26T08:42:04Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor errorURL="http://support-it.epfl.ch/" 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">epfl.ch</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">EPFL - EPF Lausanne</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">EPFL - EPF Lausanne</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">EPFL - EPF Lausanne</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Eidgenössische Technische Hochschule Lausanne</mdui:Description>
+ <mdui:Description xml:lang="en">Swiss Federal Institute of Technology Lausanne</mdui:Description>
+ <mdui:Description xml:lang="fr">Ecole Polytechnique Fédérale de Lausanne</mdui:Description>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAe0lEQVQ4Ed2QUQqAMAxDq3j/K08ymhDKnGz4pSBLu/SRLuJXX8ttcPL3Bb1Hb5w2dJibWsa8Y19WAtQw4eYKkg0AXLpZl0UMPbMEZX5czgCPsR1FAMw+QI3Y1Dx9Pq6s6n5vtSBMoMaq+ATge64E6G+ym4Bv1AjYSdEhN3OaFRR7lkw7AAAAAElFTkSuQmCC</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+hkAAAhsSURBVHic7FtpjBRFFH471+7MLPd9ugEFkfsUCMilyOWuiIDArqAiKAiogOCBohGiIqeICkpE8EoMUQLEQIwxiMiRIP7wj/4QY2L0h/EEE5S1Puor+m0zwyE7dHrkJd/2dFV113tfv3r1qrpXKisr5TL+OwJXIOwIXIGwI3AFwo7AFQg7Alcg7AhcgbAjcAXCjsAVCDsCVyDsCFyBsEM+TRVX5hKfG7yZTK0oLCgQI/jzhYHpWX40qGFQwnPgCYN56nyonCnbWHfcoKXBI6o9zqUsFu97KMd2OeScQGPIifJ4oiWNH6WMnc0yP4Exg294fthHXgeDk6xbyTJNYEleEfiZwY5k+r161vsgu2nozwbJLARCHlZlvRWB61l2wqB53hMIIxYmCofRUHjhPzT0BUVKJgI7qrIlLEsZ/Mayber6/CXQxL+fekWjURr6gDL02nMQGDE4xrLtLBuj2o3NewL3GWxNpjen5Yzh+72IV5iFQMhRlu3l+Ws8/8ugOO8JPGjwdGHRVBoZN/iTRm6SqpKNwB9Y9iHPv+b5x77r85PAQ6kalRPj8S40srMycsZ5EFhTvHj5vEEd8WbfZ/4XBO5PFZ/sE426mXacMnLIeRBYqspuFBsz3fkdeU/gXoNPzATSOhJxRs5VRvY1qE0vy0bgBzz/TmxeOFa1Gcfra+c1gbuS6a8aefnfUmVkpSInE4E3iDdc72WbezJcD8QzEVgai/cONYFIoHcm04fregSuvAACOxkMNBhg4FKgORdC4MhYvOfBPCDwiCJwmTJyGAnqk4XATKIJvI/XA+hgvp/AUbF4r1ATiCG8O5X+tolH4CJlZGMfORdKYF9f3XRVhxWMDI3F2oeewD2p4uNtI6dnkanKyB7VTKCesUegoFskWmtfmAkEDhgMisZKaOR1ykh/GnKxBF6t6hagoLHx/N2p4qN7w0wgEunp8cStNBIpy9808tVqJhATza+iNhlQsLEo9db+MBMI5dcVJdeqRe8B8dbCEUXAxRII2cq634XbZDPjhRWXIpXJGYEYPh+l0kebF0Qch48pEgZUM4ETVP0kFLQ3cdDocSzXwzjn+4Hl8cRgGnmleAmy3lCoDgLhdb+wfh8KMIzNCNh8IMwE4n3IO8nUjqS3e7WdRuJ9RosLIHDGOQiE6GS9PwoGRGPdsSbPKYHIl3KJL81kUhFP9KeReKdxgka+Xc0ENjX4g232GBTAC9cUJrccMToc4oiobsiwWGxOLjHCoF80NlxNJpiZ5xN4K1dLnWcjp6tq0yxLG8gI1a4hCpoVRBqUxeLzR+UIZ9HlslyWSyQJsa6fCFqRsAq+BMAuMRbi2LzE2hJ52i1id0yKxL4QR3zCMqwp2+HdbQ3eo4HYbaXxvnuXGyCNuYvn7QwGEZPFJtRYik1h/WiDXvyN/rFzM5T3xkPuwj5KxdvZ7sf7YR8R+SBSGmzgYg5J8NpCsXG0K69JUKcYbevJchz7816lLJsmNgUT9tOROt8vfDu4mJWI85jt3E4vpJ7YnZQi1fEG/l7uI2uJVH3bJrxfI4MHDeobPKrqQCw2GUrE+0oBBq0yqEtlnbjZGYTfzWsc+aN9+jpdnKzmEaRgGdmZ525NDhKwwdFUqq7TZ7F8HusgAw2uETuRzXb2Yq/ueoO2Yl/g+MX/Fu1FHpf5yjeL9RotILADO8bTna7qQMBaqUogBBuq+sU7RKc3IPA2sRsUFeIRouUl8fYM32AZCGxI/eFRE1nuCLxZqr6v6WZwp2QmsCl1xDXypLpoERs4gevjfWwtVbaYx1U+pZfImQIC3f4f3qxtUHWtxT7xErErjbPd6yn123kgBEN6nk9f//XaA2E4RtNGsa8JII5AONBCdV2ZQXuxQ7gDy+DtGFH4rOT0Q18jdjjBQ/D5BEgcz8Zd2SniHZ7OTQatxHoPnjLiE96aIQauExs36iglZtFIJ3hieKoD2AfiFGLKShoIUvHS/FmxwxmCsLFCvDACg7DeHcFz3A/xbBT7B4nLeYxRz2LWu71IhKnH+bucfbt7QS949zL2iXCCfA8hxe0ugdDnpGr4uCw+wXBH7IYTDBT7oGue7QIncNFsKwIn8Mo+52iTL4KJAl4YydYAgRhDCkO4RGx64VwTbo/hjeHiAuwVYt1+jGozUOzwdoKh44YLhunt4n3P0oR9jJWqszbCAYbScLFhQXgNJh6kM/VV227sU4v7DC7K+7v+YAuGbBuxQ9O1Q9/6I6fB6jeGKOJfDdU+wnulxaZj453Ni9kAscblcy6pxiTgdk0wa01hmzm+NvDa+ayD4IHoQK5/p8XLzbTg3lfxNwK4yx1X09i4aotcUc/4qMOmqou/S1WdC/bz2KeLpcj3dNaBSdFNLCCoB+3ZJV5u6nRC+oR4eYoDBGw8/U68YKNSThMIeV28CWOMagOPmCyeR6HuIWWQn0D04U+6p4hHIGQNj9i1maAMh2C06AA+nDpMy9CfIxBe9b7SaRLrXIoylragL6Q5XWgrUryXxU6eFWwLPTFRnUq2XY51Lg9MULFMHthd7NOEkWkqBi9yTzSTB/qXjlPEIxDDZRF/r87Q1u+BeFeMuO1IXypezJrJIx5uK94XaRlWEggNc1lfziNSGXwR4QjEw0F2sl68dAspz2kPRKLpZhe47iZehE6wDY8n0o0G1mebVwxGqjYu3VlGclzuh8wfq4MtYtMA3LcF+4TXN1Qk4APMybwXYibCApZlO8WGhDaq7Uj2hXsMoTGOSJACgqfzOI51Lt8rI2kupsIW5HWLxQsTC0hgO/E+L0E8fJe/sXzEgx0d+L8JhB2BKxB2BK5A2BG4AmFH4AqEHYErEHYErkDYEbgCYUfgCoQdgSsQdgSuQNjxLwAAAP//AwBkyVWrN8BywQAAAABJRU5ErkJggg==</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>2001:620:618::/48</mdui:IPHint>
+ <mdui:IPHint>192.26.28.0/22</mdui:IPHint>
+ <mdui:IPHint>192.26.28.0/24</mdui:IPHint>
+ <mdui:IPHint>128.178.0.0/15</mdui:IPHint>
+ <mdui:IPHint>192.26.29.0/24</mdui:IPHint>
+ <mdui:IPHint>128.178.0.0/16</mdui:IPHint>
+ <mdui:IPHint>192.26.30.0/24</mdui:IPHint>
+ <mdui:IPHint>128.179.0.0/16</mdui:IPHint>
+ <mdui:IPHint>192.26.31.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.32.0/20</mdui:IPHint>
+ <mdui:IPHint>192.26.32.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.33.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.34.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.35.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.36.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.37.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.38.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.39.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.40.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.41.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.42.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.43.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.44.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.46.0/24</mdui:IPHint>
+ <mdui:IPHint>192.26.47.0/24</mdui:IPHint>
+ <mdui:IPHint>192.33.192.0/20</mdui:IPHint>
+ <mdui:IPHint>192.33.208.0/22</mdui:IPHint>
+ <mdui:DomainHint>epfl.ch</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:46.520515,6.565576</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAPOb5N7pnCviMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2lkcC5lcGZsLmNoMB4XDTEzMDQxODA5MTM0MFoXDTE2MDQxNzA5MTM0MFow
+FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDIBrHGK9eROQuDVC8YG/Q1Cv31Fvc8JdezQOgqqkASU6PvymRDEmLQ
+3Y9hNPB6YgkcF5UJzGTPMvoLMnIkqAiT+J11bMpHXrimLz+v6xwFxQb8at8qKbz7
+3LpyUdwGe9fZDoVgyXHCl/fKxTdeUI/yskSD3w1SQIasIKnb5Qr/lDQ+yCqq2iYK
+wNe5PnPd/XVxjfD09FmkXfYRLQVA5h4XH+q1HlhdpchB/DB9qxZcxalwaTQw70mG
+HLOsl+4Flehsi18gCjMyaX/EO6rYzDMbXm1GvhkobZ1YcRzJRvb8J//TjJgxue3K
+VRAyULjs517E1jJHnRBvEBg9yxZLd/9TAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBQ/WGIfS2XSjumGqpYplSwMU52FhTANBgkqhkiG9w0BAQUFAAOCAQEA
+mejhQf4W7YHubVMVqZ7N7Zq6mGRY9TJSp0w88Ehvv0LfLKfyvwbqrrbbTYP9ERr+
+ufnrYUTclvVlSlutkLuGrJ1YkIjhEc6qqPLdtUAHE3cJpAYZMK4zGCmbg64eQBTt
+/UiBgOx6UgoS1m7ix6F7qS37iqGYngwanb0HoNRjYAP2cqAxVdmS8sLGERWRWzn9
+jV9Dj9Wwx4s9vL5rS6OxV8OXi42yQ+dfBR+eih6ebNEs+SbbWhLi83/U60WFwa1P
+btvDbgeRSa7SgaA72pCtk5Blb9fArSq5yBXqARTtXFMaH8hZOd3iu9h4Mnsl8879
+EyP/QDjoD02nYu++815n4g==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.epfl.ch/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.epfl.ch/idp/profile/SAML2/Redirect/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.epfl.ch/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.epfl.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>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAPOb5N7pnCviMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2lkcC5lcGZsLmNoMB4XDTEzMDQxODA5MTM0MFoXDTE2MDQxNzA5MTM0MFow
+FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDIBrHGK9eROQuDVC8YG/Q1Cv31Fvc8JdezQOgqqkASU6PvymRDEmLQ
+3Y9hNPB6YgkcF5UJzGTPMvoLMnIkqAiT+J11bMpHXrimLz+v6xwFxQb8at8qKbz7
+3LpyUdwGe9fZDoVgyXHCl/fKxTdeUI/yskSD3w1SQIasIKnb5Qr/lDQ+yCqq2iYK
+wNe5PnPd/XVxjfD09FmkXfYRLQVA5h4XH+q1HlhdpchB/DB9qxZcxalwaTQw70mG
+HLOsl+4Flehsi18gCjMyaX/EO6rYzDMbXm1GvhkobZ1YcRzJRvb8J//TjJgxue3K
+VRAyULjs517E1jJHnRBvEBg9yxZLd/9TAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBQ/WGIfS2XSjumGqpYplSwMU52FhTANBgkqhkiG9w0BAQUFAAOCAQEA
+mejhQf4W7YHubVMVqZ7N7Zq6mGRY9TJSp0w88Ehvv0LfLKfyvwbqrrbbTYP9ERr+
+ufnrYUTclvVlSlutkLuGrJ1YkIjhEc6qqPLdtUAHE3cJpAYZMK4zGCmbg64eQBTt
+/UiBgOx6UgoS1m7ix6F7qS37iqGYngwanb0HoNRjYAP2cqAxVdmS8sLGERWRWzn9
+jV9Dj9Wwx4s9vL5rS6OxV8OXi42yQ+dfBR+eih6ebNEs+SbbWhLi83/U60WFwa1P
+btvDbgeRSa7SgaA72pCtk5Blb9fArSq5yBXqARTtXFMaH8hZOd3iu9h4Mnsl8879
+EyP/QDjoD02nYu++815n4g==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch: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">epfl.ch</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">EPFL - EPF Lausanne</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">EPFL - EPF Lausanne</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="fr">EPFL - EPF Lausanne</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.epfl.ch/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.epfl.ch/</OrganizationURL>
+ <OrganizationURL xml:lang="fr">http://www.epfl.ch/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>AAI</GivenName>
+ <SurName>EPFL Team</SurName>
+ <EmailAddress>mailto:aai@epfl.ch</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>AAI</GivenName>
+ <SurName>EPFL Team</SurName>
+ <EmailAddress>mailto:aai@epfl.ch</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index 7c6e5e89..a86a67ee 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,356 +1,365 @@
<?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">andebu.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">aremark.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">arendal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">as-skole.no</shibmd:Scope>
- <shibmd:Scope regexp="false">askim.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">askoy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">askvoll.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">asnes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">aure.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">austagderfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">austevoll.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">austrheim.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">averoy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">baerum.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">balestrand.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bamble.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">bardu.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">boe.kommune.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">eidsvoll.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">elverum.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">enebakk.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">etne.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">etnedal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">evenes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fedje.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.afjord.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.ahk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.amot.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.farsund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.kg.vgs.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.levanger.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.lund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.mosseskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.nlm.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.oknett.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.osen.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.osloskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.rade.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">feide.ringerike.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.ski.kommune.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">feide.verdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fet.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fitjar.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fjaler.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fjellhaug.no</shibmd:Scope>
- <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">flatanger.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">fosnes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">frogn.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">froland.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">frosta.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">froya.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">fusa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gaular.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">giske.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gjemnes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gjerdrum.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gjesdal.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">gran.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">grane.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.haram.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gs.skodje.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gs.sula.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">gulen.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ha.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hadsel.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">haldenskole.no</shibmd:Scope>
- <shibmd:Scope regexp="false">halsa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hamar.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">haraldsplass.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hbv.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
- <shibmd:Scope regexp="false">hemnegs.fronter.com</shibmd:Scope>
- <shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">heroy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hials.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hib.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hibu.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hifm.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hig.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hih.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hihm.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hil.no</shibmd:Scope>
- <shibmd:Scope regexp="false">himolde.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hin.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hinesna.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hint.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hioa.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hiof.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hisf.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hist.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hit.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hitra.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hive.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hivolda.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hjartdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hjelmeland.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hobol.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hol.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">holeskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hornindal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">horten.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hoyanger.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hoylandet.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hsh.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hurdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hyllestad.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
- <shibmd:Scope regexp="false">jolster.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
- <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
- <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
- <shibmd:Scope regexp="false">klabu.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">klepp.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kongsberg.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">kongsvinger.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">lardal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">larvik.kommune.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">lenvik.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">lunner.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">lybskole.no</shibmd:Scope>
- <shibmd:Scope regexp="false">lyngdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">malselv.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">malvik.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">marker.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">masfjorden.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">meland.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">meldal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">melhus.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">meraker.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">met.no</shibmd:Scope>
- <shibmd:Scope regexp="false">mf.no</shibmd:Scope>
- <shibmd:Scope regexp="false">midsund.kommune.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">namdalseid.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">namsos.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nannestad.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">naustdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">nes-ak.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">overhalla.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">ralingen.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rana.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">randaberg.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rauma.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rennebu.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">rennesoy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">ringebu.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">sandnes.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">seljord.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">sfj.no</shibmd:Scope>
- <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
- <shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">skoler.alta.no</shibmd:Scope>
- <shibmd:Scope regexp="false">smola.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">snasa.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">snillfjord.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">sogndal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">sola.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">solund.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
- <shibmd:Scope regexp="false">stange.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">stavanger.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">steinkjer.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">stfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">stjordal.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">stokke.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">torsken.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">ullensaker.kommune.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">vestvagoy.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
- <shibmd:Scope regexp="false">vik.kommune.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">andebu.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aremark.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arendal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">as-skole.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askim.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askvoll.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aure.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austagderfk.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austevoll.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austrheim.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">averoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baerum.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balestrand.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bamble.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bardu.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">boe.kommune.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">eidsvoll.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">enebakk.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etne.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etnedal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evenes.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fedje.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.afjord.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ahk.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.amot.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.farsund.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.kg.vgs.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.levanger.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.lund.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.mosseskolen.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nlm.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.oknett.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osen.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osloskolen.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rade.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ringerike.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.ski.kommune.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">feide.verdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fet.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">fitjar.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjaler.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjellhaug.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">flatanger.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">fosnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frana.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frogn.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froland.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frosta.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froya.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fusa.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gaular.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">giske.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjemnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjerdrum.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjesdal.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">gran.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grane.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.haram.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.skodje.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.sula.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gulen.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ha.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadsel.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haldenskole.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halsa.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamar.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haraldsplass.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hbv.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnegs.fronter.com</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemsedal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy-no.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hfk.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hials.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hib.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hibu.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hifm.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hih.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hihm.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hil.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">himolde.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hin.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinesna.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hint.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hioa.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiof.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hisf.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hist.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hit.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hitra.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hive.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hivolda.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoyanger.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoylandet.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsh.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hyllestad.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jolster.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karmoyskolen.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khib.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khio.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klabu.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klepp.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsberg.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsvinger.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">lardal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">larvik.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ldh.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leikanger.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leirfjord.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lenvik.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">lunner.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luster.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lybskole.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malselv.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malvik.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marker.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">masfjorden.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meland.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meldal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">melhus.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meraker.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">met.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">midsund.kommune.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">namdalseid.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsos.kommune.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">nannestad.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">naustdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-ak.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">overhalla.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">ralingen.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rana.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">randaberg.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rauma.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennebu.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennesoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ringebu.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">sandnes.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">seljord.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfj.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skaun.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.fredrikstad.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.svk.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skoler.alta.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smola.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snasa.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snillfjord.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sogndal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solund.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorum.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spusers.feide.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stange.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stavanger.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">steinkjer.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfk.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stjordal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokke.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">torsken.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">ullensaker.kommune.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">vestvagoy.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">vik.kommune.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>MIIDhjCCAm4CCQCZwrMQOJ3URzANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0xNDA0MTEwOTM1MTBaFw0zNDA0MTEwOTM1MTBaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3UtSny6D+DRQzdjWOdd+eQZxa9aKrx/v70Uo+yvnzgenLLS+MsUxbiSLkAPIbkWOO2kLdG9XSZ9sp9S5aGYMnsarxeGEXV1AS6olrpo5QJOZoQStFB0dYEXzBSJifTIsEmyXByd8mE64dkMcdzG90eBzfcFNwU6vKjln0vmoDocJrKZvUoF7d1egD+aUa9o3BneMDylcp8mkCe6XcnPlJ8QqxQ/RBmaly/Hl/zTZei8+pEu7ICRiorD2iHEDM/EhsclOrMKiRFBuZN8yB4sgknhdmAiWRyB/D4CEj74MQDQPp7Mr1B0Vxn7Y7ZeStt19HxEjzxyJGsdC9BMrn+tzwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwZmzNzTgbYAuQGikkRbKInog5OCMo3GhZO82+IrtasJC6rNPrz/+8KHfIOUB83wnfEMnKKygW7ELeSnvlbKUyve6DbNXrHjMJYzjqLG3cdgIKZaFyTfWaQiY8G82qP38Lc7rtgLoh/F7lpqCdunzPfSQBraGH2IAHyP6x3tjlsGGTj/LN8sT20iHRk8IXsBsMGv5DcZ4n+zB2E5hyfxH87sNYu6gaIrpcxcv5N0AK++fvpnrhlEmT0rW7b8wgBB4BmaPfCCb4DbDgHvIBPmG8QF7SNjUGuVPUFJRPTkvhighbeuRtoNpq0W1EVXKq0ZeBO8jJ6Si9LAdFvqwy70D0</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="signing">
- <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>
@@ -360,10 +369,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>
@@ -371,8 +380,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.hslu.ch.xml b/swamid-interfederations-2.0/idp.hslu.ch.xml
index a1660976..f799c7e7 100644
--- a/swamid-interfederations-2.0/idp.hslu.ch.xml
+++ b/swamid-interfederations-2.0/idp.hslu.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://idp.hslu.ch/idp/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-11T08:20:55Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-06-16T06:56:25Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
@@ -67,31 +67,6 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAKYe0Z6SH3z8HH5wMaMq5hTEhv/qMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5oc2x1LmNoMB4XDTEzMTIyMDE1MzkzMFoXDTE2
-MTIyMDE1MzkzMFowFjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCzsxMbkNyRCfJACI8ij/xKmC05sI3LIRBmakIZ
-hefl8ZsrmFy9b/D36SXZhQwBCoX/3JqxNFDDGOIZ9Y/zf6Rj3wj9Y2/hoWF+3q7l
-S2VUkPxEecgn+dH5mLAwXS9KG/dungBrPU4XKiQd4+9Hr887A/TcY+Zl9xoEvu3a
-5lfV+k7ZHY23tWaKM8y40dWpmXqEVm0b/XnhSMCT3F6kYs0re+FqBy97IokTTJho
-bJo+mpOfKVldwwEHZ5Fyv1p09qADFizIuZob9WDgW6an/OO/QmqbRK58piltzVJ9
-fusjjAIuJytgIHn8nIeG6GEHlSv8FEiAQ5z0EWhwkluQiXvBAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTmA3UfmymdUeEBYMjH2Ak+bw1FOzANBgkqhkiG
-9w0BAQUFAAOCAQEAUD6gf83UkCE3gknGuckSwp7/dTh+pakqMI3RIEZYXnWFwlec
-0pPS9MHJ+FY5uWCWxAy/W7hLtBt+cJff1OsRkzdm95NObCYmbDytUqCPyIHkedJ8
-vDwD6vJ605tMBKnHYRWIfdmGF91NjdyKp+iHePNXS3gDxLnSYdXFxmTjBTZsN/Ck
-wLUk/ItLwWIOygK6uFLr692+Tcqb36JV56HEx5rBkgDvSHRYdmd/iKiNMJgUzua5
-p6nvn41Jy2ELPJnIG5vcCoCaxj64unP/zvhT3sXXKwV37rYbpQrAXAABucek1ypJ
-OIAxiVh3Ie9eUhg2n9wt3PRnrNvSs+4ujheF4w==
- </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>
MIIDDDCCAfSgAwIBAgIJAOIyvPYAinGuMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
BAMTC2lkcC5oc2x1LmNoMB4XDTE0MDQxMTA4MTM1MVoXDTE3MDQxMDA4MTM1MVow
FjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -113,42 +88,6 @@ IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIFGTCCBAGgAwIBAgIUE6o4acnOuBZ6XTtcF9qVfYARsjowDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTAyNjEwNTAxNloXDTE1MTAyNjEwNTAxNlow
-gYwxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDzANBgNVBAcTBkx1emVy
-bjEmMCQGA1UEChMdRmFjaGhvY2hzY2h1bGUgWmVudHJhbHNjaHdlaXoxHTAbBgNV
-BAsTFEFidGVpbHVuZyBJbmZvcm1hdGlrMRQwEgYDVQQDEwtpZHAuaHNsdS5jaDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqWUr4eYHDfEMN8pH6heyTs
-y4dSl8nKvNpQaDHd8uqag+9zndhY329sGOSohA8yrcfB1Mtr8I3F3EA/G03NOu7v
-0sPfggwIz0qrPCrVtr9DSc7nARJpsOfvgv3ypUoXbdB8yDwvEa3wOh38vrraWoct
-sTfntwZC5VWVWo42hGTRtLCp8Xg8Rr/ga4crIxWZRjbsLZO8nJnnhnE/CryZG2A7
-GhpDvBErfWkTWn9rgscgdYWSeq0eCSszFxIOtHoTCI5ebgpa+YOXx4oSnwwmBYfl
-ylTeIkPrGYyNKUdLzr/QhsNSKsr7JuHV5pexx7svi7eUtqpn/gFxLsr0RMc5q3MC
-AwEAAaOCAZEwggGNMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDov
-L29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1
-c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDAWBgNVHREEDzANggtp
-ZHAuaHNsdS5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUF
-BwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4G
-A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD
-VR0jBBgwFoAUMk2hT+rwrpm27psHLIQIEVCL4n4wOwYDVR0fBDQwMjAwoC6gLIYq
-aHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3JsMB0GA1Ud
-DgQWBBT0xkVMnRM30LsfnLQz/IYX2QnjiDANBgkqhkiG9w0BAQUFAAOCAQEAZ5GA
-o26rCT/ZHTDS5wDJZjHIb28MaWia9ACMvzuieUw4KnJfsPoFoWV/Gs83wSX+aZnt
-J9ctbDNJOc0SzqRE8ZqjA62rDIj2wzXlCl+idMh/mHR+//7oCYRpyIgXBjOg3sVn
-R0hvccjUSoDYxy1p2epK/edgGzpKj7oazoh78FjfGOImnGFBZGfj5eTSloxJZInG
-A2P0Zcp8Hhg/aptpC7c7oAMv7TjxTuw/QWSl/87B9Dc/NXzSRL6LFlB04jN/onst
-CLT8QtV+34QCmlhAn7VtgOllBMZ6F3oU0ank+QresyYhWef+CsXDz4XSOt3tmT6s
-moKY92W4xbV9VFcSbg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -167,31 +106,6 @@ moKY92W4xbV9VFcSbg==
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAKYe0Z6SH3z8HH5wMaMq5hTEhv/qMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5oc2x1LmNoMB4XDTEzMTIyMDE1MzkzMFoXDTE2
-MTIyMDE1MzkzMFowFjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCzsxMbkNyRCfJACI8ij/xKmC05sI3LIRBmakIZ
-hefl8ZsrmFy9b/D36SXZhQwBCoX/3JqxNFDDGOIZ9Y/zf6Rj3wj9Y2/hoWF+3q7l
-S2VUkPxEecgn+dH5mLAwXS9KG/dungBrPU4XKiQd4+9Hr887A/TcY+Zl9xoEvu3a
-5lfV+k7ZHY23tWaKM8y40dWpmXqEVm0b/XnhSMCT3F6kYs0re+FqBy97IokTTJho
-bJo+mpOfKVldwwEHZ5Fyv1p09qADFizIuZob9WDgW6an/OO/QmqbRK58piltzVJ9
-fusjjAIuJytgIHn8nIeG6GEHlSv8FEiAQ5z0EWhwkluQiXvBAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTmA3UfmymdUeEBYMjH2Ak+bw1FOzANBgkqhkiG
-9w0BAQUFAAOCAQEAUD6gf83UkCE3gknGuckSwp7/dTh+pakqMI3RIEZYXnWFwlec
-0pPS9MHJ+FY5uWCWxAy/W7hLtBt+cJff1OsRkzdm95NObCYmbDytUqCPyIHkedJ8
-vDwD6vJ605tMBKnHYRWIfdmGF91NjdyKp+iHePNXS3gDxLnSYdXFxmTjBTZsN/Ck
-wLUk/ItLwWIOygK6uFLr692+Tcqb36JV56HEx5rBkgDvSHRYdmd/iKiNMJgUzua5
-p6nvn41Jy2ELPJnIG5vcCoCaxj64unP/zvhT3sXXKwV37rYbpQrAXAABucek1ypJ
-OIAxiVh3Ie9eUhg2n9wt3PRnrNvSs+4ujheF4w==
- </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>
MIIDDDCCAfSgAwIBAgIJAOIyvPYAinGuMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
BAMTC2lkcC5oc2x1LmNoMB4XDTE0MDQxMTA4MTM1MVoXDTE3MDQxMDA4MTM1MVow
FjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -213,42 +127,6 @@ IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIFGTCCBAGgAwIBAgIUE6o4acnOuBZ6XTtcF9qVfYARsjowDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTAyNjEwNTAxNloXDTE1MTAyNjEwNTAxNlow
-gYwxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDzANBgNVBAcTBkx1emVy
-bjEmMCQGA1UEChMdRmFjaGhvY2hzY2h1bGUgWmVudHJhbHNjaHdlaXoxHTAbBgNV
-BAsTFEFidGVpbHVuZyBJbmZvcm1hdGlrMRQwEgYDVQQDEwtpZHAuaHNsdS5jaDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqWUr4eYHDfEMN8pH6heyTs
-y4dSl8nKvNpQaDHd8uqag+9zndhY329sGOSohA8yrcfB1Mtr8I3F3EA/G03NOu7v
-0sPfggwIz0qrPCrVtr9DSc7nARJpsOfvgv3ypUoXbdB8yDwvEa3wOh38vrraWoct
-sTfntwZC5VWVWo42hGTRtLCp8Xg8Rr/ga4crIxWZRjbsLZO8nJnnhnE/CryZG2A7
-GhpDvBErfWkTWn9rgscgdYWSeq0eCSszFxIOtHoTCI5ebgpa+YOXx4oSnwwmBYfl
-ylTeIkPrGYyNKUdLzr/QhsNSKsr7JuHV5pexx7svi7eUtqpn/gFxLsr0RMc5q3MC
-AwEAAaOCAZEwggGNMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDov
-L29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1
-c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDAWBgNVHREEDzANggtp
-ZHAuaHNsdS5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUF
-BwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4G
-A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD
-VR0jBBgwFoAUMk2hT+rwrpm27psHLIQIEVCL4n4wOwYDVR0fBDQwMjAwoC6gLIYq
-aHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3JsMB0GA1Ud
-DgQWBBT0xkVMnRM30LsfnLQz/IYX2QnjiDANBgkqhkiG9w0BAQUFAAOCAQEAZ5GA
-o26rCT/ZHTDS5wDJZjHIb28MaWia9ACMvzuieUw4KnJfsPoFoWV/Gs83wSX+aZnt
-J9ctbDNJOc0SzqRE8ZqjA62rDIj2wzXlCl+idMh/mHR+//7oCYRpyIgXBjOg3sVn
-R0hvccjUSoDYxy1p2epK/edgGzpKj7oazoh78FjfGOImnGFBZGfj5eTSloxJZInG
-A2P0Zcp8Hhg/aptpC7c7oAMv7TjxTuw/QWSl/87B9Dc/NXzSRL6LFlB04jN/onst
-CLT8QtV+34QCmlhAn7VtgOllBMZ6F3oU0ank+QresyYhWef+CsXDz4XSOt3tmT6s
-moKY92W4xbV9VFcSbg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
index 8e44ef54..ea2e29e0 100644
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
@@ -1,16 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.ids-mannheim.de/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ids-mannheim.de/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-22T10:22:36Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ids-mannheim.de</saml1md:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity-Provider des Institut für Deutsche Sprache</mdui:Description>
+ <mdui:Description xml:lang="en">Identity-Provider of the Institut für Deutsche Sprache</mdui:Description>
+ <mdui:Logo height="16" width="16">https://idp.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
+ <mdui:Logo height="63" width="318">https://idp.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.ids-mannheim.de</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
<ds:X509Data>
+ <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
@@ -37,37 +51,86 @@ bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-99YJ9IIzYQ==</ds:X509Certificate>
+99YJ9IIzYQ==
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Institut für Deutsche Sprache - Test SP</md:ServiceName>
- <md:ServiceName xml:lang="en">Institut für Deutsche Sprache - Test SP</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Interface to the Corpus Search, Management and Analysis System COSMAS-II, which offers various possibilities to access the German Reference Corpus DeReKo and other corpora hosted at the IDS. For Humanities and Social Sciences researchers.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Oliver</md:GivenName>
- <md:SurName>Schonefeld</md:SurName>
- <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ids-mannheim.de/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ids-mannheim.de</saml1md:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
+MTgxNDI4MTVaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRwwGgYDVQQDExNpZHAuaWRzLW1hbm5oZWltLmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt7L/7N+17/v7lajOiMdvThxk
+NoiCwy2RDzaDi7IEvJtXmT1CkKXVg84uxCneoixdPwO9EZAyphOGfXyvIWiWOEkB
+8135pYTbKNYPuG0+fIYXPvHE1+oFMca3K21GgssvoOZYJfi/wrORLx77iQXRgGYF
+mRllzaspZriQNbIvCwVsKsoL8zt9TeVa0Ltv6A7dRg/36u8XppG4glE4xuuXQgNI
+mj0qpJ9pV76bgzPKUNm2/aXDiyqoI4qvp2h4vM2sFv2MAguPkHI7PPcVXn1L2q3h
+WpylL+gjjNfZm1TdDww+r1HFdeQDORmjSh+Cd4bbdEeA2bWH3NHjSR6xWwCj/wID
+AQABo4IBvDCCAbgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSg5wzZdnXH5hJRlkFfkCXU0cFr
+4TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zCBkQYDVR0fBIGJMIGG
+MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
+YS9wdWIvY3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUF
+BwEBBIGdMIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2ds
+b2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUH
+MAKGP2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAB1uluFS88lYI
+QPiuEvlALX1GYfNZTNCJogeflb5E59zdd49Y7L5zs9IXbYLUMqSQrbLyv4i4nK4e
+bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
+HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
+xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
+VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
+99YJ9IIzYQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="de">e217</OrganizationName>
+ <OrganizationName xml:lang="en">e217</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.ids-mannheim.de</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Oliver</GivenName>
+ <SurName>Schonefeld</SurName>
+ <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Andreas</GivenName>
+ <SurName>Witt</SurName>
+ <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>AAI</GivenName>
+ <SurName>Team</SurName>
+ <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
index 32c71a1b..6853c2a6 100644
--- a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nesc.gla.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for the National e-Science Centre, University of Glasgow.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-29T14:17:30Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.net.xml b/swamid-interfederations-2.0/idp.shibboleth.net.xml
index 676a22e2..bec0386e 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>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/idp.ufe.cas.cz.xml b/swamid-interfederations-2.0/idp.ufe.cas.cz.xml
new file mode 100644
index 00000000..a91f9751
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufe.cas.cz.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.ufe.cas.cz/idp/shibboleth">
+ <Extensions>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ <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>
+ <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">ufe.cas.cz</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Institute of Photonics and Electronics of the AS CR</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider UFE AV CR employees.</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFE AV ČR</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ufe.cz/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://www.ufe.cz/</mdui:InformationURL>
+ <mdui:Logo height="44" width="50">https://jiftach.cas.cz/loga/logo-ufe-44.png</mdui:Logo>
+ <mdui:Logo height="216" width="247">https://jiftach.cas.cz/loga/logo-ufe-216.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUcKS5gFpqf8X/ZLLjYuIQpzjjeXkwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVmZS5jYXMuY3owHhcNMTQwNTI3MTIxMDE5WhcN
+MzQwNTI3MTIxMDE5WjAZMRcwFQYDVQQDEw5pZHAudWZlLmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5cOnmanq68cqOF7oxg6U5BGUKlj5Wo
+sVPtKUjmSy57yzhLnrIZ9UMKESIuPuBuSKbyTnt7JbjounGkMiwhCIf61hJiOs8b
+JlptSG7WXnLbHcOhMWjiCmbWawWVTLyPNWTlUvUaq3JB5zGNQXOlILfn/UkHnbMl
+Ija8zQ5yhAYvHZ/maGHsnkx92ds87Kcxtz6CjIDlcbo/XAVoLizNWAedeji1FUbc
+EdOdDiJZN+OOnfVxPbDYcRc2uls3YloLsZtbyXO8lKViCiUSlPGPEelx8NxinDDY
+IwZ8hPpiu94Uv5lCkvo9XdAG7RBZsmqiodz0oXGIEsFscS6PKTa3MEUCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVmZS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVmZS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPVVqO7eJSBY4afM8pfpuTFT
+3rfqMA0GCSqGSIb3DQEBBQUAA4IBAQAg2FJw4TFDfXuCmJP3iPqVLlf+e5ViqQdo
+hum8X97d5zxkPtUShw6U5SLy4Styi36BdaIKsWiGodF+pmqse7QPeJyxRqDtUBUB
+9X4eWbxuhghrbROsP75/QmpqFJVBQiNYd+AyDNSmROseXxqMVqeZ+EzLtHPki0Yj
+3Os7z22eK8t8BBMnOrUskvKYEfFDHyf7rCirwK1vL53LHyPh1gSF7vPwvJ6Zvojh
+JNJvSY9ZNxjgsFNR7HEgyGNt59E+ITrLP2u4Ch2iy0n/tqZgiu6xjXJtIO1l+dDu
+hDT+yeRSzypRvdHOYKvyiqoNLBc/64BpcsCwvR2xGXwDjT2frVjp
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.cas.cz: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>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufe.cas.cz/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufe.cas.cz/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">ufe.cas.cz</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUcKS5gFpqf8X/ZLLjYuIQpzjjeXkwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVmZS5jYXMuY3owHhcNMTQwNTI3MTIxMDE5WhcN
+MzQwNTI3MTIxMDE5WjAZMRcwFQYDVQQDEw5pZHAudWZlLmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5cOnmanq68cqOF7oxg6U5BGUKlj5Wo
+sVPtKUjmSy57yzhLnrIZ9UMKESIuPuBuSKbyTnt7JbjounGkMiwhCIf61hJiOs8b
+JlptSG7WXnLbHcOhMWjiCmbWawWVTLyPNWTlUvUaq3JB5zGNQXOlILfn/UkHnbMl
+Ija8zQ5yhAYvHZ/maGHsnkx92ds87Kcxtz6CjIDlcbo/XAVoLizNWAedeji1FUbc
+EdOdDiJZN+OOnfVxPbDYcRc2uls3YloLsZtbyXO8lKViCiUSlPGPEelx8NxinDDY
+IwZ8hPpiu94Uv5lCkvo9XdAG7RBZsmqiodz0oXGIEsFscS6PKTa3MEUCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVmZS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVmZS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPVVqO7eJSBY4afM8pfpuTFT
+3rfqMA0GCSqGSIb3DQEBBQUAA4IBAQAg2FJw4TFDfXuCmJP3iPqVLlf+e5ViqQdo
+hum8X97d5zxkPtUShw6U5SLy4Styi36BdaIKsWiGodF+pmqse7QPeJyxRqDtUBUB
+9X4eWbxuhghrbROsP75/QmpqFJVBQiNYd+AyDNSmROseXxqMVqeZ+EzLtHPki0Yj
+3Os7z22eK8t8BBMnOrUskvKYEfFDHyf7rCirwK1vL53LHyPh1gSF7vPwvJ6Zvojh
+JNJvSY9ZNxjgsFNR7HEgyGNt59E+ITrLP2u4Ch2iy0n/tqZgiu6xjXJtIO1l+dDu
+hDT+yeRSzypRvdHOYKvyiqoNLBc/64BpcsCwvR2xGXwDjT2frVjp
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.cas.cz: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">Institute of Photonics and Electronics of the AS CR</OrganizationName>
+ <OrganizationName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Institute of Photonics and Electronics of the AS CR, v.v.i.</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR, v.v.i.</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ufe.cz/</OrganizationURL>
+ <OrganizationURL xml:lang="cs">http://www.ufe.cz/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Petr</GivenName>
+ <SurName>Vaníček</SurName>
+ <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uoa.gr.xml b/swamid-interfederations-2.0/idp.uoa.gr.xml
index a67083a2..971e09b6 100644
--- a/swamid-interfederations-2.0/idp.uoa.gr.xml
+++ b/swamid-interfederations-2.0/idp.uoa.gr.xml
@@ -107,9 +107,9 @@
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
- <OrganizationName xml:lang="en">University of Athens</OrganizationName>
+ <OrganizationName xml:lang="en">National and Kapodistrian University of Athens</OrganizationName>
<OrganizationName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Athens</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">National and Kapodistrian University of Athens</OrganizationDisplayName>
<OrganizationDisplayName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.uoa.gr/</OrganizationURL>
<OrganizationURL xml:lang="el">http://www.uoa.gr/</OrganizationURL>
diff --git a/swamid-interfederations-2.0/idp1.uwaterloo.ca.xml b/swamid-interfederations-2.0/idp1.uwaterloo.ca.xml
new file mode 100644
index 00000000..0d7854f2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.uwaterloo.ca.xml
@@ -0,0 +1,102 @@
+<?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:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.uwaterloo.ca/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.canarie.ca" registrationInstant="2014-06-19T00: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>
+ </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">uwaterloo.ca</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">University of Waterloo</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Students, employees and other University of Waterloo account holders</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUbKz7iorE+LiL1mldU1jseivAaTkwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRwMS51d2F0ZXJsb28uY2EwHhcNMTQwNjE4MTMxMTQ5
+WhcNMzQwNjE4MTMxMTQ5WjAcMRowGAYDVQQDExFpZHAxLnV3YXRlcmxvby5jYTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLtTKyNTqUzgIoJaZs1s3UJ
+0jPSIy18S8yVyOEhGaa2MT6kd3ik1tZ3O3iFNm59oNU/IU7km+O8Lq364GME0lCD
+KEobEaH2Tcs55Hk2a9rSmpZ/9+MAW9W/UJVb7Y/T1+jpQxVB4KTVULGqleO4wwJZ
+nhRbzNFuQgSW12msKV4d0ClKct5ui2UlkCXLrC6MFOEsKoGawpm5StKSnbTzLD4K
+3B6LdSc3WQWzX8zSHwSbe0PLbH2MD1Ns37YNNFv5uDhiYeh7E9zYfqd1LmUufmK2
+3daof43rjDRi+3Ybzx44GDMp1bMp7c7Q9W2HmnrZDY0fiyeLTXURDPGbsUgENFMC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMS51d2F0ZXJsb28uY2GGKGh0dHBzOi8v
+aWRwMS51d2F0ZXJsb28uY2EvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHQQAyUs
+uhk9N8P6qen7W7J4k4itMA0GCSqGSIb3DQEBBQUAA4IBAQCMwr7R/xOhdI8OQlc8
+tp6gnIsUSBD6uwcXGVfjg07i/NTtfWTRG3cn8SvV5KcmxqNTQxkkhXyE92RMw88O
+OQM220jmY4fQx63af0OjtXTUYxIOK0Cg0FXMylloHdRyVqp2wbJqbclYL3IWoNRN
+nbyTdmEBxrUjKsAgJl9F4mS06iuOyBUMmcLxqPRQCNuPm7CJECTmYfUiaEKh5Keo
+4f7W4J1Jx1wcvieUsbcMRx258MXiQ+tqYvPVTAuNsFOZ3YcOUHjXTTueSLyzDVb8
+YXl9jLkki1wDKTSv8RDcUDjBWf0rITaf13Q08dKsI2gUp786n2QO9fXaKKgxSM+n
+7zvx</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/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>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.uwaterloo.ca/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.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">uwaterloo.ca</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">University of Waterloo</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Students, employees and other University of Waterloo account holders</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUbKz7iorE+LiL1mldU1jseivAaTkwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRwMS51d2F0ZXJsb28uY2EwHhcNMTQwNjE4MTMxMTQ5
+WhcNMzQwNjE4MTMxMTQ5WjAcMRowGAYDVQQDExFpZHAxLnV3YXRlcmxvby5jYTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLtTKyNTqUzgIoJaZs1s3UJ
+0jPSIy18S8yVyOEhGaa2MT6kd3ik1tZ3O3iFNm59oNU/IU7km+O8Lq364GME0lCD
+KEobEaH2Tcs55Hk2a9rSmpZ/9+MAW9W/UJVb7Y/T1+jpQxVB4KTVULGqleO4wwJZ
+nhRbzNFuQgSW12msKV4d0ClKct5ui2UlkCXLrC6MFOEsKoGawpm5StKSnbTzLD4K
+3B6LdSc3WQWzX8zSHwSbe0PLbH2MD1Ns37YNNFv5uDhiYeh7E9zYfqd1LmUufmK2
+3daof43rjDRi+3Ybzx44GDMp1bMp7c7Q9W2HmnrZDY0fiyeLTXURDPGbsUgENFMC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMS51d2F0ZXJsb28uY2GGKGh0dHBzOi8v
+aWRwMS51d2F0ZXJsb28uY2EvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHQQAyUs
+uhk9N8P6qen7W7J4k4itMA0GCSqGSIb3DQEBBQUAA4IBAQCMwr7R/xOhdI8OQlc8
+tp6gnIsUSBD6uwcXGVfjg07i/NTtfWTRG3cn8SvV5KcmxqNTQxkkhXyE92RMw88O
+OQM220jmY4fQx63af0OjtXTUYxIOK0Cg0FXMylloHdRyVqp2wbJqbclYL3IWoNRN
+nbyTdmEBxrUjKsAgJl9F4mS06iuOyBUMmcLxqPRQCNuPm7CJECTmYfUiaEKh5Keo
+4f7W4J1Jx1wcvieUsbcMRx258MXiQ+tqYvPVTAuNsFOZ3YcOUHjXTTueSLyzDVb8
+YXl9jLkki1wDKTSv8RDcUDjBWf0rITaf13Q08dKsI2gUp786n2QO9fXaKKgxSM+n
+7zvx</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/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>
+ <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+ <md:OrganizationName xml:lang="en">University of Waterloo</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University of Waterloo</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uwaterloo.ca</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <md:GivenName>Sean</md:GivenName>
+ <md:SurName>Mason</md:SurName>
+ <md:EmailAddress>watiam@uwaterloo.ca</md:EmailAddress>
+ </md: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 b0cea5b1..2926376b 100644
--- a/swamid-interfederations-2.0/idp2.iay.org.uk.xml
+++ b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.iay.org.uk/idp/shibboleth">
- <!--
- This is a "SDSS (Fountainhall)" project test IdP running outside the University environment for Ian A. Young.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-30T16:36:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/issues.shibboleth.net.xml b/swamid-interfederations-2.0/issues.shibboleth.net.xml
index da4b6342..7ac7acc4 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>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/login.helsinki.fi.xml b/swamid-interfederations-2.0/login.helsinki.fi.xml
index 986ba144..1ea67fec 100644
--- a/swamid-interfederations-2.0/login.helsinki.fi.xml
+++ b/swamid-interfederations-2.0/login.helsinki.fi.xml
@@ -1,14 +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: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://login.helsinki.fi/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
+<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" entityID="https://login.helsinki.fi/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 regexp="false">helsinki.fi</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">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
+ </Extensions>
+ <KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIE3jCCA8agAwIBAgIQWSnA5EzgO1nthR4AsdlaoTANBgkqhkiG9w0BAQUFADA2
@@ -40,30 +41,30 @@ NYY+HvJbSaNYXLkLzxOl8+fWFZqxmThOsb5KAx1xVjNVo2DiwC0crol7Wd0uDJEm
Ahw=</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://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Janne</md:GivenName>
- <md:SurName>Peltonen</md:SurName>
- <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Juha</md:GivenName>
- <md:SurName>Niemi</md:SurName>
- <md:EmailAddress>mailto:idm-hosting@helsinki.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://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="fi">Helsingin yliopisto</OrganizationName>
+ <OrganizationName xml:lang="en">University of Helsinki</OrganizationName>
+ <OrganizationName xml:lang="sv">Helsingfors universitet</OrganizationName>
+ <OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">University of Helsinki</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Helsingfors universitet</OrganizationDisplayName>
+ <OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Janne</GivenName>
+ <SurName>Peltonen</SurName>
+ <EmailAddress>mailto:idm-hosting@helsinki.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Juha</GivenName>
+ <SurName>Niemi</SurName>
+ <EmailAddress>mailto:idm-hosting@helsinki.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meta.cesnet.cz.xml b/swamid-interfederations-2.0/meta.cesnet.cz.xml
index c2fe39a5..acc851c5 100644
--- a/swamid-interfederations-2.0/meta.cesnet.cz.xml
+++ b/swamid-interfederations-2.0/meta.cesnet.cz.xml
@@ -24,49 +24,7 @@
</md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>Active</ds:KeyName>
- <ds:KeyName>meta.cesnet.cz</ds:KeyName>
- <ds:KeyName>metacentrum.cz</ds:KeyName>
- <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
- <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
- <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
- <ds:KeyName>www.glite.eu</ds:KeyName>
- <ds:KeyName>www.metacentrum.cz</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
- <ds:X509Certificate>MIIEzjCCA7agAwIBAgIQUPcidFJvVTeMMovLOnvObTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDUyMjAwMDAwMFoXDTEzMDUyMTIzNTk1OVowOzELMAkGA1UE
-BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
-LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs9LDWzd7/lkHYbK1
-9HvIrdDr4eyAIlCPmYvU/8Yy2ezxg+GXCufe+CGF/AZsBcG7HC0L4rmMjlF0qCsB
-PwqmAEenMpIfb1BVkok+7p0QIja5ZLmmsbtnU8uPauTSxY1HFG33nBj5TKc9cXk9
-rCttWQ/JJeYMsMm1ioTiUFg2wzN88mluXvtahYx6PgUA9bRLwMhpj1pBfFN2Eakc
-vX+6AynyBWzohsXd3bDD/EMt2b2dUfDzbi37UFiMIYBpwLkfhgGeaVEC871iXT7u
-8H/Mi+ancJVboa/moye8nQkcrm2Ws/ZhAkcEaFgkj1z/ECxfeKICaSxCF70ODBO2
-X4KXDQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-ue0wHQYDVR0OBBYEFAdQwzTToseEzmW6GK36RLF3diFCMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
-BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
-Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
-BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
-b3JnMIGIBgNVHREEgYAwfoISd3d3Lm1ldGFjZW50cnVtLmN6gg5tZXRhLmNlc25l
-dC5jeoIObWV0YWNlbnRydW0uY3qCEG1ldGF2by5jZXNuZXQuY3qCFW1ldGF2by5t
-ZXRhY2VudHJ1bS5jeoIRdm8ubWV0YWNlbnRydW0uY3qCDHd3dy5nbGl0ZS5ldTAN
-BgkqhkiG9w0BAQUFAAOCAQEAm2zT+PCSJz/tGwcuNN9Zs2Wydkuio/X9DbI8aruP
-QKoLP0+vxu5T/ymEkmBfywcnDIdjCcBruloc6HzAr6TEiSnA0se6813hSp+DCV0p
-T2eceKnvOjVKjNpVRvosxyIlu7tupOTEQZiGsTNU1WtTu99PsGAlMHNpgPlrGe/P
-JXjUmvgdtt5PgkUdCaHkoNSUwRdB1DwDO+tKGyY/dvUPaYFCj/EfePgPIsOmWFEv
-zDnk+mod1McmMwPFW/fxlpFiUdtsoswkodIUgnynuRzUGSkGZgGqVWFjz7LJ/dwy
-bXdlZwBweUbE7uYAM6MFWGK1aNJ+a6xZbQlNr/cW8+XKDA==
-</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>Standby</ds:KeyName>
+ <ds:KeyName>_meta_2015-12-07</ds:KeyName>
<ds:KeyName>einfra.cesnet.cz</ds:KeyName>
<ds:KeyName>meta.cesnet.cz</ds:KeyName>
<ds:KeyName>metacentrum.cz</ds:KeyName>
@@ -111,49 +69,7 @@ XOx3BPUl5ZWVnWHxgCphyglT2/eB4+nvzj1cDTHkLHMsOQ==
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>Active</ds:KeyName>
- <ds:KeyName>meta.cesnet.cz</ds:KeyName>
- <ds:KeyName>metacentrum.cz</ds:KeyName>
- <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
- <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
- <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
- <ds:KeyName>www.glite.eu</ds:KeyName>
- <ds:KeyName>www.metacentrum.cz</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
- <ds:X509Certificate>MIIEzjCCA7agAwIBAgIQUPcidFJvVTeMMovLOnvObTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDUyMjAwMDAwMFoXDTEzMDUyMTIzNTk1OVowOzELMAkGA1UE
-BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
-LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs9LDWzd7/lkHYbK1
-9HvIrdDr4eyAIlCPmYvU/8Yy2ezxg+GXCufe+CGF/AZsBcG7HC0L4rmMjlF0qCsB
-PwqmAEenMpIfb1BVkok+7p0QIja5ZLmmsbtnU8uPauTSxY1HFG33nBj5TKc9cXk9
-rCttWQ/JJeYMsMm1ioTiUFg2wzN88mluXvtahYx6PgUA9bRLwMhpj1pBfFN2Eakc
-vX+6AynyBWzohsXd3bDD/EMt2b2dUfDzbi37UFiMIYBpwLkfhgGeaVEC871iXT7u
-8H/Mi+ancJVboa/moye8nQkcrm2Ws/ZhAkcEaFgkj1z/ECxfeKICaSxCF70ODBO2
-X4KXDQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-ue0wHQYDVR0OBBYEFAdQwzTToseEzmW6GK36RLF3diFCMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
-BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
-Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
-BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
-b3JnMIGIBgNVHREEgYAwfoISd3d3Lm1ldGFjZW50cnVtLmN6gg5tZXRhLmNlc25l
-dC5jeoIObWV0YWNlbnRydW0uY3qCEG1ldGF2by5jZXNuZXQuY3qCFW1ldGF2by5t
-ZXRhY2VudHJ1bS5jeoIRdm8ubWV0YWNlbnRydW0uY3qCDHd3dy5nbGl0ZS5ldTAN
-BgkqhkiG9w0BAQUFAAOCAQEAm2zT+PCSJz/tGwcuNN9Zs2Wydkuio/X9DbI8aruP
-QKoLP0+vxu5T/ymEkmBfywcnDIdjCcBruloc6HzAr6TEiSnA0se6813hSp+DCV0p
-T2eceKnvOjVKjNpVRvosxyIlu7tupOTEQZiGsTNU1WtTu99PsGAlMHNpgPlrGe/P
-JXjUmvgdtt5PgkUdCaHkoNSUwRdB1DwDO+tKGyY/dvUPaYFCj/EfePgPIsOmWFEv
-zDnk+mod1McmMwPFW/fxlpFiUdtsoswkodIUgnynuRzUGSkGZgGqVWFjz7LJ/dwy
-bXdlZwBweUbE7uYAM6MFWGK1aNJ+a6xZbQlNr/cW8+XKDA==
-</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>Standby</ds:KeyName>
+ <ds:KeyName>_meta_2015-12-07</ds:KeyName>
<ds:KeyName>einfra.cesnet.cz</ds:KeyName>
<ds:KeyName>meta.cesnet.cz</ds:KeyName>
<ds:KeyName>metacentrum.cz</ds:KeyName>
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/portal.clarin.inl.nl.xml b/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
index 33a0d19e..152c3742 100644
--- a/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
+++ b/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
@@ -1,24 +1,27 @@
<?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://portal.clarin.inl.nl/">
- <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://portal.clarin.inl.nl/Shibboleth.sso/DS" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</mdui:DisplayName>
- <mdui:Description xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</mdui:Description>
- <mdui:Description xml:lang="fi">Hollannin kielen lähderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian työkaluja.</mdui:Description>
- <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/doc/information_about_deposition.pdf</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/end_user_license_agreement.pdf</mdui:PrivacyStatementURL>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.clarin.inl.nl/">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T11:21:39Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML: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://portal.clarin.inl.nl/Shibboleth.sso/DiscoJuice" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Institute for Dutch Lexicology Portal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Portal</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Institute for Dutch Lexicology Portal</mdui:Description>
+ <mdui:Description xml:lang="en">Institute for Dutch Lexicology Portal</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/</mdui:InformationURL>
</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:KeyName>portal.clarin.inl.nl</ds:KeyName>
<ds:X509Data>
+ <ds:X509SubjectName>CN=portal.clarin.inl.nl,OU=InstantSSL,O=St Instituut voor Nederlandse Lexicologie,street=Matthias de Vrieshof 2-3,L=Leiden,ST=Zuid-Holland,postalCode=2311 BZ,C=NL</ds:X509SubjectName>
<ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
@@ -49,45 +52,36 @@ wVaPQRJ8CAJ75BRokKozs/dbRFsK7nykWIz4ryP8ygPDVVOxVdvweTZY6iRrMhhm
ipw6JOA9+S12wS4ZVDTw1Lnqx55zhvZufKE/IcYUtXQG9zIThXvkSaZsbl81PeiJ
JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
-zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==</ds:X509Certificate>
+zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==
+</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://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</md:ServiceName>
- <md:ServiceName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Hollannin kielen lahderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian tyokaluja.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</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: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.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:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- </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>systeembeheer@inl.nl</md:GivenName>
- <md:SurName>INL</md:SurName>
- <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>servicedesk@inl.nl</md:GivenName>
- <md:SurName>INL</md:SurName>
- <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="de">Institute for Dutch Lexicology Portal</ServiceName>
+ <ServiceName xml:lang="en">Institute for Dutch Lexicology Portal</ServiceName>
+ <ServiceDescription xml:lang="de">Institute for Dutch Lexicology Portal</ServiceDescription>
+ <ServiceDescription xml:lang="en">Institute for Dutch Lexicology Portal</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="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>System</GivenName>
+ <SurName>Management</SurName>
+ <EmailAddress>mailto:systeembeheer@inl.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Service</GivenName>
+ <SurName>Desk</SurName>
+ <EmailAddress>mailto:servicedesk@inl.nl</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qub.ac.uk.xml b/swamid-interfederations-2.0/qub.ac.uk.xml
index 162bb663..7b9c5700 100644
--- a/swamid-interfederations-2.0/qub.ac.uk.xml
+++ b/swamid-interfederations-2.0/qub.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://qub.ac.uk/shibboleth">
- <!--
- This is a Shibboleth IdP for The Queen's University of Belfast.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T10:26:41Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/quod.lib.umich.edu.xml b/swamid-interfederations-2.0/quod.lib.umich.edu.xml
index 51ed22fd..42229862 100644
--- a/swamid-interfederations-2.0/quod.lib.umich.edu.xml
+++ b/swamid-interfederations-2.0/quod.lib.umich.edu.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://quod.lib.umich.edu/shibboleth-sp/acls">
- <!--
- This is a Shibboleth 2 'ACLS Humanities E-Book' SP owned by the University of Michigan.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-18T16:12:43Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/rems.elixir-finland.org.xml b/swamid-interfederations-2.0/rems.elixir-finland.org.xml
new file mode 100644
index 00000000..a901cdfc
--- /dev/null
+++ b/swamid-interfederations-2.0/rems.elixir-finland.org.xml
@@ -0,0 +1,99 @@
+<?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#" entityID="https://rems.elixir-finland.org/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>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="fi">REMS ELIXIR</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">REMS ELIXIR</mdui:DisplayName>
+ <mdui:Description xml:lang="fi">ELIXIRin aineistojen käyttövaltuuksien hallintajärjestelmä.</mdui:Description>
+ <mdui:Description xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</mdui:Description>
+ <mdui:PrivacyStatementURL xml:lang="fi">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFfDCCBGSgAwIBAgIRAOOPBaozx9H6wmXnbZDrqlYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMEUxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXcmVtcy5lbGl4
+aXItZmlubGFuZC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDE
+PmEMb9faLtRJlg+4uDV6K9hy3F0rBS/qhD5Gx9+4r3XLUGif6nX+zwErh+nQCqNS
+tujxdFOGALGsM5j6EvUJUyAvgQkoPq/z4GiRymexQeJkg3mQlRJ8rC0eRNfmdMo6
+KwE14GC0Y3aEJnxYbnArBcR2xb5qYM4nXE/2k3Tm6gRHasj2fK2CxbROilD42Dmd
+fj+zPx1kl0qOAZCKfhGNf36nt5VT9Hf39Y0xEBIDKKclAhMm8F9kfy6iDW9wi7yb
+6cNqSgZhe3kJ0SSWidFJVkHbdlxEII5bqlDflEiabxpt1bZk3BCfB66IH+gPOsES
+2wQTIzxeBDn0b++Misf5joU1wP26vhWNV6ZTQWtAqKKg9fXTWyqGGNNGpAZDaO+K
+ObS/EucGN7eDHmvLVpaRIN7RZHHbcMR3Irb9GPb7ICApjcrDiugl3tyTlZiznkpW
+5oL5+yZgc7wBGIGLV7r4ZcGFljJ0hq6+TviclrE/0DQVbHe51iM7nAkRlEdVF9Uc
+sliaHiswU1dhul14qXTNGi4dPUIkFW47Hy050O4ZqK9Bx7/WDhqm//oWt7mmNeW9
+Q7or0YK6btf+8IzuuC7GcGzHI8vhB1aV74wiRoHeegDwVpID+k3iWsZpLHYviCz6
+Vm6D2XZGznbw31YBJJhEVT/zz0nTv+DFY84ezBmmBwIDAQABo4IBdDCCAXAwHwYD
+VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNKSOwZ7HEKk
+M5/M4lFidibAuVwcMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEB
+AgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
+BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
+MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAiBgNVHREE
+GzAZghdyZW1zLmVsaXhpci1maW5sYW5kLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
+SGEF/c7aUAjf57SVtsoZqNkrR8YwBEEu99mKvQlvT6qLdIjNdq4bOYsCIHS+MAmv
+nhJyuiMY+Q4FK+jUsX+Emltk7aii37PAMlHSCpgo7OGDK0c6gdg7FYBuWj20HA6n
+FBgU9FD4sHqSKPEDOitsVTb1Vb1PYLYNaLpJnK70WS/vNCK/mZsy4qWeoxSBIUry
+rlnCOtELPe7YWkB3fAbmzI3FVfHrtb73vAJ6hfbOfuzVwfuEAU4U3+V175fktpw5
+RKcIVJFGa06KaJwT75b637GEuqs/YUdjCJU3uDk/eUnxO8ZZvA7gvxNQXAQBQ0oG
+vzJQyIviY90sJo1Cisoynw==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rems.elixir-finland.org/Shibboleth.sso/SLO/POST"/>
+ <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://rems.elixir-finland.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="fi">REMS ELIXIR</ServiceName>
+ <ServiceName xml:lang="en">REMS ELIXIR</ServiceName>
+ <ServiceDescription xml:lang="fi">ELIXIRin aineistojen kayttovaltuuksien hallintajarjestelma.</ServiceDescription>
+ <ServiceDescription xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="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"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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>Timo</GivenName>
+ <SurName>Mustonen</SurName>
+ <EmailAddress>mailto:rems@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Timo</GivenName>
+ <SurName>Mustonen</SurName>
+ <EmailAddress>mailto:rems@csc.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rr.funet.fi.xml b/swamid-interfederations-2.0/rr.funet.fi.xml
index 5c5d5cb3..52415d75 100644
--- a/swamid-interfederations-2.0/rr.funet.fi.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi.xml
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
<mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
@@ -13,12 +23,8 @@
<mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</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>
+ </Extensions>
+ <KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
@@ -53,104 +59,104 @@ aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
7RGEenBRxaphXGAv1Eb0nZKFlktgZNSVgkJTGQH0</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
- <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Kari</md:GivenName>
- <md:SurName>Laalo</md:SurName>
- <md:EmailAddress>mailto:kari.laalo@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Timo</md:GivenName>
- <md:SurName>Mustonen</md:SurName>
- <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</ServiceName>
+ <ServiceName xml:lang="en">Haka Attribute Test Service</ServiceName>
+ <ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</ServiceDescription>
+ <ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</ServiceDescription>
+ <RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="CountryOfResidence" Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduCourseMember" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduCourseOffering" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonCreditUnits" Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonECTS" Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonEPPNTimeStamp" Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonHomeCity" Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonPrimaryStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonProgram" Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonSpecialisation" Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudentCategory" Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudentStatus" Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudentUnion" Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudyToEnd" Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="funetEduPersonTargetDegree" Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="Nickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacCountryOfCitizenship" Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacGender" Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacPersonalUniqueCode" Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacPlaceOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="userPresenceID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="userStatus" Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+ <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Kari</GivenName>
+ <SurName>Laalo</SurName>
+ <EmailAddress>mailto:kari.laalo@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Timo</GivenName>
+ <SurName>Mustonen</SurName>
+ <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
index 5164f2a5..e2963802 100644
--- a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp-dev.cf.ac.uk/shibboleth">
- <!--
- This is a Shib Test SP owned by Cardiff University.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-23T14:26:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
index d9b4bb4d..4a14e4df 100644
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
- <!--
- This is a Shibboleth IdP for The University of Manchester.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-04T15:35:56.421696Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shibbo.ltu.se.xml b/swamid-interfederations-2.0/shibbo.ltu.se.xml
new file mode 100644
index 00000000..1be67572
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbo.ltu.se.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.ltu.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">ltu.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Lulea University of Technology</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.ltu.se/?l=en</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>ltu.se</mdui:DomainHint>
+ <mdui:IPHint>130.240.0.0/16</mdui:IPHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
+OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZNYF4pQz13p+ghYGwBZFa/IjzXgLxpM4n
+KJ15+pCqabsxo3VJsnXgnu0monCvx7qFC+1HVfMHAj795wdq0yywGvuUiMI4ncCj
+GWi2ED3VZaZr+mpr+UW2OScWawvli/oN8vs/P1G59ykgEjtRWQ+4ndHumuHXWh7e
+3uUZA+1t/iV6EaIyaIIyDx//83skBEWDIgqZb/IVAGOFh1BUWqZBR2m6PG6ryLX/
+2opHozlbvMlWSZ1RqCmjEuCUCcgm93CS4saGZZmNt1qnt87vDY1V49Iwjin9ORr0
+PX6Ls8lUc4OWWYu+UZlOr6RTi8ravy0OOWnOJiLNnGlhgpI1MXW9AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNoaWJiby5sdHUuc2WGJGh0dHBzOi8vc2hpYmJvLmx0dS5z
+ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU+e389gsAkX7kVDwQ360GaU31H50w
+DQYJKoZIhvcNAQEFBQADggEBAAO2nuaLdYOmmj2HaMe7mwRBP7T6zcmSD/HGQ3Wu
+3jqMh2Iws2OW07P+TH9I64Ok/7nzud9ZphqkR71Isq7WiFRMa90dI9PSjVuf2Bp7
+ia0JP50WEAWHivmopL7eCeBWwF06zb5XpVWmsydlIizO6akOvK1vZEsWMBlDvu7h
+iY+1cCt6dGBggGgMiiTLb5MtHZEgS2AEFgT0SXMX/xZS46mb71eFoEt+F0UlQMip
+w0QVWkaY5DYbQq2Jq2x2hb2Ge38Rcrn05ebHraDuNsyKkiJqNIA0/+BSSDzHZIEA
+B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.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://shibbo.ltu.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ltu.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">ltu.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
+OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZNYF4pQz13p+ghYGwBZFa/IjzXgLxpM4n
+KJ15+pCqabsxo3VJsnXgnu0monCvx7qFC+1HVfMHAj795wdq0yywGvuUiMI4ncCj
+GWi2ED3VZaZr+mpr+UW2OScWawvli/oN8vs/P1G59ykgEjtRWQ+4ndHumuHXWh7e
+3uUZA+1t/iV6EaIyaIIyDx//83skBEWDIgqZb/IVAGOFh1BUWqZBR2m6PG6ryLX/
+2opHozlbvMlWSZ1RqCmjEuCUCcgm93CS4saGZZmNt1qnt87vDY1V49Iwjin9ORr0
+PX6Ls8lUc4OWWYu+UZlOr6RTi8ravy0OOWnOJiLNnGlhgpI1MXW9AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNoaWJiby5sdHUuc2WGJGh0dHBzOi8vc2hpYmJvLmx0dS5z
+ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU+e389gsAkX7kVDwQ360GaU31H50w
+DQYJKoZIhvcNAQEFBQADggEBAAO2nuaLdYOmmj2HaMe7mwRBP7T6zcmSD/HGQ3Wu
+3jqMh2Iws2OW07P+TH9I64Ok/7nzud9ZphqkR71Isq7WiFRMa90dI9PSjVuf2Bp7
+ia0JP50WEAWHivmopL7eCeBWwF06zb5XpVWmsydlIizO6akOvK1vZEsWMBlDvu7h
+iY+1cCt6dGBggGgMiiTLb5MtHZEgS2AEFgT0SXMX/xZS46mb71eFoEt+F0UlQMip
+w0QVWkaY5DYbQq2Jq2x2hb2Ge38Rcrn05ebHraDuNsyKkiJqNIA0/+BSSDzHZIEA
+B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.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">LTU</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Luleå Tekniska Universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Luleå Tekniska Universitet</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
+ </Organization>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ <Company>Lulea University of Technology</Company>
+ <SurName>LTU Servicedesk</SurName>
+ <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+ <TelephoneNumber>+46 920 491664</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+ <Company>Lulea University of Technology</Company>
+ <SurName>LTU Servicedesk</SurName>
+ <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+ <TelephoneNumber>+46 920 491664</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+ <Company>Lulea University of Technology</Company>
+ <SurName>LTU Servicedesk</SurName>
+ <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+ <TelephoneNumber>+46 920 491664</TelephoneNumber>
+ </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ad.cybera.ca.xml b/swamid-interfederations-2.0/shibboleth.ad.cybera.ca.xml
new file mode 100644
index 00000000..0179e708
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ad.cybera.ca.xml
@@ -0,0 +1,108 @@
+<?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://shibboleth.ad.cybera.ca/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-06-11T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf
+</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">cybera.ca</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Cybera</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">Cybera</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Cybera is a not-for-profit, technical agency that is helping Alberta advance its IT frontiers.</mdui:Description>
+ <mdui:Description xml:lang="fr">Cybera is a not-for-profit, technical agency that is helping Alberta advance its IT frontiers.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.cybera.ca/about/cybera/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="fr">http://www.cybera.ca/about/cybera/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDSDCCAjCgAwIBAgIVAMmg9Pn2Pq9LL6hnJsqirBsx1/hBMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYWQuY3liZXJhLmNhMB4XDTE0MDYw
+NTIzMjM0N1oXDTM0MDYwNTIzMjM0N1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5h
+ZC5jeWJlcmEuY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG+m9g
+JN1yrI2i29T5fSilW2A3o/2+kV1cQzaDj2pNU7CiXfohyKvw3p6rTWriLh0nGSJp
+9DWtA4DhWOQsrtpPUNez8ZgFDzRQc7OUqZJIdh0EexhlGEipyGsAd4piEDqIbl5R
+EKMyqc7ok+22Lv8KbWi68ksMOYxvxggTbj37MJzoD7siYo72jztDAl8LWUu0On9u
+znQcoGN+yp3b0ZNFrZ+xciiNVN1IISqoHvVZVCzPH8jXrsZKon9Ga75B7DXouQbS
+RJwMEYMBKmBdCa8iL2fn+oaD9GHDZ6TlmRJFsun4ydIpmJYmUy5WzlNHQ95f+hG7
+h1HEt1rKkb33lJu/AgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguYWQu
+Y3liZXJhLmNhhi5odHRwczovL3NoaWJib2xldGguYWQuY3liZXJhLmNhL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBRF16/3CUxWL/2Gig8kuGMyT5Y1RTANBgkqhkiG
+9w0BAQUFAAOCAQEAeYprnDekEmkdGOz7RcEmUGrWjEC+KKSQrXaPNSx1+Wuasc7K
+ARqreWX3dEg+qUFi+M6pPD6/g6GmCyTioxeu9qeq7/vwT06RGA/2XbnLrgJ+Z95v
+vSbaqBB2xbthzV5vSRymh/jT0rYcidffG4i/3VFhM5pTgy1glAM/aorb2M1FWqLw
+jd3mIdybjOjUXTDDMgc5TuyyS3tgaOcbVSTPFZfCzjryjRH3yflUVIW1uhDM189R
+X8Wtsg9NJNF8tSx0c2LV3VpwCPRtGEary4ibf95iSdCX74+UhTK1O638s+vDjUo8
+z/rBMXsATszRELGSAA7w5QsrC4c3V99cTwkYhQ==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca: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>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ad.cybera.ca/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.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">cybera.ca</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDSDCCAjCgAwIBAgIVAMmg9Pn2Pq9LL6hnJsqirBsx1/hBMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYWQuY3liZXJhLmNhMB4XDTE0MDYw
+NTIzMjM0N1oXDTM0MDYwNTIzMjM0N1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5h
+ZC5jeWJlcmEuY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG+m9g
+JN1yrI2i29T5fSilW2A3o/2+kV1cQzaDj2pNU7CiXfohyKvw3p6rTWriLh0nGSJp
+9DWtA4DhWOQsrtpPUNez8ZgFDzRQc7OUqZJIdh0EexhlGEipyGsAd4piEDqIbl5R
+EKMyqc7ok+22Lv8KbWi68ksMOYxvxggTbj37MJzoD7siYo72jztDAl8LWUu0On9u
+znQcoGN+yp3b0ZNFrZ+xciiNVN1IISqoHvVZVCzPH8jXrsZKon9Ga75B7DXouQbS
+RJwMEYMBKmBdCa8iL2fn+oaD9GHDZ6TlmRJFsun4ydIpmJYmUy5WzlNHQ95f+hG7
+h1HEt1rKkb33lJu/AgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguYWQu
+Y3liZXJhLmNhhi5odHRwczovL3NoaWJib2xldGguYWQuY3liZXJhLmNhL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBRF16/3CUxWL/2Gig8kuGMyT5Y1RTANBgkqhkiG
+9w0BAQUFAAOCAQEAeYprnDekEmkdGOz7RcEmUGrWjEC+KKSQrXaPNSx1+Wuasc7K
+ARqreWX3dEg+qUFi+M6pPD6/g6GmCyTioxeu9qeq7/vwT06RGA/2XbnLrgJ+Z95v
+vSbaqBB2xbthzV5vSRymh/jT0rYcidffG4i/3VFhM5pTgy1glAM/aorb2M1FWqLw
+jd3mIdybjOjUXTDDMgc5TuyyS3tgaOcbVSTPFZfCzjryjRH3yflUVIW1uhDM189R
+X8Wtsg9NJNF8tSx0c2LV3VpwCPRtGEary4ibf95iSdCX74+UhTK1O638s+vDjUo8
+z/rBMXsATszRELGSAA7w5QsrC4c3V99cTwkYhQ==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.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">Cybera</OrganizationName>
+ <OrganizationName xml:lang="fr">Cybera </OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Cybera</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="fr">Cybera</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.cybera.ca/about/cybera/</OrganizationURL>
+ <OrganizationURL xml:lang="fr">http://www.cybera.ca/about/cybera/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>System Admin</SurName>
+ <EmailAddress>sysadmin@cybera.ca</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index eb77557b..5a862cc4 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,25 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://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:Extensions>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Catalog Clarin</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Catalog Clarin</mdui:DisplayName>
- <mdui:Description xml:lang="fi">Catalog Clarin</mdui:Description>
- <mdui:Description xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
- <mdui:Keywords xml:lang="en">Clarin Data Category Registry ISOcat Component Registry Virtual Language Observatory VLO</mdui:Keywords>
- <mdui:Keywords xml:lang="fi">Clarin Data Category Registry ISOcat Component Registry Virtual Language Observatory VLO</mdui:Keywords>
- <mdui:PrivacyStatementURL xml:lang="fi">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
+<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>
- <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 use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>catalog.clarin.eu</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
+TkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzANBgNVBAoTBk1Q
+SS1QTDETMBEGA1UECxMKY2F0YWxvZyBzcDEaMBgGA1UEAxMRY2F0YWxvZy5jbGFy
+aW4uZXUxHjAcBgkqhkiG9w0BCQEWD2xhdGFkbWluQG1waS5ubDAeFw0xNDA0Mjgw
+ODAyMDVaFw0xOTA0MjcwODAyMDVaMIGQMQswCQYDVQQGEwJOTDEMMAoGA1UECBMD
+R0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJLVBMMRMwEQYDVQQL
+EwpjYXRhbG9nIHNwMRowGAYDVQQDExFjYXRhbG9nLmNsYXJpbi5ldTEeMBwGCSqG
+SIb3DQEJARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA38nLf8TTeexrcqzfF5LOQ3F/9Tar+V7kNsLFUKO1ua6npX+4zgBu
+EYCm+hKrKDW09QN8yrBd+79a+slA4nCcpUymkh02rQhVbMpNiEQh8UFjqfaYv5fM
+R1OlgIWYXx2POdn60KbUYXIPGSrp2zQSXMFJMrnUOXHqxF8fxfTdbDEtcviXXwyC
+UjhXC4AJSLL/S8eftV8iioQDZMs5h1Kd95NVFsMhRC5MtD+iUyNsYR8X1PGaFg20
+bVg/Jg2eVNwPas49POr+HBOxk3BBtk8KwCAMwjCQUGL3zn7KeDLDFYsry/bWQtVn
+IbebSTysNhbrji3/VKnsPHiuOfCvYiqWEQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQDTDfQr4wjJGAUo7os8PWTmKFkAH4D3oFQpxe4bvf6U9of4+fmE778S+WZc9kKs
+A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
+Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
+ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
+yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
+gDLbA/e0dbDclBvxUIm9cemA
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>catalog.clarin.eu</ds:KeyName>
<ds:X509Data>
+ <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
<ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
TkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzANBgNVBAoTBk1Q
SS1QTDETMBEGA1UECxMKY2F0YWxvZyBzcDEaMBgGA1UEAxMRY2F0YWxvZy5jbGFy
@@ -39,36 +77,56 @@ A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
-gDLbA/e0dbDclBvxUIm9cemA</ds:X509Certificate>
+gDLbA/e0dbDclBvxUIm9cemA
+</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:SurName>Technical support</md:SurName>
- <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </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.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
index d2dba0bc..09741a34 100644
--- a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -1,91 +1,117 @@
<?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://sp.corpus1.mpi.nl">
- <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://corpus1.mpi.nl/Shibboleth.sso/DS" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Psykolingvistiikan Max Planck-instituutin palveluntarjoaja</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider</mdui:DisplayName>
- <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</mdui:Description>
- <mdui:Description xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="en">http://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.corpus1.mpi.nl">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-08T21:53:28Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://corpus1.mpi.nl/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
+ <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
+ <mdui:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
</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 use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
<ds:X509Data>
- <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHFy/hnqc8wTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
-MDI1MThaFw0xOTAyMjcxMDI1MThaMIGkMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
-R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
-Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
-ZXIgUHN5Y2hvbGluZ3Vpc3RpazEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGbPWbCx1FfjX9sh831NEW6MHN
-VSd9DElQH+1eAqevdt5g6sLCK4HTsigUkl94MdiaLzDwVngYoJ/QwycncE0bFFxg
-H0YHs8URXAOfkO9RmKy4x6TkuYElF8AmBnnEhoF58O1b/0DG8TdSpmWsMBrw+lyB
-gV++v15+WjuHn4DdXbG3AaaUMNYWPSk4fIvjPX19U9ys0euYcKa/kTU8nFuOJzVy
-WmUyNWjcgwImszfwwKaumIGDHGKSJ9eME/idNczuUhihY/kgU30+x4yfQ0PPJ6y1
-YLd+E2xAOmbjEbBnytkbRPVxHAPqw0py80meld2s70Cxxklj739+oP+++PwhAgMB
-AAGjggI/MIICOzA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEE
-AYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUE8+HM0pUcvXN
-4uBiDV/q2xwu2O8wHwYDVR0jBBgwFoAUAtYebgmrv1hlpwo8SDNh0c59w1swRAYD
-VR0RBD0wO4IOY29ycHVzMS5tcGkubmyCDGx1eDA3Lm1waS5ubIEbdG9iaWFzLnZh
-bnZhbGtlbmhvZWZAbXBpLm5sMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
-KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
-hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAGH5IPCi3tfYwo+CN357NdkGav1KQT2
-T0sjZ2chg//8SNucof42LXWvMlRIaRXjFP2bTW8sPt3hNwPyVLLAUFE/ogRz955Y
-a4Fbx/0bS1XZSCCneQ+pP+gnfad0AA3PJ2fDb/LUQ43q8xu8B1tm9GyTz6sE2mjU
-c0GOYUp4wvC/Hu3Wr1/80KbebBX5QxQPg9CVqXaz8yECpZwrTJsa3d+pY8WVA6Fr
-/0vQmp9LyYl9II3xrP5KMkLFWfusAqfDQbO+l0q44mGImEee3G4Wkg7VAcwDgKBa
-LHbuhlrBzMoxQBZGyW4eOToiuysyE37dSKtUgCs4vDN4S4EWz90Y6xY=</ds:X509Certificate>
+ <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
+YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
+MAkGA1UEBhMCTkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzAN
+BgNVBAoTBk1QSS1QTDEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwxHjAcBgkqhkiG
+9w0BCQEWD2xhdGFkbWluQG1waS5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMFrApun/KXB9YtFiT49PHz7uV9EoVmrFsCBNqVWYhM+msq2dkM7rNVe
+eZdy2hHID72ILMeqeXKX+hFQPyX18eN4L6lfJzzJJI2HGdIuGPyKZXCsVrCqnIWo
+VPRi5dnTlCpCEPhebt05L9TMQJrLWue2qDhhdwkaYrVfm+tsYGK9yiy3Gbsoa10L
+kEpd2oJZLDGHXSZJ6GL4oUMbQ+Z9bIjCelQWC4tU/u6qFGIzyoabaJbAlnFAxFSq
+DIQ9+27JObXMnVH/6iK0mhHTooB72Gd0LQHVHGiCrFyxmbhMp7tIX0vU3Qn4/U8F
+kt/Kep3+Wam/1h1NmmOJzTux2NuRurcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+YPPRnb1/92C/Si/V5I15TfFSTdOeMcVHQ0DY0ohUw8B4fEbr9htjZoW7Umyco5pF
+kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
+t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
+uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
+FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
+vKRir2Cb6A/NaScKNHBBhg==
+</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://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Psykolingvistiikan Max Planck-instituutin palveluntarjoaja</md:ServiceName>
- <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</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: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.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:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- </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>Technical</md:GivenName>
- <md:SurName>Support</md:SurName>
- <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Helpdesk</md:GivenName>
- <md:EmailAddress>mailto:corpman@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>corpus1.mpi.nl</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
+YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
+MAkGA1UEBhMCTkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzAN
+BgNVBAoTBk1QSS1QTDEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwxHjAcBgkqhkiG
+9w0BCQEWD2xhdGFkbWluQG1waS5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMFrApun/KXB9YtFiT49PHz7uV9EoVmrFsCBNqVWYhM+msq2dkM7rNVe
+eZdy2hHID72ILMeqeXKX+hFQPyX18eN4L6lfJzzJJI2HGdIuGPyKZXCsVrCqnIWo
+VPRi5dnTlCpCEPhebt05L9TMQJrLWue2qDhhdwkaYrVfm+tsYGK9yiy3Gbsoa10L
+kEpd2oJZLDGHXSZJ6GL4oUMbQ+Z9bIjCelQWC4tU/u6qFGIzyoabaJbAlnFAxFSq
+DIQ9+27JObXMnVH/6iK0mhHTooB72Gd0LQHVHGiCrFyxmbhMp7tIX0vU3Qn4/U8F
+kt/Kep3+Wam/1h1NmmOJzTux2NuRurcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+YPPRnb1/92C/Si/V5I15TfFSTdOeMcVHQ0DY0ohUw8B4fEbr9htjZoW7Umyco5pF
+kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
+t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
+uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
+FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
+vKRir2Cb6A/NaScKNHBBhg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceName>
+ <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceName>
+ <ServiceDescription xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceDescription>
+ <ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceDescription>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </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>Technical</GivenName>
+ <SurName>Support</SurName>
+ <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>General</GivenName>
+ <SurName>Support</SurName>
+ <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk.xml b/swamid-interfederations-2.0/sp.edina.ac.uk.xml
index 1c22a346..8430879b 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/kbplus">
- <!--
- This is an "EDINA Knowledge Base+" SP for the University of Edinburgh.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-27T15:54:52Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/sp.korp.csc.fi.xml b/swamid-interfederations-2.0/sp.korp.csc.fi.xml
index 45933ebd..147f3e7e 100644
--- a/swamid-interfederations-2.0/sp.korp.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.korp.csc.fi.xml
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.korp.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://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.korp.csc.fi/">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
<mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
@@ -14,12 +24,8 @@
<mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.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>
+ </Extensions>
+ <KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
@@ -48,42 +54,42 @@ eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
5G7muSfVNRBDgubGawMy3pYMrrCOxB4=</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://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</md:ServiceName>
- <md:ServiceName xml:lang="en">Korp – search service for text material</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</md:ServiceDescription>
- <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.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>Fin-Clarin</md:GivenName>
- <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Martin</md:GivenName>
- <md:SurName>Matthiesen</md:SurName>
- <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Jyrki</md:GivenName>
- <md:SurName>Niemi</md:SurName>
- <md:EmailAddress>mailto:jyrki.niemi@helsinki.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://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</ServiceName>
+ <ServiceName xml:lang="en">Korp – search service for text material</ServiceName>
+ <ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</ServiceDescription>
+ <ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</ServiceDescription>
+ <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="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>Fin-Clarin</GivenName>
+ <EmailAddress>mailto:fin-clarin@helsinki.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Martin</GivenName>
+ <SurName>Matthiesen</SurName>
+ <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Jyrki</GivenName>
+ <SurName>Niemi</SurName>
+ <EmailAddress>mailto:jyrki.niemi@helsinki.fi</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 6db70753..cb70909f 100644
--- a/swamid-interfederations-2.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sp.lat.csc.fi">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sp.lat.csc.fi">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">LAT – Language Archive Tools</mdui:DisplayName>
<mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
@@ -16,12 +26,8 @@
<mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
</mdui:UIInfo>
- <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>
+ </Extensions>
+ <KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
@@ -50,42 +56,42 @@ CiBkuiUynwqLsQKjfkcSZa5W9a8spV7y8LmCAEtDk8l03p45TKRvWIgMAexg/60h
TE5WJb+s+lUOs3IoVL33fpbG+Aor</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">LAT – Language Archive Tools</md:ServiceName>
- <md:ServiceName xml:lang="en">LAT – Language Archive Tools</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Tero</md:GivenName>
- <md:SurName>Aalto</md:SurName>
- <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Martin</md:GivenName>
- <md:SurName>Matthiesen</md:SurName>
- <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Tero</md:GivenName>
- <md:SurName>Aalto</md:SurName>
- <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="fi">LAT – Language Archive Tools</ServiceName>
+ <ServiceName xml:lang="en">LAT – Language Archive Tools</ServiceName>
+ <ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</ServiceDescription>
+ <ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</ServiceDescription>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+ <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <GivenName>Tero</GivenName>
+ <SurName>Aalto</SurName>
+ <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Martin</GivenName>
+ <SurName>Matthiesen</SurName>
+ <EmailAddress>mailto:martin.matthiesen@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Tero</GivenName>
+ <SurName>Aalto</SurName>
+ <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index 4f14f4fd..f1f30699 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,102 +1,131 @@
<?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: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:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
+bWluQG1waS5ubDAeFw0xNDA1MDIxMTI2MDZaFw0xOTA1MDExMTI2MDZaMHYxCzAJ
+BgNVBAYTAk5MMQwwCgYDVQQIEwNHTEQxETAPBgNVBAcTCE5pam1lZ2VuMQ8wDQYD
+VQQKEwZNUEktUEwxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDEeMBwGCSqGSIb3DQEJ
+ARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA3QaSP0LJ0mVZZIdEh7zFJW8lnkVGQFuueAiDfVVvGtGvJ5iz7CRoyrdTQDco
+oJjQDFub/uU6v0i+saVgI+LuzUlq28hrKF5hIjhWCLMRgYZzsnArcGK3etcChsNE
+OPfWNCOCGi90sIqNmJcVRoDw36tLiHXmIkhcy4ZE06SYXvT+qAwo4h30Z/IH2de/
+QlYEpkqF131p2lJGWx1Bi5l7IMeZtlwIzbJn08htAT/T8h6g9XvDfmQxS4xuiXGr
+uRwVhTTkTP9OsdrXkktJEkSE2p+qP0tYekb+ZPd4LzlSjnDWf3V1T/DrbL071eiC
+rx2iDW3n5Wy7so0iwmU5nr9QhwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAFSrqi
+HOMohDd4JXB3rjX8npCSTTeam84LTI1Twd8GXOmDQ8izcwsfUIILusEqd+66V/kh
+iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
+DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
+GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
+MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
+HFhkY9jzkGrcHMME
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>lux17.mpi.nl</ds:KeyName>
<ds:X509Data>
- <ds:X509Certificate>MIIFszCCBJugAwIBAgIHFy/fQCmDdDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
-MDE1MTNaFw0xOTAyMjcxMDE1MTNaMIGiMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
-R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
-Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
-ZXIgUHN5Y2hvbGluZ3Vpc3RpazEVMBMGA1UEAxMMbHV4MTcubXBpLm5sMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsJhlBpssTOOtNvBbnzE7VWsQfaOA
-LrwBcSNZbH928rPC75slLQpYTFeiHFhZ0ua3P7HzrHG/L4xxIYbmxBik2wI10xDQ
-sa+6lfOIOhttOTBoeciMni6eesRtPL1sVoBit6IHpthmL9+o0/t/erB+JOwAKnY7
-6eqCEO1Vx7gepyYAJEvXsIStPVQDhOGilTNlaRMykx89op97oQEwD1k/9sm9aGoU
-vVOiEuMVVfvRteboaJcC/MRNWQtRrN3lw9u3J77We5HTNcMESTLe7cTA7zY10pV1
-L4SwpraLaWtntQ7jtvgnmrCQF4UEjNuoyGdFqK1Cp0OU93oVsLCRJfNe/wIDAQAB
-o4ICLzCCAiswOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGB
-rSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFDo9I15dgi4VQw2g
-GDI0mzvjmtVrMB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMDQGA1Ud
-EQQtMCuCDGx1eDE3Lm1waS5ubIEbdG9iaWFzLnZhbnZhbGtlbmhvZWZAbXBpLm5s
-MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUHAQEEgbowgbcwMwYI
-KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NT
-UDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9tcGctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAMkKEc7OA0faJhU0gBJPc6BOb069aYUKYRWY0wfaLdGh/thMzdJQRC8Z
-YMN3BmqHUJukCcSPgxNKpd3KsiqxWODNpv3w7cOEDfJkOpWijbw+qRMvF83Tg9Bm
-9TuH80hWEn0AI+ECaWw7Lz8sSaPdEb+Qe4532JcLfDLiFo44RdFA8dFZepvwoKIg
-scv6u9W6FYUcQPEo9x0SmXMbC1Z8TEwXbICB/jp6w163B9zZ62o75gr0SJdlQvp6
-2tUUynz9p6HP8Qss2Ic1hyVjgSqzS3mcbbQvYOKWoQnWDKoZ0I5VTsP3pbrL4QIt
-IYFUWnGAtIjYcIIj3qFP/fJDyuZx9sA=</ds:X509Certificate>
+ <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
+bWluQG1waS5ubDAeFw0xNDA1MDIxMTI2MDZaFw0xOTA1MDExMTI2MDZaMHYxCzAJ
+BgNVBAYTAk5MMQwwCgYDVQQIEwNHTEQxETAPBgNVBAcTCE5pam1lZ2VuMQ8wDQYD
+VQQKEwZNUEktUEwxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDEeMBwGCSqGSIb3DQEJ
+ARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA3QaSP0LJ0mVZZIdEh7zFJW8lnkVGQFuueAiDfVVvGtGvJ5iz7CRoyrdTQDco
+oJjQDFub/uU6v0i+saVgI+LuzUlq28hrKF5hIjhWCLMRgYZzsnArcGK3etcChsNE
+OPfWNCOCGi90sIqNmJcVRoDw36tLiHXmIkhcy4ZE06SYXvT+qAwo4h30Z/IH2de/
+QlYEpkqF131p2lJGWx1Bi5l7IMeZtlwIzbJn08htAT/T8h6g9XvDfmQxS4xuiXGr
+uRwVhTTkTP9OsdrXkktJEkSE2p+qP0tYekb+ZPd4LzlSjnDWf3V1T/DrbL071eiC
+rx2iDW3n5Wy7so0iwmU5nr9QhwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAFSrqi
+HOMohDd4JXB3rjX8npCSTTeam84LTI1Twd8GXOmDQ8izcwsfUIILusEqd+66V/kh
+iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
+DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
+GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
+MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
+HFhkY9jzkGrcHMME
+</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>
+ <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>Lat</GivenName>
+ <SurName>Admin</SurName>
+ <EmailAddress>mailto:latadmin@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/sp.onlinelibrary.wiley.com.xml b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml
index ef06120f..f60ee92f 100644
--- a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml
+++ b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.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://sp.onlinelibrary.wiley.com/shibboleth">
- <!--
- This is a "Wiley Online Library" Shibboleth SP for John Wiley & Sons Limited.
- -->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -39,6 +36,49 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIFTDCCBDSgAwIBAgIQGN7fuC0Uze8yew92tsrArTANBgkqhkiG9w0BAQUFADCB
+ tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+ YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+ VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTQwNjA0
+ MDAwMDAwWhcNMTYwNzE3MjM1OTU5WjCBljELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+ Ck5ldyBKZXJzZXkxETAPBgNVBAcUCFNvbWVyc2V0MR8wHQYDVQQKFBZKb2huIFdp
+ bGV5ICYgU29ucywgSW5jMRkwFwYDVQQLFBBJbnRlcm5ldCBIb3N0aW5nMSMwIQYD
+ VQQDFBpzcC5vbmxpbmVsaWJyYXJ5LndpbGV5LmNvbTCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBALxNMyyEQztZxX2CnHwTsI5AIKhOza2HNuJ7fsfbmnS7
+ xCaDNVaVoT9nWvpLNwJ8Dn54IYCVJoFtnwkWHFu/E6AKjGROJt1YDQUMmoeNse+/
+ L1fj5NdGSiUpmFdnrJFSB5dFQ1qDG3R+23lfEZCKqByqEd6nnNZJIgMe32+1vA+k
+ S46cU2tRw+Z5UUDjdZ5dyTjKpdQ4mC+zQW4X1h6vrouNxcs/1En+EFqadQuVmLsQ
+ Yzkj0eLBGrYatWNELyZOxIOFj8ERb9Z+08eiXHa19K7uYUHw7ZBlyYciJZNZYVbw
+ 59YiXaByT9BR7cFgGxNKoAJpfw+PsBnT7kFB103yxqkCAwEAAaOCAXMwggFvMCUG
+ A1UdEQQeMByCGnNwLm9ubGluZWxpYnJhcnkud2lsZXkuY29tMAkGA1UdEwQCMAAw
+ DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBl
+ BgNVHSAEXjBcMFoGCmCGSAGG+EUBBzYwTDAjBggrBgEFBQcCARYXaHR0cHM6Ly9k
+ LnN5bWNiLmNvbS9jcHMwJQYIKwYBBQUHAgIwGRoXaHR0cHM6Ly9kLnN5bWNiLmNv
+ bS9ycGEwHwYDVR0jBBgwFoAUDURcFlNEwYJ+HSCrJfQBY9i+eaUwKwYDVR0fBCQw
+ IjAgoB6gHIYaaHR0cDovL3NkLnN5bWNiLmNvbS9zZC5jcmwwVwYIKwYBBQUHAQEE
+ SzBJMB8GCCsGAQUFBzABhhNodHRwOi8vc2Quc3ltY2QuY29tMCYGCCsGAQUFBzAC
+ hhpodHRwOi8vc2Quc3ltY2IuY29tL3NkLmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
+ Dc2lww9Dk/JaDPLQoHbqQjprtJZUTe9cEVvu02AKWMGvNlaUWDeHAqd1D+dbmMn7
+ mIXhqERDQUiEr7kS9yehKNSazQXvNy5S9xnPuO64m77zoDTslWIREyRgRPClxmvE
+ 6LXZzucaLy1KMuuiWK2Jle/yb8e9s5M51jU0UQVVQjFQaWe1NKUzrt31QgWAgTWX
+ vSMwOdHJKGYpHXjpalopAX8fNV4lNg6kt9Ob3kJsQtUQkVLlPkwaVwlVLgWjbTIO
+ avofP9ub8R9GYHjPSoX6IlOlJTFigxBnP4AonNGmQZjVgqp81MZSMhwEo7MZvhnT
+ QQTmkDY7OVzHpicSEkVGKw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIFZDCCBEygAwIBAgIQdUiWyjcBa6ojf+8p2ZlNmDANBgkqhkiG9w0BAQUFADCB
tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
diff --git a/swamid-interfederations-2.0/sp24-test.garr.it.xml b/swamid-interfederations-2.0/sp24-test.garr.it.xml
index 9fd37e67..a5649c87 100644
--- a/swamid-interfederations-2.0/sp24-test.garr.it.xml
+++ b/swamid-interfederations-2.0/sp24-test.garr.it.xml
@@ -2,8 +2,7 @@
<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp24-test.garr.it/shibboleth">
<Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-07T12:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
- </mdrpi:RegistrationPolicy>
+ <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">
@@ -13,6 +12,24 @@
<mdui:DisplayName xml:lang="it">Test SP shib 2.4</mdui:DisplayName>
<mdui:Description xml:lang="en">Test SP shib 2.4 for attributes release monitoring</mdui:Description>
<mdui:Description xml:lang="it">Test SP shib 2.4 per visualizzare il rilascio degli attributi</mdui:Description>
+ <mdui:InformationURL xml:lang="en">
+https://www.idem.garr.it/en/technical-information/176-servizio-sp-test
+</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="it">
+https://www.idem.garr.it/index.php/it/informazioni-tecniche/176-servizio-sp-test
+</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">
+https://www.idem.garr.it/index.php/it/informazioni-tecniche/262
+</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="it">
+https://www.idem.garr.it/index.php/it/informazioni-tecniche/262
+</mdui:PrivacyStatementURL>
+ <mdui:Logo height="60" width="80" xml:lang="en">
+https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg
+</mdui:Logo>
+ <mdui:Logo height="60" width="80" xml:lang="it">
+https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg
+</mdui:Logo>
</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://sp24-test.garr.it/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://sp24-test.garr.it/Shibboleth.sso/Login" index="1"/>
diff --git a/swamid-interfederations-2.0/sso.utu.fi.xml b/swamid-interfederations-2.0/sso.utu.fi.xml
index 979f5b29..34d5dd47 100644
--- a/swamid-interfederations-2.0/sso.utu.fi.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi.xml
@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sso.utu.fi/sso-idp">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
+<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" entityID="https://sso.utu.fi/sso-idp">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
<shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
- <mdui:UIInfo>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
</mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
+ </Extensions>
+ <KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
@@ -56,35 +57,35 @@ njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
8MIAfW66Oc6zKMOf26tiwK0/jhtn</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
- <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Tuomas</md:GivenName>
- <md:SurName>Honkala</md:SurName>
- <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Petri</md:GivenName>
- <md:SurName>Teraspuro</md:SurName>
- <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Elina</md:GivenName>
- <md:SurName>Toivanen</md:SurName>
- <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="fi">Turun yliopisto</OrganizationName>
+ <OrganizationName xml:lang="en">University of Turku</OrganizationName>
+ <OrganizationName xml:lang="sv">Åbo universitet</OrganizationName>
+ <OrganizationDisplayName xml:lang="fi">Turun yliopisto</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">University of Turku</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Åbo universitet</OrganizationDisplayName>
+ <OrganizationURL xml:lang="fi">http://www.utu.fi/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.utu.fi/</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.utu.fi/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Tuomas</GivenName>
+ <SurName>Honkala</SurName>
+ <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Petri</GivenName>
+ <SurName>Teraspuro</SurName>
+ <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Elina</GivenName>
+ <SurName>Toivanen</SurName>
+ <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org.xml
index 7b64359e..3b1161df 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/" registrationInstant="2011-06-08T02:00:00Z">
+ <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-bod-gui.geant.net.xml b/swamid-interfederations-2.0/test-bod-gui.geant.net.xml
index e351d63e..15c98b5a 100644
--- a/swamid-interfederations-2.0/test-bod-gui.geant.net.xml
+++ b/swamid-interfederations-2.0/test-bod-gui.geant.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://test-bod-gui.geant.net/autobahn-gui">
- <!--
- This is a "BoD Portal" autobahn-gui SP for Delivery of Advanced Network Technology to Europe Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-08T15:01:29Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
index f2627d6f..3acfb604 100644
--- a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
+++ b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ukfederation.org.uk/entity">
- <!--
- This is a UK federation Shibboleth 2 test SP.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T11:19:55Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/uat-adfs.geant.net.xml b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
index fdee8bc4..f3962283 100644
--- a/swamid-interfederations-2.0/uat-adfs.geant.net.xml
+++ b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://uat-adfs.geant.net/adfs/services/trust">
- <!--
- This is a "DANTE" ADFS SP for Delivery of Advanced Network Technology to Europe Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T17:06:35Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
index 8d1fdc15..4301e427 100644
--- a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.leeds1.emeraldinsight.com/entity">
- <!--
- This is an 'Emerald UAT Site' Shibboleth SP for Emerald Group Publishing Ltd.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-06T16:03:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
index 8b7b2688..4516009c 100644
--- a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
+++ b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
@@ -1,25 +1,57 @@
<?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://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
- <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://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
- <mdui:UIInfo>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ <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>
+ <mdasrt:Attribute xmlns:mdasrt="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">
+ <mdasrt:AttributeValue>http://eduid.cz/uri/sp-group/clarin</mdasrt:AttributeValue>
+ </mdasrt:Attribute>
+ </mdattr:EntityAttributes>
+ <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://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">
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">LINDAT/CLARIN repository and services</mdui:DisplayName>
- <mdui:DisplayName xml:lang="fi">LINDAT/CLARIN säilytyspaikka ja palvelut</mdui:DisplayName>
- <mdui:Description xml:lang="fi">LINDAT/CLARIN-projektin säilytyspaikka, jonka sijainti on \"Institute of Formal and Applied Linguistics\", Kaarlen yliopisto, Praha.</mdui:Description>
- <mdui:Description xml:lang="en">The repository of the LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Charles University in Prague.</mdui:Description>
+ <mdui:DisplayName xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Digital repository and services related to the LINDAT/CLARIN project focused on language research infrastructure at the Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</mdui:Description>
+ <mdui:Description xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN zaměřené na podporu výzkumu jazyka na Ústavu formální a aplikované lingvistiky Matematicko-fyzikální fakulty Univerzity Karlovy v Praze</mdui:Description>
<mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="fi">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+ <mdui:Logo height="29" width="29">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAdBAMAAACkvXo8AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAABJQTFRF////6ruX6aZ44Hs48+fc5ItNY8IEdAAAAAFiS0dEAIgFHUgAAAAJcEhZcwAAAEgAAABIAEbJaz4AAABXSURBVBjTY2AgDggJoPKNUfkspg6ofBUkjmgoSJIpEMYXNgbzjYYPHxQYrIYwvrNxCEjUBMZnMgaGjpOxAjxAgo1NQ41NEQHEaAwEyAHKKKQoQmTEoAEATVsQ7xmwu4QAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTMtMTItMTdUMTQ6NDI6NTgrMDE6MDACpPM3AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEzLTEyLTE3VDE0OjQyOjU5KzAxOjAw1Y5APwAAAABJRU5ErkJggg==</mdui:Logo>
<mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="fi">https://lindat.mff.cuni.cz/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>
+ <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://lindat.mff.cuni.cz/Shibboleth.sso/DS"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS" 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://lindat.mff.cuni.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://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="2"/>
+ </Extensions>
<md:KeyDescriptor>
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -45,43 +77,65 @@ fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
-IhAZYQU=</ds:X509Certificate>
+IhAZYQU=
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</md:KeyDescriptor>
- <md: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://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">LINDAT/CLARIN sailytyspaikka ja palvelut</md:ServiceName>
- <md:ServiceName xml:lang="en">LINDAT/CLARIN repository and services</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">LINDAT/CLARIN-projektin sailytyspaikka, jonka sijainti on "Institute of Formal and Applied Linguistics", Kaarlen yliopisto, Praha .</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">The repository of the LINDAT/CLARIN project at the Institute of Formal and Applied Linguistics, Charles University in Prague .</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: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.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
- <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:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">LINDAT/CLARIN digital repository and services</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+ <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="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:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+ <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="false"/>
</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:OrganizationName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague, Czech Republic</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">Ústav formální a aplikované lingvistiky, Matematicko-fyzikální fakulta, Univerzita Karlova v Praze</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">ÚFAL MFF UK</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://ufal.mff.cuni.cz/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://ufal.mff.cuni.cz/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>Jozef</md:GivenName>
- <md:SurName>Misutka</md:SurName>
- <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
+ <md:GivenName>Pavel</md:GivenName>
+ <md:SurName>Straňák</md:SurName>
+ <md:EmailAddress>stranak@ufal.mff.cuni.cz</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
- <md:GivenName>Jozef</md:GivenName>
- <md:SurName>Misutka</md:SurName>
- <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
+ <md:GivenName>Authentication Support</md:GivenName>
+ <md:EmailAddress>lindat-technical@ufal.mff.cuni.cz</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 896cc987..68a8af8e 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,5 +1,10 @@
<?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:shibmd="urn:mace:shibboleth:metadata:1.0" 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>
@@ -182,11 +187,6 @@
<shibmd:Scope regexp="false">sbi.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope regexp="false">staff.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope regexp="false">student.aau.dk@aau.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>
@@ -214,4 +214,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..555f7bcc 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,84 +1,97 @@
<?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>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
<ds:X509Data>
- <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:X509SubjectName>emailAddress=wladmin@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=SfS,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGKzCCBROgAwIBAgIHF3iUXPRQADANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
+EwJERTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMT
+R2xvYmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVu
+aS10dWViaW5nZW4uZGUwHhcNMTQwNDI0MTM1MTA4WhcNMTkwMjA0MDAwMDAwWjCB
+wjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
+A1UEBxMJVHVlYmluZ2VuMR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgVHVlYmluZ2Vu
+MQwwCgYDVQQLEwNTZlMxJjAkBgNVBAMTHXdlYmxpY2h0LnNmcy51bmktdHVlYmlu
+Z2VuLmRlMSswKQYJKoZIhvcNAQkBFhx3bGFkbWluQHNmcy51bmktdHVlYmluZ2Vu
+LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2KsTGSUCY/epaymY
+W3kqRl84RcNArc5w05x0rEi1qQUpAL1V7K7rJ/p5ZnjxqEhXEqYZXWh0ebkYWgzZ
+jr1Bs3mV1XVJ/9HrwRSFcNdyyFPmmP3Glsaculyn3zIQ4UcPyLk/kRlg37rx5nKj
+m3DZdrk345mjHO6MknFMSuh2TosI0tNhaa4rrRMJTlcOVJpiVlAF/DSZgwPjI6Yl
+5aHKes43tkCx1LJxDRAz9i/DaW4HdYNcwW3A0qlkRKRZqqVwRCG3Z5b9qdSry6t0
+UmmXMLYAxaStHVBx8d3eYWURfMLbvnpGKwWl0XGZQcevA9SzWswdmF/3X7zAmVAQ
+4L2qUQIDAQABo4ICbjCCAmowOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEw
+EQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQE
+AwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU9cQi9vwBJfcH9+Ae
+ytdTniex90EwHwYDVR0jBBgwFoAUsMG7aDV/4tZBnBpxr+D8QTTNw6gwRgYDVR0R
+BD8wPYIdd2VibGljaHQuc2ZzLnVuaS10dWViaW5nZW4uZGWBHHdsYWRtaW5Ac2Zz
+LnVuaS10dWViaW5nZW4uZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMEKgQKA+hjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVl
+LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsG
+AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
+TAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0
+dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGZ9bLdCBVw1Txf0f59QvfPe
+Ic02a/QJieoXre844zW5ISZwp14vGy+yzk4BK1tSovtxwf/FHiC7Uoqi+T9cL7E5
+yBbP2Y6cBHJuxy4YyXLimJoO7NWBDW+MOQRN1HjI5KXTMhhzmI81iofZbBlZwCSe
+pUzeHCt4KF3LDrrvNy4YiziDuojh23MHEv8W1/aNhX4F0T+MvwO2dGxAbax7XgLL
+ndO3/u6io4gRQiXZrrAS+1ZXGybrr6gUBN6popli1bR148tWwZNzwe1NjbGBIA5a
+ydKuf18CBYHeixW6XzkCMEdcRTec/qVTn7stpLtuuC5TCblNKGDKmhx9Mec+1Jo=
+</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>Department of Linguistics, General and Computational Linguistics</GivenName>
+ <SurName>Support</SurName>
+ <EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Department of Linguistics, General and Computational Linguistics</GivenName>
+ <SurName>Support</SurName>
+ <EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin.uu.se.xml b/swamid-interfederations-2.0/weblogin.uu.se.xml
index 3f8c5a81..4e5058c2 100644
--- a/swamid-interfederations-2.0/weblogin.uu.se.xml
+++ b/swamid-interfederations-2.0/weblogin.uu.se.xml
@@ -127,9 +127,9 @@ MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
<EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
</ContactPerson>
<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
- <Company>Uppsala University</Company>
- <SurName>Helpdesk</SurName>
+ <Company>Uppsala universitet</Company>
+ <SurName>IT Servicedesk</SurName>
<EmailAddress>helpdesk@uu.se</EmailAddress>
- <TelephoneNumber>+46184717890</TelephoneNumber>
+ <TelephoneNumber>+46 18 4714400</TelephoneNumber>
</ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin2.geant.net.xml b/swamid-interfederations-2.0/weblogin2.geant.net.xml
index 58c8e156..48674cd6 100644
--- a/swamid-interfederations-2.0/weblogin2.geant.net.xml
+++ b/swamid-interfederations-2.0/weblogin2.geant.net.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://weblogin2.geant.net/adfs/services/trust">
- <!--
- This is a "GÉANT Intranet" ADFS SP for Delivery of Advanced Network Technology to Europe Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T15:23:31Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml b/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml
index 07ddffee..8c5c586d 100644
--- a/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml
+++ b/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.moonshot.ja.net/shibboleth">
- <!--
- This is a "Moonshot Wiki" Shibboleth SP for JISC Collections and Janet Limited.
- -->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/wiki.shibboleth.net.xml b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
index 48b067cb..5785126d 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 Federated Wiki" Shibboleth SP for JISC Collections and Janet Limited.
- -->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com.xml b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
index ba3c1f16..9182934b 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
@@ -1,32 +1,152 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/entity">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/entity">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-28T12:31:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" index="1"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" index="2"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" index="3"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/UKFederation"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" index="4"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" index="5"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIE8jCCA9qgAwIBAgISESHmB/1YUGeeJHspwyEmQou4MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMwMjE4MDkzMTM3WhcNMTUwMjI0MTYxMDEwWjBLMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAMTHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw5EIVTrlQBc3C7S1KuJ3pMncEEcnQg1Jn2RHGgUlmUgZVYGsbyID7f3z4fAv1QkVTfPk/FcwnAA0Z03KH9x0skkJ2jseMRCEkblUoJ4oOHABTq3zVwOvp5gKPbAT/yh1Oxm0Q4dxoHbO8CbnLLHG4Glk0Wehch7rpEOTg+5Z5uvnPXulTPHhHYomXZOdIt9loAoXsjG+4syQIOTsnzrMOznOTY1tCN4qYxDa+xsl1RhggKVGkggDhWq+plL9T91BEQSGXK+63RF6K7bCDnIU7+mBGeWU3hVL9zIaSvO++MKoQarWavLxfp+n8SYMvV5j1+K1fhO7MwSv71QJq+lhwwIDAQABo4IBwjCCAb4wDgYDVR0PAQH/BAQDAgWgMEwGA1UdIARFMEMwQQYJKwYBBAGgMgEKMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCgGA1UdEQQhMB+CHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBT60b17A1RwTyt94NQOm++yXTrfojAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAWOBI5SREMlWLRx5OONoICRxzjMQtF5lG94gTqlzD6DvU0svW1AAwDA3HUrgH9xagJDCNqHqrya1RS2LDtAwDenUir9/AE3RwrnsvNAucds/+htiHuUlYFNGlqOMr4WH6NxpZ1o3u4VIpELhOtrOPof0ba5PvA4dD2adyEJSKtESlgarUKulHAKeQeEFERxqrW9c6qP0lXc3SuukwHsmEiGniscQGQLj/bChTGzbCdYMPdS9ETF/uOqAocg+Hge8bBbUnZrm9tYidytJhpFaF+hEvfojlik6Z/LGVPykrJXBh7zMl4hWx1kJtNij0LE6dX9TFeYDjjUbD//0P7CmVsw==</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>MIIE8jCCA9qgAwIBAgISESHmB/1YUGeeJHspwyEmQou4MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMwMjE4MDkzMTM3WhcNMTUwMjI0MTYxMDEwWjBLMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAMTHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw5EIVTrlQBc3C7S1KuJ3pMncEEcnQg1Jn2RHGgUlmUgZVYGsbyID7f3z4fAv1QkVTfPk/FcwnAA0Z03KH9x0skkJ2jseMRCEkblUoJ4oOHABTq3zVwOvp5gKPbAT/yh1Oxm0Q4dxoHbO8CbnLLHG4Glk0Wehch7rpEOTg+5Z5uvnPXulTPHhHYomXZOdIt9loAoXsjG+4syQIOTsnzrMOznOTY1tCN4qYxDa+xsl1RhggKVGkggDhWq+plL9T91BEQSGXK+63RF6K7bCDnIU7+mBGeWU3hVL9zIaSvO++MKoQarWavLxfp+n8SYMvV5j1+K1fhO7MwSv71QJq+lhwwIDAQABo4IBwjCCAb4wDgYDVR0PAQH/BAQDAgWgMEwGA1UdIARFMEMwQQYJKwYBBAGgMgEKMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCgGA1UdEQQhMB+CHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBT60b17A1RwTyt94NQOm++yXTrfojAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAWOBI5SREMlWLRx5OONoICRxzjMQtF5lG94gTqlzD6DvU0svW1AAwDA3HUrgH9xagJDCNqHqrya1RS2LDtAwDenUir9/AE3RwrnsvNAucds/+htiHuUlYFNGlqOMr4WH6NxpZ1o3u4VIpELhOtrOPof0ba5PvA4dD2adyEJSKtESlgarUKulHAKeQeEFERxqrW9c6qP0lXc3SuukwHsmEiGniscQGQLj/bChTGzbCdYMPdS9ETF/uOqAocg+Hge8bBbUnZrm9tYidytJhpFaF+hEvfojlik6Z/LGVPykrJXBh7zMl4hWx1kJtNij0LE6dX9TFeYDjjUbD//0P7CmVsw==</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">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 indenfor socialvidenskab</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Emerald Live Site</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.emeraldinsight.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Rob</GivenName>
+ <SurName>Wood</SurName>
+ <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Laurence</GivenName>
+ <SurName>Parkin</SurName>
+ <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.knodium.com.xml b/swamid-interfederations-2.0/www.knodium.com.xml
index 7edb7e2a..b7f59b00 100644
--- a/swamid-interfederations-2.0/www.knodium.com.xml
+++ b/swamid-interfederations-2.0/www.knodium.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://www.knodium.com/Shibboleth.sso/Metadata">
- <!--
- This is an SP for Knodium Limited.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-11T08:57:13Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/www.portal.euromonitor.com.xml b/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
index 53dbc143..ec8a588e 100644
--- a/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
+++ b/swamid-interfederations-2.0/www.portal.euromonitor.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://www.portal.euromonitor.com/shibboleth">
- <!--
- This is an OpenAthens service provider for Euromonitor International plc.
- -->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-22T16:58:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/www.qoam.eu.xml b/swamid-interfederations-2.0/www.qoam.eu.xml
index d0bc6992..33074fb8 100644
--- a/swamid-interfederations-2.0/www.qoam.eu.xml
+++ b/swamid-interfederations-2.0/www.qoam.eu.xml
@@ -4,11 +4,16 @@
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-06-02T14:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">QOAM</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">QOAM - Quality Open Access Market</mdui:DisplayName>
<mdui:Description xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</mdui:Description>
<mdui:InformationURL xml:lang="en">https://www.qoam.eu/oamarket/about</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="en">https://www.qoam.eu/oamarket/about#privacy</mdui:PrivacyStatementURL>
@@ -38,11 +43,10 @@
<md:ServiceName xml:lang="en">QOAM</md:ServiceName>
<md:ServiceName xml:lang="nl">QOAM</md:ServiceName>
<md:ServiceDescription xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute 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" isRequired="true"/>
- <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.25178.1.2.9" 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.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-interfederations-2.0/www.rediris.es.xml b/swamid-interfederations-2.0/www.rediris.es.xml
index eac93c8d..a6f9a339 100644
--- a/swamid-interfederations-2.0/www.rediris.es.xml
+++ b/swamid-interfederations-2.0/www.rediris.es.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/umaidp">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/unedidp">
<md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
@@ -8,12 +8,12 @@
<IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Universidad de Málaga</mdui:DisplayName>
- <mdui:DisplayName xml:lang="es">Universidad de Málaga</mdui:DisplayName>
- <mdui:Description xml:lang="en">The Identity Provider of Universidad de Málaga</mdui:Description>
- <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad de Málaga</mdui:Description>
+ <mdui:DisplayName xml:lang="en">UNED</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="es">Universidad Nacional de Educación a Distancia</mdui:DisplayName>
+ <mdui:Description xml:lang="en">The Identity Provider of UNED</mdui:Description>
+ <mdui:Description xml:lang="es">El proveedor de identidad de UNED</mdui:Description>
</mdui:UIInfo>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.es</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uned.es</shibmd:Scope>
</md:Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -45,19 +45,19 @@ DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uned/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/uned/saml2/idp/SingleLogoutService.php"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uma/shib13/idp/SSOService.php"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uma/saml2/idp/SSOService.php"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uned/shib13/idp/SSOService.php"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uned/saml2/idp/SSOService.php"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uma/shib13/idp/aa.php"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uned/shib13/idp/aa.php"/>
</AttributeAuthorityDescriptor>
<md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
<md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">University of Malaga</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="es">Universidad de Málaga</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Universidad Nacional de Educación a Distancia</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="es">National Distance Education University</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
<md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/www.scran.ac.uk.xml b/swamid-interfederations-2.0/www.scran.ac.uk.xml
index 7375a2b9..3b288ae0 100644
--- a/swamid-interfederations-2.0/www.scran.ac.uk.xml
+++ b/swamid-interfederations-2.0/www.scran.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://www.scran.ac.uk/shibboleth">
- <!--
- This is a "Scran" Shibboleth SP belonging to Scran Limited.
- -->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml
index a69bb412..f4104361 100644
--- a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml
+++ b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml
@@ -106,8 +106,8 @@
<md:Organization>
<md:OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationName>
<md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="it">WiFi IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">WiFi provided by IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="it">WiFi erogato da IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.fsm.unipi.it</md:OrganizationURL>
<md:OrganizationURL xml:lang="it">http://www.fsm.unipi.it</md:OrganizationURL>
</md:Organization>