summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-09-21 10:18:03 +0200
committerLeif Johansson <leifj@sunet.se>2015-09-21 10:18:03 +0200
commit2156db660b13af636dce435f26a12bbcca02cdf4 (patch)
treee1aa8e317905e9522a1cdfa88a7ef8239459e1a7
parent5db36adf5391383ab35e0bfea7f887e346a957bf (diff)
parent0f50a0e49122cd18c8521accdc07991a2596cb8c (diff)
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Diffstat
-rwxr-xr-xscripts/pull-and-verify.sh2
-rw-r--r--swamid-2.0/idp.hkr.se-idp-shibboleth.xml4
-rw-r--r--swamid-2.0/idp.rkh.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/internt.geol.lu.se-shibboleth.xml88
-rw-r--r--swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml89
-rw-r--r--swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml199
-rw-r--r--swamid-2.0/pera.cs.lth.se-shibboleth.xml22
-rw-r--r--swamid-2.0/play.hkr.se.xml51
-rw-r--r--swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml53
-rw-r--r--swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml93
-rw-r--r--swamid-externals-2.0.mxml7
-rw-r--r--swamid-externals-2.0/downloads.channel8.msdn.com.xml92
-rw-r--r--swamid-externals-2.0/issues.shibboleth.net.xml86
-rw-r--r--swamid-externals-2.0/metadata.lst6
-rw-r--r--swamid-externals-2.0/spaces.internet2.edu-shibboleth.xml110
-rw-r--r--swamid-externals-2.0/spaces.internet2.edu.xml102
-rw-r--r--swamid-externals-2.0/terena.org-sp.xml54
-rw-r--r--swamid-externals-2.0/terena.org.xml54
-rw-r--r--swamid-externals-2.0/wiki.shibboleth.net.xml85
-rw-r--r--swamid-interfederations-1.0/wayf.wayf.dk.xml2
-rw-r--r--swamid-interfederations-2.0.mxml14
-rw-r--r--swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml39
-rw-r--r--swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/auth.howcloud.com-saml-metadata.php.xml95
-rw-r--r--swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml43
-rw-r--r--swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml51
-rw-r--r--swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml73
-rw-r--r--swamid-interfederations-2.0/federation.napier.ac.uk-idp-pingfederate.xml100
-rw-r--r--swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml95
-rw-r--r--swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml108
-rw-r--r--swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml1
-rw-r--r--swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml236
-rw-r--r--swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml94
-rw-r--r--swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml3
-rw-r--r--swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml159
-rw-r--r--swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml95
-rw-r--r--swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml26
-rw-r--r--swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml71
-rw-r--r--swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml48
-rw-r--r--swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml203
-rw-r--r--swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml77
-rw-r--r--swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml107
-rw-r--r--swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml37
-rw-r--r--swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml98
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml118
-rw-r--r--swamid-interfederations-2.0/wayf.wayf.dk.xml2
-rw-r--r--swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml22
-rw-r--r--swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml8
-rw-r--r--swamid-sp-2.0.mxml7
-rw-r--r--swamid-testing-idp-1.0.mxml1
57 files changed, 2302 insertions, 1050 deletions
diff --git a/scripts/pull-and-verify.sh b/scripts/pull-and-verify.sh
index b8b1e223..7cfda0a8 100755
--- a/scripts/pull-and-verify.sh
+++ b/scripts/pull-and-verify.sh
@@ -24,7 +24,7 @@ T=`mktemp`
for md in $DIR/*.xml; do
xsltproc xslt/clean-entitydescriptor.xsl $md > $T && mv $T $md
test=`echo $md | cut -d/ -f2-`
- if [ ! -f "swamid-2.0/$test" ]; then
+ if [ ! -f "swamid-2.0/$test" -a ! -f "swamid-2.0-obsolete/$test" ]; then
echo "<xi:include href=\"$md\"/>"
fi
done
diff --git a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
index 58110b89..c13c899b 100644
--- a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
@@ -82,8 +82,4 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
<OrganizationDisplayName xml:lang="en">Högskolan Kristianstad</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.hkr.se</OrganizationURL>
</Organization>
- <ContactPerson contactType="technical">
- <Company>Högskolan Kristianstad</Company>
- <EmailAddress>roland.svedman@hkr.se</EmailAddress>
- </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
index c038ceab..2e83de39 100644
--- a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
@@ -91,18 +91,18 @@ MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>Swedish Red Cross University College</Company>
<SurName>IT-support</SurName>
- <EmailAddress>itsupport@rkh.se</EmailAddress>
+ <EmailAddress>servicedesk@rkh.se</EmailAddress>
<TelephoneNumber>+46858751607/+46858751603</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Swedish Red Cross University College</Company>
<SurName>IT-support</SurName>
- <EmailAddress>itsupport@rkh.se</EmailAddress>
+ <EmailAddress>servicedesk@rkh.se</EmailAddress>
<TelephoneNumber>+46858751607</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Swedish Red Cross University College</Company>
<SurName>IT-Support Röda Korsets Högskola</SurName>
- <EmailAddress>itsupport@rkh.se</EmailAddress>
+ <EmailAddress>servicedesk@rkh.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/internt.geol.lu.se-shibboleth.xml b/swamid-2.0/internt.geol.lu.se-shibboleth.xml
new file mode 100644
index 00000000..75b9c907
--- /dev/null
+++ b/swamid-2.0/internt.geol.lu.se-shibboleth.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://internt.geol.lu.se/shibboleth">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://internt.geol.lu.se/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://internt.geol.lu.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Internal - geology</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Internt - geologi</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Webserver with booking system and other resources for internal use at Geocentrum, LU</mdui:Description>
+ <mdui:Description xml:lang="sv">Webserver med bokningssystem och andra interna resurser för Geocentrum, LU</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://internt.geol.lu.se/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv"> https://internt.geol.lu.se/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>internt</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=internt</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAO+LYHyU8ytHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+BAMTB2ludGVybnQwHhcNMTUwODE4MTA1MTA1WhcNMjUwODE1MTA1MTA1WjASMRAw
+DgYDVQQDEwdpbnRlcm50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+qTBOrK3l3QhtxQq2TdIA9PMWutYKCBcB3u99rjABdJ/c9kvEQ/816J7mDhyqaFyA
+l7xIR/DOEkcJh0/ZoXOoxKP2mW14fxLrD10wu0ikGTeuoyvGkOoAN9agpGZS7IuH
+fH3/CD1bm+D4Ns4f90C6GEKbSsUxo9MyjljUoKlavXf2AcoB8wp8YBum1PbxhuhO
+cS/ZnILnj9U9Maw3e6DwFJaHsdBuHqvBTNozuzNoEPwIPqcFHFz6C5u/AYJsuYuj
+Uv7GqWwJRrymcnEZjC668XR2aWmeaYFe3zp801+2v5naIFDZXHCVy6SvIEqZrTbd
+lhwq8TwO5OeuT+UECtJLQwIDAQABozUwMzASBgNVHREECzAJggdpbnRlcm50MB0G
+A1UdDgQWBBSmgmN3VdpIxSc2PGwBkl+5WOVxPDANBgkqhkiG9w0BAQUFAAOCAQEA
+b8b/Ta/dF6DK5dG6ap2dyNNhPFn3+ODsbv9+DjhiHG63112o0ipFF9ydetBYpnkW
+gWBE8IRCZval00NzULXt7LfUnNobcD1ZDjla8kMesrlrG52X2f+Ny4MpRiqVfkTh
+uXk7OaiT2dZ0TGO+77kBbbv8WqBOnqQ29kt7Uzt8lbxKGhLI9Ugq0Y5YALq3sNR9
+DPTXjZrZ7rM5RWYhrx6WzJE8oiDWHjE5D2qhFHzz3TMdaMojNkAlO4MsyYiZjMWb
+RP1ZTI2l2H1MpJgUuNPIeA9bKcaL0NunL8of4brlyFJs+PH1asPODraPvAkLf4XI
+pyBfqZRW+lFWZ6b06Bj4Mg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://internt.geol.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://internt.geol.lu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://internt.geol.lu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://internt.geol.lu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://internt.geol.lu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://internt.geol.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://internt.geol.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://internt.geol.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://internt.geol.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://internt.geol.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Gert</md:GivenName>
+ <md:SurName>Pettersson</md:SurName>
+ <md:EmailAddress>gert.pettersson@geol.lu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml
new file mode 100644
index 00000000..596c395a
--- /dev/null
+++ b/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://keystone.cloud.ipnett.se/shibboleth">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">IPnett Cloud Services</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">IPnett Cloud Services</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IPnett Cloud Services OpenStack</mdui:Description>
+ <mdui:Description xml:lang="sv">IPnett Cloud Services OpenStack</mdui:Description>
+ <mdui:Logo width="77" height="64">https://idp.cloud.ipnett.se/ipnett.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDmzCCAoOgAwIBAgIJAKmRdFPTnNe1MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+ BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
+ ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
+ DTE1MDkwODExMTQwOFoXDTE1MTAwODExMTQwOFowZDELMAkGA1UEBhMCU0UxEjAQ
+ BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
+ MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
+ kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
+ XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
+ Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
+ fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
+ kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
+ A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
+ t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBz
+ uy9AUKBxRYIRo/hkp9OlVEnDWUzu2aGLYOKVVL2PUaIiyLT/deJtRvhqz2kxcGFY
+ Yiq3Z4vgtPHZbpT4Low3WphgdgtJK7rOQBUVMex+Ydz866roKSQ4/OFdQ26FNfpm
+ sUK39i+3pNzhK66Vs5ezCVsF4SidyuCU2Nyta2cYF4n4oTKwEi782OmRpV6T0n40
+ yRUDPdrAAONV6l/aLzB356PFJVNrDypOVutvDDGPhPpwfK3dZnVpykXn14aY+yop
+ Ns4mS6CJAzBB0aVRbNZ99noV/Qqcog4zNZvQr3ymRfr+JIdTaNisSN1lBjgFoh8d
+ 58AtMMXk7/2okGexE3sN
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDmzCCAoOgAwIBAgIJAKmRdFPTnNe1MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+ BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
+ ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
+ DTE1MDkwODExMTQwOFoXDTE1MTAwODExMTQwOFowZDELMAkGA1UEBhMCU0UxEjAQ
+ BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
+ MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
+ kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
+ XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
+ Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
+ fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
+ kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
+ A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
+ t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBz
+ uy9AUKBxRYIRo/hkp9OlVEnDWUzu2aGLYOKVVL2PUaIiyLT/deJtRvhqz2kxcGFY
+ Yiq3Z4vgtPHZbpT4Low3WphgdgtJK7rOQBUVMex+Ydz866roKSQ4/OFdQ26FNfpm
+ sUK39i+3pNzhK66Vs5ezCVsF4SidyuCU2Nyta2cYF4n4oTKwEi782OmRpV6T0n40
+ yRUDPdrAAONV6l/aLzB356PFJVNrDypOVutvDDGPhPpwfK3dZnVpykXn14aY+yop
+ Ns4mS6CJAzBB0aVRbNZ99noV/Qqcog4zNZvQr3ymRfr+JIdTaNisSN1lBjgFoh8d
+ 58AtMMXk7/2okGexE3sN
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keystone.cloud.ipnett.se/Shibboleth.sso/Logout"/>
+ <md:AssertionConsumerService Location="https://keystone.cloud.ipnett.se/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">IPnett Cloud Services OpenStack</md:ServiceName>
+ <md:ServiceName xml:lang="sv">IPnett Cloud Services OpenStack</md:ServiceName>
+ <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="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="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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml b/swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml
new file mode 100644
index 00000000..d0f26316
--- /dev/null
+++ b/swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ This is example metadata only. Do *NOT* supply it as is without review,
+ and do *NOT* provide it in real time to your partners.
+
+ This metadata is not dynamic - it will not change as your configuration changes.
+-->
+<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:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://ls00002.ad.mah.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope regexp="false">ad.mah.se</shibmd:Scope>
+ <!--
+ Fill in the details for your IdP here
+
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">A Name for the IdP at ls00002.ad.mah.se</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Enter a description of your IdP at ls00002.ad.mah.se</mdui:Description>
+ <mdui:Logo height="HeightInPixels" width="WidthInPixels">https://ls00002.ad.mah.se/Path/To/Logo.png</mdui:Logo>
+ </mdui:UIInfo>
+-->
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLzCCAhegAwIBAgIUVNV40DAZB5mUHVKVe6tGY1I42hkwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRbHMwMDAwMi5hZC5tYWguc2UwHhcNMTUwOTE1MTM0ODIx
+WhcNMzUwOTE1MTM0ODIxWjAcMRowGAYDVQQDDBFsczAwMDAyLmFkLm1haC5zZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJFxEzw0GeMNcOml3Nw3OIGB
+MTNSGG9r6dDsDV5tSHR6Yr/klOSoVnNh6zA2Ll750WM40oWN9jOZGc9uu+SFsXxh
+brkXcm1F78fVXV/h9G225sgux7g4/eMEC65gJncid566EF+ZJg1t0KIKxJq6j2W0
+D5eDSaS6gUi7HF1Nk3047xYUQkN7NJdJfiWn2jHBMa0eEWzPDo2BhgZFkIUB0H0C
+BN9t4RCtJeoj8sS7aDv5FShkTk7f40RLwH6Awr/oj8uRuDcNssRNO410QxRjtTov
+iKsQxGRAd9fbxBounyR8Ug3uCSVIz/wcW99fj4MOluyjz3kV7P+gmfAJlBgRJCMC
+AwEAAaNpMGcwHQYDVR0OBBYEFH7Ht/AR5jhuoXbez822ADbykyQIMEYGA1UdEQQ/
+MD2CEWxzMDAwMDIuYWQubWFoLnNlhihodHRwczovL2xzMDAwMDIuYWQubWFoLnNl
+L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAdqjtt6OkfZmFfITCY
+vMuiid+scQo++NZVr/maC3GobCCqGEEb5biTaXT7u9Txd/gmc3Va0jp8a8zfg7xT
+s3B4ptKQrSZdlEnBRjb1jEKjEwC/r5mrBw5zCkToZq2ZB4UnrvjqP26L0tJjIJcZ
+tFPyUKph+Ra8kTudJR55h8cGNtrcacrrWYCgTuxOwvHI0kAbI9wf4nKJodi809/B
+Jxk5G3+4FL1Bih22sNjCjyKhwzTZqeFO5nSEwHqHItc+wmWwXFrNlXorD9iR7AFX
+D7P4t/ZEhlF/1zXOrZe9RHTruTRckpDu7hWcwcuQCJww+kmlw3GzNjRMMN6RvxX0
+JV2n
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVALRMqgBuPbEymZ1A3rOUBJgcu+6jMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWxzMDAwMDIuYWQubWFoLnNlMB4XDTE1MDkxNTEzNDgx
+OVoXDTM1MDkxNTEzNDgxOVowHDEaMBgGA1UEAwwRbHMwMDAwMi5hZC5tYWguc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCK/VyAL5u8SSu/vI5ejQrI
+L9fYl+3kOVkRqMbTrmkYDoJuH/hJ/EFkzsf10lL+Q9pblEe7tPHZW11L7hhg8uRv
+7rcHAA/wNyHrJj8wop0AvxJ/mw5me91KajBijnkznURYlHSnDwXMVlPNsnzt7zvL
+hfVh+ViSsYeIrqUGmWqNGv45RRmkywZOhzAxBecn6Y6RhNPGWrBF1J5vTfH2Awhb
+s163xVKk1C2kk27xfaxrCEzFv3uJ6WJVSdc2c2PaH02/BzIhvP5YfU31BUYMW6W5
+5ElGxc1EeBoHy72a8nWJC2vSEDJuTT9JlmLyIacjz88b4KUjaxcncGB42bame2+n
+AgMBAAGjaTBnMB0GA1UdDgQWBBSis6HHtfa5Ghu1UWkShNy/j9cEdDBGBgNVHREE
+PzA9ghFsczAwMDAyLmFkLm1haC5zZYYoaHR0cHM6Ly9sczAwMDAyLmFkLm1haC5z
+ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAEEY+ulRi3+21GAoJ
+2jXfWASbFfAFxAfAjxgv/CzmRQFm1WAOLDG5Ga3A0oYcdgmJvMImjSu6Lk/0AxAh
+Ey+B6C2sJxuGwNtjvxo+8xrOPG2enF2efRwVePFCNOvjfOuq2I13eDyVBg93bzs2
+PMXfgPIsJKQlnVAvVxXzYmOd/HFnxzoHRHdAL2VcQ6jAWvE0MIHFwA8l9lFg1F85
+alrwBzVOxqN669C/+0b1kf5Nzfg1TkmSu7n7N4uXwdr8OqEKU98VlN/nusqbtRlE
+rf8c1bD9VuQXjDgzgsgYdOm4MQgHTC/hBNC2+9EvWY28zZqBDY7QJOjU6+b6uIxU
+CeM5ag==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVANoWn3zNKhOhtfK+NMoItAzR4X1CMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWxzMDAwMDIuYWQubWFoLnNlMB4XDTE1MDkxNTEzNDgy
+MFoXDTM1MDkxNTEzNDgyMFowHDEaMBgGA1UEAwwRbHMwMDAwMi5hZC5tYWguc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1VwRmrHMu/T9MFd+DevMP
+ckB+ax0vozrl5Wv2W9Z1WEHX0lzbXeeZm9dTNKL/7PABQ9MYl27AN8PXGE5bgkB2
+hLq08pfCk3YZfvOS8CjfrlaNjUxQ+y4n6o4u1+63BNt44hB/Vj/aiFbVd0CEyaw3
+QS08xAPH81In1gjCybWK/FOvCsiG/af2o6wIJfLal2LyuQbMDsqyBYYoiz6HVArI
+jes5Cg74iKB7cD+vRz/shWBo8axUTB3oekIRywvlsdXXk9UuhDJpmCRWYUnAEesa
+Tfym96Jxjf0AT2N7dLxQteJQ/PQZJqiDjPSlWRO6x+SVkVi0ihrhXdBTUd5xWcyp
+AgMBAAGjaTBnMB0GA1UdDgQWBBS+Vd1E5Wuhg0SgOihS+WVDvvK4MjBGBgNVHREE
+PzA9ghFsczAwMDAyLmFkLm1haC5zZYYoaHR0cHM6Ly9sczAwMDAyLmFkLm1haC5z
+ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlE0KzMJC9n7B3rNS
+Q26aQDzgYwMiL0XfNl83I74DGjITpHQ16E2VxEGcEgT53A7EnuXkgSECfilx5f6J
+S9eqnKvHWKqBPp81zgvmCoQdqRnw01JI7+aR5bl9HE8DHXXiynm8LV6xG8TPhreI
+vXUe7mutwG7gCNYGG3cXMsTXklEdZOVowMB8cTI3JuPpeZDe6UCtD5UDPOC4Au6h
+Jg2VZanypCduKN+Oy2pwBpANDn6VIPLJfRwSSYjHi1nOf8R4Tp+MuubkplgSm3WS
+PE/X6alZzwvFag7NitTuQKfIi4KZYZVH754WJY2msHWumXJSXciDTqAo6XIwiJK3
+qGXOyg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <!--
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ls00002.ad.mah.se/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ls00002.ad.mah.se/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ls00002.ad.mah.se: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://ls00002.ad.mah.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ls00002.ad.mah.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ls00002.ad.mah.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ad.mah.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLzCCAhegAwIBAgIUVNV40DAZB5mUHVKVe6tGY1I42hkwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRbHMwMDAwMi5hZC5tYWguc2UwHhcNMTUwOTE1MTM0ODIx
+WhcNMzUwOTE1MTM0ODIxWjAcMRowGAYDVQQDDBFsczAwMDAyLmFkLm1haC5zZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJFxEzw0GeMNcOml3Nw3OIGB
+MTNSGG9r6dDsDV5tSHR6Yr/klOSoVnNh6zA2Ll750WM40oWN9jOZGc9uu+SFsXxh
+brkXcm1F78fVXV/h9G225sgux7g4/eMEC65gJncid566EF+ZJg1t0KIKxJq6j2W0
+D5eDSaS6gUi7HF1Nk3047xYUQkN7NJdJfiWn2jHBMa0eEWzPDo2BhgZFkIUB0H0C
+BN9t4RCtJeoj8sS7aDv5FShkTk7f40RLwH6Awr/oj8uRuDcNssRNO410QxRjtTov
+iKsQxGRAd9fbxBounyR8Ug3uCSVIz/wcW99fj4MOluyjz3kV7P+gmfAJlBgRJCMC
+AwEAAaNpMGcwHQYDVR0OBBYEFH7Ht/AR5jhuoXbez822ADbykyQIMEYGA1UdEQQ/
+MD2CEWxzMDAwMDIuYWQubWFoLnNlhihodHRwczovL2xzMDAwMDIuYWQubWFoLnNl
+L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAdqjtt6OkfZmFfITCY
+vMuiid+scQo++NZVr/maC3GobCCqGEEb5biTaXT7u9Txd/gmc3Va0jp8a8zfg7xT
+s3B4ptKQrSZdlEnBRjb1jEKjEwC/r5mrBw5zCkToZq2ZB4UnrvjqP26L0tJjIJcZ
+tFPyUKph+Ra8kTudJR55h8cGNtrcacrrWYCgTuxOwvHI0kAbI9wf4nKJodi809/B
+Jxk5G3+4FL1Bih22sNjCjyKhwzTZqeFO5nSEwHqHItc+wmWwXFrNlXorD9iR7AFX
+D7P4t/ZEhlF/1zXOrZe9RHTruTRckpDu7hWcwcuQCJww+kmlw3GzNjRMMN6RvxX0
+JV2n
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVALRMqgBuPbEymZ1A3rOUBJgcu+6jMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWxzMDAwMDIuYWQubWFoLnNlMB4XDTE1MDkxNTEzNDgx
+OVoXDTM1MDkxNTEzNDgxOVowHDEaMBgGA1UEAwwRbHMwMDAwMi5hZC5tYWguc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCK/VyAL5u8SSu/vI5ejQrI
+L9fYl+3kOVkRqMbTrmkYDoJuH/hJ/EFkzsf10lL+Q9pblEe7tPHZW11L7hhg8uRv
+7rcHAA/wNyHrJj8wop0AvxJ/mw5me91KajBijnkznURYlHSnDwXMVlPNsnzt7zvL
+hfVh+ViSsYeIrqUGmWqNGv45RRmkywZOhzAxBecn6Y6RhNPGWrBF1J5vTfH2Awhb
+s163xVKk1C2kk27xfaxrCEzFv3uJ6WJVSdc2c2PaH02/BzIhvP5YfU31BUYMW6W5
+5ElGxc1EeBoHy72a8nWJC2vSEDJuTT9JlmLyIacjz88b4KUjaxcncGB42bame2+n
+AgMBAAGjaTBnMB0GA1UdDgQWBBSis6HHtfa5Ghu1UWkShNy/j9cEdDBGBgNVHREE
+PzA9ghFsczAwMDAyLmFkLm1haC5zZYYoaHR0cHM6Ly9sczAwMDAyLmFkLm1haC5z
+ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAEEY+ulRi3+21GAoJ
+2jXfWASbFfAFxAfAjxgv/CzmRQFm1WAOLDG5Ga3A0oYcdgmJvMImjSu6Lk/0AxAh
+Ey+B6C2sJxuGwNtjvxo+8xrOPG2enF2efRwVePFCNOvjfOuq2I13eDyVBg93bzs2
+PMXfgPIsJKQlnVAvVxXzYmOd/HFnxzoHRHdAL2VcQ6jAWvE0MIHFwA8l9lFg1F85
+alrwBzVOxqN669C/+0b1kf5Nzfg1TkmSu7n7N4uXwdr8OqEKU98VlN/nusqbtRlE
+rf8c1bD9VuQXjDgzgsgYdOm4MQgHTC/hBNC2+9EvWY28zZqBDY7QJOjU6+b6uIxU
+CeM5ag==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVANoWn3zNKhOhtfK+NMoItAzR4X1CMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWxzMDAwMDIuYWQubWFoLnNlMB4XDTE1MDkxNTEzNDgy
+MFoXDTM1MDkxNTEzNDgyMFowHDEaMBgGA1UEAwwRbHMwMDAwMi5hZC5tYWguc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1VwRmrHMu/T9MFd+DevMP
+ckB+ax0vozrl5Wv2W9Z1WEHX0lzbXeeZm9dTNKL/7PABQ9MYl27AN8PXGE5bgkB2
+hLq08pfCk3YZfvOS8CjfrlaNjUxQ+y4n6o4u1+63BNt44hB/Vj/aiFbVd0CEyaw3
+QS08xAPH81In1gjCybWK/FOvCsiG/af2o6wIJfLal2LyuQbMDsqyBYYoiz6HVArI
+jes5Cg74iKB7cD+vRz/shWBo8axUTB3oekIRywvlsdXXk9UuhDJpmCRWYUnAEesa
+Tfym96Jxjf0AT2N7dLxQteJQ/PQZJqiDjPSlWRO6x+SVkVi0ihrhXdBTUd5xWcyp
+AgMBAAGjaTBnMB0GA1UdDgQWBBS+Vd1E5Wuhg0SgOihS+WVDvvK4MjBGBgNVHREE
+PzA9ghFsczAwMDAyLmFkLm1haC5zZYYoaHR0cHM6Ly9sczAwMDAyLmFkLm1haC5z
+ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlE0KzMJC9n7B3rNS
+Q26aQDzgYwMiL0XfNl83I74DGjITpHQ16E2VxEGcEgT53A7EnuXkgSECfilx5f6J
+S9eqnKvHWKqBPp81zgvmCoQdqRnw01JI7+aR5bl9HE8DHXXiynm8LV6xG8TPhreI
+vXUe7mutwG7gCNYGG3cXMsTXklEdZOVowMB8cTI3JuPpeZDe6UCtD5UDPOC4Au6h
+Jg2VZanypCduKN+Oy2pwBpANDn6VIPLJfRwSSYjHi1nOf8R4Tp+MuubkplgSm3WS
+PE/X6alZzwvFag7NitTuQKfIi4KZYZVH754WJY2msHWumXJSXciDTqAo6XIwiJK3
+qGXOyg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ls00002.ad.mah.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
+ <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
+ </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0/pera.cs.lth.se-shibboleth.xml b/swamid-2.0/pera.cs.lth.se-shibboleth.xml
index c21ec971..1ba9afcc 100644
--- a/swamid-2.0/pera.cs.lth.se-shibboleth.xml
+++ b/swamid-2.0/pera.cs.lth.se-shibboleth.xml
@@ -31,7 +31,7 @@ and do *NOT* provide it in real time to your partners.
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://localhost/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pera.cs.lth.se/Shibboleth.sso/Login"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">SAM</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">SAM</mdui:DisplayName>
@@ -73,15 +73,15 @@ LeMlo5NMwFMrOjn5nFCm7yN2pibn2Ttd7O7G9w42rLCsalVNHw==
<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://localhost/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://localhost/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://localhost/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost/Shibboleth.sso/SLO/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://localhost/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://localhost/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://localhost/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pera.cs.lth.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pera.cs.lth.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pera.cs.lth.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pera.cs.lth.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pera.cs.lth.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pera.cs.lth.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pera.cs.lth.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pera.cs.lth.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pera.cs.lth.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pera.cs.lth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
</md:EntityDescriptor>
diff --git a/swamid-2.0/play.hkr.se.xml b/swamid-2.0/play.hkr.se.xml
new file mode 100644
index 00000000..c912557a
--- /dev/null
+++ b/swamid-2.0/play.hkr.se.xml
@@ -0,0 +1,51 @@
+<?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://play.hkr.se">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </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">Kristianstad University Play service</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Högskolan Kristianstad Playtjänst</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This service is for presentation of videos from Kristianstad University.</mdui:Description>
+ <mdui:Description xml:lang="sv">Denna tjänst används för presentationer av video från Högskolan Kristianstad.</mdui:Description>
+ <mdui:Logo height="94" width="83">https://hkr.se/gui/i/logotype.png</mdui:Logo>
+ <mdui:Logo xml:lang="sv" height="94" width="83">https:hkr.se/gui/i/logotype.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="94" width="83">https://hkr.se/gui/i/logotype.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIExzCCA6+gAwIBAgIJAJ8w7l9XLcoDMA0GCSqGSIb3DQEBBQUAMIGdMQswCQYDVQQGEwJTRTEOMAwGA1UECBMFU2thbmUxFTATBgNVBAcTDEtyaXN0aWFuc3RhZDEfMB0GA1UEChMWSG9nc2tvbGFuIEtyaXN0aWFuc3RhZDETMBEGA1UECxMKSVQtc2VydmljZTEUMBIGA1UEAxMLcGxheS5oa3Iuc2UxGzAZBgkqhkiG9w0BCQEWDGFkbWluQGhrci5zZTAeFw0xNTA5MTQxMjA2NDZaFw0yNTA5MTMxMjA2NDZaMIGdMQswCQYDVQQGEwJTRTEOMAwGA1UECBMFU2thbmUxFTATBgNVBAcTDEtyaXN0aWFuc3RhZDEfMB0GA1UEChMWSG9nc2tvbGFuIEtyaXN0aWFuc3RhZDETMBEGA1UECxMKSVQtc2VydmljZTEUMBIGA1UEAxMLcGxheS5oa3Iuc2UxGzAZBgkqhkiG9w0BCQEWDGFkbWluQGhrci5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANQlu+lhb9yqf/8s5TxbohOyOh/qqULM+c2Pv4OivD9i0cPNlMKColq/ainIgPU91kBDsaG933CwOvlWHgcmUNIWO4KRi1W1CTTZ0b4Rl++kolFSIOSFhSRdap/9IPt1Ajr667ejNn3G4YA3v8ZgZhCXHW/FkevNPgTZuUL8nzkN0Jnl5hJeaubZUhhul7lNe2B+s/revviqEYtR8Ph++rtwJbuNeMZ6YswkspyjGa8cFOTZYInmB+tGQ9jMK/CdYZU5ZS68pEBHxd84CUne8oNB1kHTC6U1HUDEUD3vb/XDjgG1WzFBzUVHjUBxYMXd9ME67uQyV/xaiAdcFJbV/LkCAwEAAaOCAQYwggECMB0GA1UdDgQWBBS0FxmsB2XHAmqtd4xS0wpmTUmDezCB0gYDVR0jBIHKMIHHgBS0FxmsB2XHAmqtd4xS0wpmTUmDe6GBo6SBoDCBnTELMAkGA1UEBhMCU0UxDjAMBgNVBAgTBVNrYW5lMRUwEwYDVQQHEwxLcmlzdGlhbnN0YWQxHzAdBgNVBAoTFkhvZ3Nrb2xhbiBLcmlzdGlhbnN0YWQxEzARBgNVBAsTCklULXNlcnZpY2UxFDASBgNVBAMTC3BsYXkuaGtyLnNlMRswGQYJKoZIhvcNAQkBFgxhZG1pbkBoa3Iuc2WCCQCfMO5fVy3KAzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQABi8Exz8XRt64P9ilnf3MKAJ2YI+lm70DpYOp5YDiNpfYG4cLA2ki2jmr14jxDM585SkmNKnLuZQ5Mf6zYgbLEQ9qkg0aDLHQ1lX7MclsipEnB3NV2PNAz5zAnYB/RznQN+0HYKo98Jg6T6HfMLZPG6E8DL4bMN0LOc6KfHTP+H9K2t5auNAvks7HCaj4cTVxZkW8OsmI57RXtxvW+k47S7aEO5BsDJdnzs9vFpBWqneECQxhYh8HT7VZwx8WTDxkQ4ofuo97GsX4TprGOTJGBm/DvpcMOFjHk716dES9nS5N0hPV4eBHRVTHAyOKbJQguJBsMaF7mDcjQh0rS5Vyu</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIExzCCA6+gAwIBAgIJAJ8w7l9XLcoDMA0GCSqGSIb3DQEBBQUAMIGdMQswCQYDVQQGEwJTRTEOMAwGA1UECBMFU2thbmUxFTATBgNVBAcTDEtyaXN0aWFuc3RhZDEfMB0GA1UEChMWSG9nc2tvbGFuIEtyaXN0aWFuc3RhZDETMBEGA1UECxMKSVQtc2VydmljZTEUMBIGA1UEAxMLcGxheS5oa3Iuc2UxGzAZBgkqhkiG9w0BCQEWDGFkbWluQGhrci5zZTAeFw0xNTA5MTQxMjA2NDZaFw0yNTA5MTMxMjA2NDZaMIGdMQswCQYDVQQGEwJTRTEOMAwGA1UECBMFU2thbmUxFTATBgNVBAcTDEtyaXN0aWFuc3RhZDEfMB0GA1UEChMWSG9nc2tvbGFuIEtyaXN0aWFuc3RhZDETMBEGA1UECxMKSVQtc2VydmljZTEUMBIGA1UEAxMLcGxheS5oa3Iuc2UxGzAZBgkqhkiG9w0BCQEWDGFkbWluQGhrci5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANQlu+lhb9yqf/8s5TxbohOyOh/qqULM+c2Pv4OivD9i0cPNlMKColq/ainIgPU91kBDsaG933CwOvlWHgcmUNIWO4KRi1W1CTTZ0b4Rl++kolFSIOSFhSRdap/9IPt1Ajr667ejNn3G4YA3v8ZgZhCXHW/FkevNPgTZuUL8nzkN0Jnl5hJeaubZUhhul7lNe2B+s/revviqEYtR8Ph++rtwJbuNeMZ6YswkspyjGa8cFOTZYInmB+tGQ9jMK/CdYZU5ZS68pEBHxd84CUne8oNB1kHTC6U1HUDEUD3vb/XDjgG1WzFBzUVHjUBxYMXd9ME67uQyV/xaiAdcFJbV/LkCAwEAAaOCAQYwggECMB0GA1UdDgQWBBS0FxmsB2XHAmqtd4xS0wpmTUmDezCB0gYDVR0jBIHKMIHHgBS0FxmsB2XHAmqtd4xS0wpmTUmDe6GBo6SBoDCBnTELMAkGA1UEBhMCU0UxDjAMBgNVBAgTBVNrYW5lMRUwEwYDVQQHEwxLcmlzdGlhbnN0YWQxHzAdBgNVBAoTFkhvZ3Nrb2xhbiBLcmlzdGlhbnN0YWQxEzARBgNVBAsTCklULXNlcnZpY2UxFDASBgNVBAMTC3BsYXkuaGtyLnNlMRswGQYJKoZIhvcNAQkBFgxhZG1pbkBoa3Iuc2WCCQCfMO5fVy3KAzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQABi8Exz8XRt64P9ilnf3MKAJ2YI+lm70DpYOp5YDiNpfYG4cLA2ki2jmr14jxDM585SkmNKnLuZQ5Mf6zYgbLEQ9qkg0aDLHQ1lX7MclsipEnB3NV2PNAz5zAnYB/RznQN+0HYKo98Jg6T6HfMLZPG6E8DL4bMN0LOc6KfHTP+H9K2t5auNAvks7HCaj4cTVxZkW8OsmI57RXtxvW+k47S7aEO5BsDJdnzs9vFpBWqneECQxhYh8HT7VZwx8WTDxkQ4ofuo97GsX4TprGOTJGBm/DvpcMOFjHk716dES9nS5N0hPV4eBHRVTHAyOKbJQguJBsMaF7mDcjQh0rS5Vyu</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.hkr.se/user/logout"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.hkr.se/user/authenticate" index="0"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">HKRplay</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">HKRplay</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">https://play.hkr.se</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Administrator</md:SurName>
+ <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..5352431d
--- /dev/null
+++ b/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,53 @@
+<?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="http://preklin.nu/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Preklin på Uppsala Universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Preklin på Uppsala University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Administration av inbjudningar för firande av läkarprogrammets första fyra terminer på Uppsala universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Adminstration of guest invites for the student celebration for completion of the first four semesters at the medicine program at Uppsala University</mdui:Description>
+ <mdui:Logo height="50" width="50"> https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="sv"> https://www.preklin.nu/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en"> https://www.preklin.nu/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIID6zCCAtOgAwIBAgIJAJf4AFVzk7oTMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
+VQQGEwJTRTEQMA4GA1UECAwHVVBQU0FMQTEQMA4GA1UEBwwHVVBQU0FMQTEQMA4G
+A1UECgwHUHJla2xpbjEaMBgGA1UEAwwRQWxleGFuZGVyIERhbmdsZXIxKjAoBgkq
+hkiG9w0BCQEWG2FsZXhhbmRlci5kYW5nbGVyQGdtYWlsLmNvbTAeFw0xNTA5MDQx
+NDUxNDNaFw0yNTA5MDMxNDUxNDNaMIGLMQswCQYDVQQGEwJTRTEQMA4GA1UECAwH
+VVBQU0FMQTEQMA4GA1UEBwwHVVBQU0FMQTEQMA4GA1UECgwHUHJla2xpbjEaMBgG
+A1UEAwwRQWxleGFuZGVyIERhbmdsZXIxKjAoBgkqhkiG9w0BCQEWG2FsZXhhbmRl
+ci5kYW5nbGVyQGdtYWlsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMXpMfWVvvE6WSUXJGxjuFO4Egw4v/iqB5imiwMlOTMp8SkQqp+ZjlUQ+XH1
+8wAbLhpUK37GUdMnnlFv9MosDikL8OV+t6lyncyYrLjYQBdXBzgE/g4fnujDu0kG
+7sQ6YYFk2DS8XIIZRbDdBDbaVshjnacbiLmBXAbZA6VgsvtI1+4Kuig60iThKtli
+TXdU2qUkzT40EUbuck0rPygy2FnsnG2ggdddFwW2v3mNxyz0+03FacG82q3wIenM
+R++QYSnBMYuUPxWpt0niMNurW1ePkfScOn4L9kB+wZAUptUtLjpbk6M4Ec4wyrdE
+bTdg2v9gO1DaKKLDQM59POsO2RcCAwEAAaNQME4wHQYDVR0OBBYEFATpr5UP8UW/
+VrxInHT9QPqJWCHWMB8GA1UdIwQYMBaAFATpr5UP8UW/VrxInHT9QPqJWCHWMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADi+d3Z3FJz0X9FyN4Fj7X1n
+CWD0aufIZ4ke6UW49PMbIBkL1qMhjWhOGdhPqQExLoGJw33OKtOXTMRwk9P0M7Z+
+iGkPsASOWf2+po5AvYYaE41yACyhR3z3TtdRdEK9wiEUx0otU5rT9o5oWEk4orap
+3m623aO3cMuwum0U3HKx+EQHQVeBmix4JJq996fFLHkyNXbBU/ddHsyneuHC7jtQ
+n2/PvABPMf4yqzv522ZTszEuJKEp7WI9ctMUDqPxwOxMTdY83O7AH3UZSyIPDEHC
+Dpkx/wL59aMiGk9AtYes2Mr1wU44nh2/JRWkSRBU4Ep+sb9jRFbn4/RZaNZqRnc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://preklin.nu/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://preklin.nu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://preklin.nu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Alexander</md:GivenName>
+ <md:SurName>Dangler</md:SurName>
+ <md:EmailAddress>alexander.dangler@gmail.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..6ec521ef
--- /dev/null
+++ b/swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ate.uppfoljning.ladok.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok www.ate.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok www.ate.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+ <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+ <mdui:Logo height="64" width="64">https://www.ate.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.ate.uppfoljning.ladok.se/gui-sp</ds:KeyName>
+ <ds:KeyName>www.ate.uppfoljning.ladok.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.ate.uppfoljning.ladok.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAM50CTo8vcWjMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHHd3dy5hdGUudXBwZm9sam5pbmcubGFkb2suc2UwHhcNMTUwOTE1MTk0OTA2
+WhcNMjUwOTEyMTk0OTA2WjAnMSUwIwYDVQQDExx3d3cuYXRlLnVwcGZvbGpuaW5n
+LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1xaVe7fM
+wH15zllNOZkwnvkI5vmNBIWmFFXGx+fgK5aoJhYmDc3c7eCotLTXnzJsCeFpelIM
+MfYBHu0EAfTBWi4/WfQz4yRXQit0JfO1shurGQFeKe4kMTxnVf+BrJSvu/kAHitE
+t4pg9OhhgyMnMaOOON81W31XVK793Wi1B6wRWNtedK1R6InPGsBaW+/1ef4O7d7u
+sgJZBnZw+zSyOeP88cQNyTEU9eiR98i3Vzg7D0gB4u24Q3U6L3ioyVXGOj+IJNC7
+JsO7cQZUisj1yKgNEskL028HPPMzEXccOkAKsT313bHNF/jRI8bUAuh+S9CoEnBN
+3xL1RrWJU8K6MQIDAQABo3cwdTBUBgNVHREETTBLghx3d3cuYXRlLnVwcGZvbGpu
+aW5nLmxhZG9rLnNlhitodHRwczovL3d3dy5hdGUudXBwZm9sam5pbmcubGFkb2su
+c2UvZ3VpLXNwMB0GA1UdDgQWBBT1BkMstixnC+ab1uCMPT25Kyzx0jANBgkqhkiG
+9w0BAQUFAAOCAQEAxxI4Vbl6i68RqbvTGKt58pZYkk/dP1JyeyDraZPY6KBC7rgd
+vgm580B7g3m24kicZbMiMCj0z3GxyxoEpgQuP8ESQk+S1NRZzVqeX0jvGvozlIOf
+1k7asGDKTqZP1c+y260sWuuzU/VZIH/p+qJmXKtK8YX95ArVvxZr2yjLspQfOLK5
+OqTR2DKWzLbkJQcG5hDnQ/EYa+OTbxp6UKeYQ2OScriCAakOkRntxMk6jrxg4b0+
+lX8dwmg8Mp9BuT1SxYDh3mV5JQMPzBT65+h8NAt3Df7p6rmfQeTzy92hMI9perKd
+DEEdI94A1MM6JIppqwHkwWgzUQo03hBtc1ypuQ==
+</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://www.ate.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-externals-2.0.mxml b/swamid-externals-2.0.mxml
index ab6a3c3d..74dfc691 100644
--- a/swamid-externals-2.0.mxml
+++ b/swamid-externals-2.0.mxml
@@ -1,14 +1,7 @@
<?xml version="1.0"?>
<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-externals-2.0.xml">
-<xi:include href="swamid-externals-2.0/downloads.channel8.msdn.com.xml"/>
<xi:include href="swamid-externals-2.0/elegitimation2-test.inloggning.se.xml"/>
<xi:include href="swamid-externals-2.0/idp.shibboleth.net.xml"/>
-<xi:include href="swamid-externals-2.0/issues.shibboleth.net.xml"/>
<xi:include href="swamid-externals-2.0/kantarainitiative.org.xml"/>
-<xi:include href="swamid-externals-2.0/spaces.internet2.edu-shibboleth.xml"/>
-<xi:include href="swamid-externals-2.0/spaces.internet2.edu.xml"/>
<xi:include href="swamid-externals-2.0/swamid.user.uu.se.xml"/>
-<xi:include href="swamid-externals-2.0/terena.org-sp.xml"/>
-<xi:include href="swamid-externals-2.0/terena.org.xml"/>
-<xi:include href="swamid-externals-2.0/wiki.shibboleth.net.xml"/>
</EntitiesDescriptor>
diff --git a/swamid-externals-2.0/downloads.channel8.msdn.com.xml b/swamid-externals-2.0/downloads.channel8.msdn.com.xml
deleted file mode 100644
index 433fc3d1..00000000
--- a/swamid-externals-2.0/downloads.channel8.msdn.com.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://downloads.channel8.msdn.com/shibboleth-sp">
- <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 http://schemas.xmlsoap.org/ws/2003/07/secext">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>www.dreamspark.com</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.dreamspark.com</ds:X509SubjectName>
- <ds:X509Certificate>
- MIIDOzCCAiOgAwIBAgIJAOAnCSnCRCHEMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEnd3dy5kcmVhbXNwYXJrLmNvbTAeFw0xMDEwMDQxMDAyMTBaFw0xMzEwMDMx
- MDAyMTBaMB0xGzAZBgNVBAMTEnd3dy5kcmVhbXNwYXJrLmNvbTCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAKSB9dRKIpfDAdGbla2Z4lNxRHURAsUb8LvT
- ALm0+v9RP/Hq7dAHSGHmQgv15s/0fi6i8p3EEtiBcnPVKJxvff82kLvV9AjrLp2l
- Szq+nz1oD1zElm44Caw9NMHc4n0NfvRSlAH1VKZUEXo5gm+jMHcpx/wDoMqNGEOq
- XXglXNoeftFWmlhU/loHuLIfREtadWB4mzOzqCCW5Ak7ESF6hVW5mD73QgJPgLVt
- Y4K1HouT4hC9oDhG4RHx1C/pex3JqTVirhTiWCKZCuVk7u8lVTOojr9mKczhO2HX
- 85x4i8o+NzeBNchzs/WUXtdvqPzw8/Y7kSGhcG0FE2Db7uAPmXkCAwEAAaN+MHww
- HQYDVR0OBBYEFFml+PG8Rd7m471DG1DTwNsiM8njME0GA1UdIwRGMESAFFml+PG8
- Rd7m471DG1DTwNsiM8njoSGkHzAdMRswGQYDVQQDExJ3d3cuZHJlYW1zcGFyay5j
- b22CCQDgJwkpwkQhxDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB4
- mZ5q44Xzp0ffUgr+XBC1iD+GhXQbC+fiMR4Cd1RFu9+p2p2iKwrZVQ0m+6fegO3F
- Cd2S+14+jgg7O4EfQcf+A4IcfVIs/g3EhqRleXoZqYusZJOwAUOhIm+vSjDxv11D
- gBvhFnVqgL04VKmGopK35kSspkhXm3BJgd/dqvXTYiNeKw6yk77sdSDiZxk6nRlD
- HS/mVvdjQUf0yyJNHZp6eEBgWgxmIGBRoKhb6hi5scIylBTUewqBqUnaW+t0kF8f
- qhw5X47o07/+9CJh8DsO1KpfM2CNZbIMUEY2q1wBfhE5HlI4wVXJYQqeUsqHXr1G
- ssIJnnOiYS0/QF/t7Wkd
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>www.dreamspark.com</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.dreamspark.com</ds:X509SubjectName>
- <ds:X509Certificate>
- MIIDOzCCAiOgAwIBAgIJAOAnCSnCRCHEMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
- BAMTEnd3dy5kcmVhbXNwYXJrLmNvbTAeFw0xMDEwMDQxMDAyMTBaFw0xMzEwMDMx
- MDAyMTBaMB0xGzAZBgNVBAMTEnd3dy5kcmVhbXNwYXJrLmNvbTCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAKSB9dRKIpfDAdGbla2Z4lNxRHURAsUb8LvT
- ALm0+v9RP/Hq7dAHSGHmQgv15s/0fi6i8p3EEtiBcnPVKJxvff82kLvV9AjrLp2l
- Szq+nz1oD1zElm44Caw9NMHc4n0NfvRSlAH1VKZUEXo5gm+jMHcpx/wDoMqNGEOq
- XXglXNoeftFWmlhU/loHuLIfREtadWB4mzOzqCCW5Ak7ESF6hVW5mD73QgJPgLVt
- Y4K1HouT4hC9oDhG4RHx1C/pex3JqTVirhTiWCKZCuVk7u8lVTOojr9mKczhO2HX
- 85x4i8o+NzeBNchzs/WUXtdvqPzw8/Y7kSGhcG0FE2Db7uAPmXkCAwEAAaN+MHww
- HQYDVR0OBBYEFFml+PG8Rd7m471DG1DTwNsiM8njME0GA1UdIwRGMESAFFml+PG8
- Rd7m471DG1DTwNsiM8njoSGkHzAdMRswGQYDVQQDExJ3d3cuZHJlYW1zcGFyay5j
- b22CCQDgJwkpwkQhxDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB4
- mZ5q44Xzp0ffUgr+XBC1iD+GhXQbC+fiMR4Cd1RFu9+p2p2iKwrZVQ0m+6fegO3F
- Cd2S+14+jgg7O4EfQcf+A4IcfVIs/g3EhqRleXoZqYusZJOwAUOhIm+vSjDxv11D
- gBvhFnVqgL04VKmGopK35kSspkhXm3BJgd/dqvXTYiNeKw6yk77sdSDiZxk6nRlD
- HS/mVvdjQUf0yyJNHZp6eEBgWgxmIGBRoKhb6hi5scIylBTUewqBqUnaW+t0kF8f
- qhw5X47o07/+9CJh8DsO1KpfM2CNZbIMUEY2q1wBfhE5HlI4wVXJYQqeUsqHXr1G
- ssIJnnOiYS0/QF/t7Wkd
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Artifact"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS" index="7"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Microsoft</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <GivenName>DreamSpark Engineering Team</GivenName>
- <EmailAddress>dsengt@microsoft.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <GivenName>Scott</GivenName>
- <SurName>Blackwell</SurName>
- <EmailAddress>scott.blackwell@microsoft.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-externals-2.0/issues.shibboleth.net.xml b/swamid-externals-2.0/issues.shibboleth.net.xml
deleted file mode 100644
index 87ebe614..00000000
--- a/swamid-externals-2.0/issues.shibboleth.net.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://issues.shibboleth.net/shibboleth">
- <Extensions>
- <mdalg:DigestMethod xmlns:mdalg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <mdalg:DigestMethod xmlns:mdalg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <mdalg:SigningMethod xmlns:mdalg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <mdalg:SigningMethod xmlns:mdalg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://issues.shibboleth.net/jira/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://issues.shibboleth.net/jira/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Shibboleth.net Issue Tracking</mdui:DisplayName>
- <mdui:Description xml:lang="en">
- The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
- Unauthenticated users may view submitted issues. Authenticated users may submit new
- issues and comment on existing ones.
- </mdui:Description>
- <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>issues.shibboleth.net</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=issues.shibboleth.net,DC=shibboleth,DC=net</ds:X509SubjectName>
- <ds:X509Certificate>
-MIIDRjCCAi6gAwIBAgIJAPpEsjMpUtq9MA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
-kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
-VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTEwMTA3MTg0MTQ4WhcNMTQw
-MTA2MTg0MTQ4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
-GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA
-+hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP
-f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb
-ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4
-y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP
-3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID
-AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN
-AQEFBQADggEBAEzcImXrjUNZF/8AbpcDOqlBO/neTxE0Lcnv4HevHmjqVaemxXK5
-E2pAIJexcyCnp4EV7EK+5hpkr5J26iESHr3w4u/BvUvgSLNjlrIFw58mpBM9f+Qe
-q5bQWff+dmkhrxdhaIVraH70bsuxVKwycmUS0L11nOTxAQbh85wJbIwqH4fKAzQm
-jPp4VbLesRmUyDV+fY4YrZXHYosfuZLEexJgmgcRgZFug6NbWTclKnxKPhquYjem
-oHlA8E0OvkQswalMPLfSzhgftYNHohjdQ2oMBUC4uMk9T+r7ZeKkeCiXIzUzEh8M
-uQfWf/K4Fj4CqCzMOU3mmvy7ricwz/4Kzas=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Artifact"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/SOAP"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/Artifact" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
- <AttributeConsumingService index="1">
- <ServiceName xml:lang="en">Shibboleth Federated Issue Tracking</ServiceName>
- <ServiceDescription xml:lang="en"> An issue (bugs, feature requests, tasks) tracking
- service with automatic registration for users who can supply a supported identifier,
- such as eduPersonPrincipalName or swissEduPersonUniqueID. </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"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Shibboleth Consortium</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Shibboleth Consortium</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Shibboleth.Net Technical Support</GivenName>
- <EmailAddress>contact@shibboleth.net</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-externals-2.0/metadata.lst b/swamid-externals-2.0/metadata.lst
index dde67aa7..c3bdfc34 100644
--- a/swamid-externals-2.0/metadata.lst
+++ b/swamid-externals-2.0/metadata.lst
@@ -1,6 +1,6 @@
-http://spaces.internet2.edu/Shibboleth.sso/Metadata spaces.internet2.edu.crt
-http://discovery.shibboleth.net/shibboleth.net-metadata.xml
+#http://spaces.internet2.edu/Shibboleth.sso/Metadata spaces.internet2.edu.crt
+#http://discovery.shibboleth.net/shibboleth.net-metadata.xml
#https://www.dreamspark.com/policies/dreamspark_metadata.xml
-https://login.terena.org/wayf/module.php/saml/sp/metadata.php/default-sp?output=xml
+#https://login.terena.org/wayf/module.php/saml/sp/metadata.php/default-sp?output=xml
#https://kantarainitiative.org/shibboleth/metadata.xml
#https://callback-test.inloggning.se/authify/metadata/?fed_name=swamidfederation e-identitet-swamid.crt
diff --git a/swamid-externals-2.0/spaces.internet2.edu-shibboleth.xml b/swamid-externals-2.0/spaces.internet2.edu-shibboleth.xml
deleted file mode 100644
index 71ae53f1..00000000
--- a/swamid-externals-2.0/spaces.internet2.edu-shibboleth.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://spaces.internet2.edu/shibboleth">
- <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- </md:Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spaces.internet2.edu/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://spaces.internet2.edu/Shibboleth.sso/Login" index="1"/>
- </md:Extensions>
- <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://spaces.internet2.edu/shibboleth</ds:KeyName>
- <ds:KeyName>spaces.internet2.edu</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=spaces.internet2.edu,O=Internet2,C=US</ds:X509SubjectName>
- <ds:X509Certificate>MIID9TCCAt2gAwIBAgIBADANBgkqhkiG9w0BAQQFADBAMQswCQYDVQQGEwJVUzES
-MBAGA1UEChMJSW50ZXJuZXQyMR0wGwYDVQQDExRzcGFjZXMuaW50ZXJuZXQyLmVk
-dTAeFw0wNjEyMTMxNzQwMjdaFw0xNjEyMTAxNzQwMjdaMEAxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQKEwlJbnRlcm5ldDIxHTAbBgNVBAMTFHNwYWNlcy5pbnRlcm5ldDIu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfZWpU5/8rgfFbxh
-DOwYuQ4/TNycAQ/VQ5DFMU3M3bvF52WktUtfwBDozdXQt/tOIlBFvPVHH/pdp0q6
-RrzjXP5pQFZoKKc+p9cGdxHqKlx7RWAnFycNaKFZyV9kUTUvSHDjQk00i5gJUGEt
-D1j8NLE9o0y68x+5jK3onhQs3IXkHVYDslXHNXPovcv7OQuWIL69oBxyTxeTBUIA
-WoIiSZh6XrjGmNUid2ZnFFk7YtY1UNGV18LbfVhnxBlIxIq5v9KQgK9T0P5pogYs
-6N7Ki4eMK3cKCJkAibrbo8iPcOJnwbCXTlLmnhv5yd/W8Bk8A/pluNX7kbsSYr1f
-7P6YqQIDAQABo4H5MIH2MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQ8t+Ty3BI/EncjTRX+
-JB8jn/SU0zBoBgNVHSMEYTBfgBQ8t+Ty3BI/EncjTRX+JB8jn/SU06FEpEIwQDEL
-MAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjEdMBsGA1UEAxMUc3BhY2Vz
-LmludGVybmV0Mi5lZHWCAQAwMgYDVR0RBCswKYYnaHR0cHM6Ly9zcGFjZXMuaW50
-ZXJuZXQyLmVkdS9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBAUAA4IBAQCd2JE3zSY3
-JLYBdr/WhFphpMHavrXpcK8GYro0YYfPN0QDxjBUSGkGgw0QzKAGmthqJWJ6yeip
-Ht36uzobQ2iQtFU08LKiK2jPNegSU3uW/LsmnweFCDmWDyacmK91q+m3oNfY631l
-+vLX82GQYRssQbis1CJbrD/XE1W+2sEnGHc4eNRJZYNzMRvfSatNavCgI1IoOFEC
-gBAD9negf1qiDeouxjXCiixAMR5XnVd7lyZ7VN3goXIN//4SdCLT5fd1tIspaOOy
-BPE4P/6N3KmAMY7VNejGcpoRKvb0R0Yd7a8aMR7xImUNsycFlthz+sl26fTVNNmz
-/n0PiqFXEkFy
-</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 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spaces.internet2.edu/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/Artifact"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AttributeConsumingService index="1">
- <ServiceName xml:lang="en">Internet2-Hosted Federated Wiki</ServiceName>
- <ServiceDescription xml:lang="en">
- A shared Wiki service with automatic registration for users who can supply a supported
- identifier, such as eduPersonPrincipalName or swissEduPersonUniqueID.
- </ServiceDescription>
- <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Internet2</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Internet2</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.internet2.edu/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Internet2 Technical Support</GivenName>
- <EmailAddress>tsg@internet2.edu</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <GivenName>IJ Kim</GivenName>
- <EmailAddress>ij@internet2.edu</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Scott Cantor</GivenName>
- <EmailAddress>cantor.2@osu.edu</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-externals-2.0/spaces.internet2.edu.xml b/swamid-externals-2.0/spaces.internet2.edu.xml
deleted file mode 100644
index f0acc0cb..00000000
--- a/swamid-externals-2.0/spaces.internet2.edu.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://spaces.internet2.edu/shibboleth">
- <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
- <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
- </md:Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spaces.internet2.edu/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://spaces.internet2.edu/Shibboleth.sso/Login" index="1"/>
- </md:Extensions>
- <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://spaces.internet2.edu/shibboleth</ds:KeyName>
- <ds:KeyName>spaces.internet2.edu</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=spaces.internet2.edu,O=Internet2,C=US</ds:X509SubjectName>
- <ds:X509Certificate>MIID9TCCAt2gAwIBAgIBADANBgkqhkiG9w0BAQQFADBAMQswCQYDVQQGEwJVUzES
-MBAGA1UEChMJSW50ZXJuZXQyMR0wGwYDVQQDExRzcGFjZXMuaW50ZXJuZXQyLmVk
-dTAeFw0wNjEyMTMxNzQwMjdaFw0xNjEyMTAxNzQwMjdaMEAxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQKEwlJbnRlcm5ldDIxHTAbBgNVBAMTFHNwYWNlcy5pbnRlcm5ldDIu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfZWpU5/8rgfFbxh
-DOwYuQ4/TNycAQ/VQ5DFMU3M3bvF52WktUtfwBDozdXQt/tOIlBFvPVHH/pdp0q6
-RrzjXP5pQFZoKKc+p9cGdxHqKlx7RWAnFycNaKFZyV9kUTUvSHDjQk00i5gJUGEt
-D1j8NLE9o0y68x+5jK3onhQs3IXkHVYDslXHNXPovcv7OQuWIL69oBxyTxeTBUIA
-WoIiSZh6XrjGmNUid2ZnFFk7YtY1UNGV18LbfVhnxBlIxIq5v9KQgK9T0P5pogYs
-6N7Ki4eMK3cKCJkAibrbo8iPcOJnwbCXTlLmnhv5yd/W8Bk8A/pluNX7kbsSYr1f
-7P6YqQIDAQABo4H5MIH2MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQ8t+Ty3BI/EncjTRX+
-JB8jn/SU0zBoBgNVHSMEYTBfgBQ8t+Ty3BI/EncjTRX+JB8jn/SU06FEpEIwQDEL
-MAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjEdMBsGA1UEAxMUc3BhY2Vz
-LmludGVybmV0Mi5lZHWCAQAwMgYDVR0RBCswKYYnaHR0cHM6Ly9zcGFjZXMuaW50
-ZXJuZXQyLmVkdS9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBAUAA4IBAQCd2JE3zSY3
-JLYBdr/WhFphpMHavrXpcK8GYro0YYfPN0QDxjBUSGkGgw0QzKAGmthqJWJ6yeip
-Ht36uzobQ2iQtFU08LKiK2jPNegSU3uW/LsmnweFCDmWDyacmK91q+m3oNfY631l
-+vLX82GQYRssQbis1CJbrD/XE1W+2sEnGHc4eNRJZYNzMRvfSatNavCgI1IoOFEC
-gBAD9negf1qiDeouxjXCiixAMR5XnVd7lyZ7VN3goXIN//4SdCLT5fd1tIspaOOy
-BPE4P/6N3KmAMY7VNejGcpoRKvb0R0Yd7a8aMR7xImUNsycFlthz+sl26fTVNNmz
-/n0PiqFXEkFy
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spaces.internet2.edu/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/Artifact"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AttributeConsumingService index="1">
- <ServiceName xml:lang="en">Internet2-Hosted Federated Wiki</ServiceName>
- <ServiceDescription xml:lang="en">
- A shared Wiki service with automatic registration for users who can supply a supported
- identifier, such as eduPersonPrincipalName or swissEduPersonUniqueID.
- </ServiceDescription>
- <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Internet2</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Internet2</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.internet2.edu/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Internet2 Technical Support</GivenName>
- <EmailAddress>tsg@internet2.edu</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <GivenName>IJ Kim</GivenName>
- <EmailAddress>ij@internet2.edu</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Scott Cantor</GivenName>
- <EmailAddress>cantor.2@osu.edu</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-externals-2.0/terena.org-sp.xml b/swamid-externals-2.0/terena.org-sp.xml
deleted file mode 100644
index ef1f5bb4..00000000
--- a/swamid-externals-2.0/terena.org-sp.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo>
- <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 width="350" height="94">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md: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: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-externals-2.0/terena.org.xml b/swamid-externals-2.0/terena.org.xml
deleted file mode 100644
index ef1f5bb4..00000000
--- a/swamid-externals-2.0/terena.org.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo>
- <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 width="350" height="94">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md: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: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-externals-2.0/wiki.shibboleth.net.xml b/swamid-externals-2.0/wiki.shibboleth.net.xml
deleted file mode 100644
index 625fa217..00000000
--- a/swamid-externals-2.0/wiki.shibboleth.net.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.shibboleth.net/shibboleth">
- <Extensions>
- <mdalg:DigestMethod xmlns:mdalg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <mdalg:DigestMethod xmlns:mdalg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <mdalg:SigningMethod xmlns:mdalg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
- <mdalg:SigningMethod xmlns:mdalg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
- <mdui:Description xml:lang="en">
- The wiki hosting the documentation for Shibboleth. Unauthenticated user may view the existing
- documentation. Authenticated users may create new documentation pages and edit existing ones.
- </mdui:Description>
- <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>wiki.shibboleth.net</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=wiki.shibboleth.net,DC=shibboleth,DC=net</ds:X509SubjectName>
- <ds:X509Certificate>
-MIIDQjCCAiqgAwIBAgIJAKMO1kGnu43yMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
-kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
-VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTExMDEwNzE4NDIzN1oXDTE0MDEw
-NjE4NDIzN1owTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
-CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n
-r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s
-iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ
-SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ
-KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF
-m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj
-ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF
-AAOCAQEAEv6zwotAweOLEfibTXm5d6odE2o/+rHdeEW+IEAspAvmCK7nAPFkuV47
-WMn7JmOd7BWnoXmqFwefJFf3mZtadHnCXReSd8ehGA8/KerSxz9yClMaoanRTEb3
-chT+n5Oh2+WgjzR/v5RbChihoOES+Z2mcvbDm9wn3uSBdxbAoG0/YZihaY9LeoNW
-/CVXv0HYfDw5csol6zwz6dgUDXpfXSXLLKnrjVwARM6lVh00i5i2nfmrWnI41bRh
-NtrvvBkq2tvnd6wm1DJNDzZQB/nRpCadwp4a64Qa0XJiGCoxFUvkd1+RSHqbBsEF
-6w3nDMcYq/BKnF30KZ0Q274eVyQolg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Artifact"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/SOAP"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/Artifact" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/ECP" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
- <AttributeConsumingService index="1">
- <ServiceName xml:lang="en">Shibboleth Federated Wiki</ServiceName>
- <ServiceDescription xml:lang="en"> A shared Wiki service with automatic registration
- for users who can supply a supported identifier, such as eduPersonPrincipalName
- or swissEduPersonUniqueID. </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"/>
- <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </AttributeConsumingService>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Shibboleth Consortium</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Shibboleth Consortium</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Shibboleth.Net Technical Support</GivenName>
- <EmailAddress>contact@shibboleth.net</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index 4148f736..63856d81 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -76,7 +76,6 @@
<shibmd:Scope regexp="false">handelsskolen.com</shibmd:Scope>
<shibmd:Scope regexp="false">cphbusiness.dk</shibmd:Scope>
<shibmd:Scope regexp="false">kea.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">nybuni.dans.kmd.dk</shibmd:Scope>
<shibmd:Scope regexp="false">eadania.dk</shibmd:Scope>
<shibmd:Scope regexp="false">dansidp.stads.dk</shibmd:Scope>
<shibmd:Scope regexp="false">umit.dk</shibmd:Scope>
@@ -95,6 +94,7 @@
<shibmd:Scope regexp="false">drcmr.dk</shibmd:Scope>
<shibmd:Scope regexp="false">simac.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">smu.edu.sg</shibmd:Scope>
<shibmd:Scope regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 6b3b305f..cc5685e2 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -123,6 +123,7 @@
<xi:include href="swamid-interfederations-2.0/authest.bathspa.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.galegroup.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.greenqloud.com-wayf-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.howcloud.com-saml-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.howcloud.co.uk-saml-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.ipublishcentral.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml"/>
@@ -342,6 +343,7 @@
<xi:include href="swamid-interfederations-2.0/c.yz.yamagata-u.ac.jp-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dadotsweb1.essex.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/darlfam.darlington.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/data.deic.dk.xml"/>
<xi:include href="swamid-interfederations-2.0/decbmth.sisoshibboleth.co.uk-entity.xml"/>
@@ -475,6 +477,7 @@
<xi:include href="swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.napier.ac.uk-idp-pingfederate.xml"/>
<xi:include href="swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.rijksmuseum.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml"/>
@@ -709,6 +712,7 @@
<xi:include href="swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cornwall.ac.uk-shibboleth-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idpcove.trafford.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml"/>
@@ -814,6 +818,7 @@
<xi:include href="swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-shibboleth.xml"/>
@@ -823,13 +828,13 @@
<xi:include href="swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hgo.se-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hs-emden-leer.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml"/>
@@ -1069,6 +1074,7 @@
<xi:include href="swamid-interfederations-2.0/idp-test.essex.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idptest.gla.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-test.lancs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-test.londonmet.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idptest.northumbria.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.test.semantico.net-shibboleth2.xml"/>
@@ -1113,6 +1119,7 @@
<xi:include href="swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.umoncton.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml"/>
@@ -1303,6 +1310,7 @@
<xi:include href="swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml"/>
<xi:include href="swamid-interfederations-2.0/login.noa.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ou.nl-oam-fed.xml"/>
<xi:include href="swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml"/>
@@ -1313,6 +1321,7 @@
<xi:include href="swamid-interfederations-2.0/login.uat.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/login.uea.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.uoc.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml"/>
<xi:include href="swamid-interfederations-2.0/login.utp.edu.pl-idp-shibboleth.xml"/>
@@ -1553,6 +1562,7 @@
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.bw.semcs.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth2sp.rps.semcs.net-shibboleth.xml"/>
@@ -1997,6 +2007,7 @@
<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml"/>
@@ -2266,6 +2277,7 @@
<xi:include href="swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.ordbogen.com.xml"/>
<xi:include href="swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.portal.ted.is.ed.ac.uk-shibboleth.xml"/>
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
index 47dbb2a1..537f783b 100644
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.uzh.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-08-31T11:07:38Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-11T15:17:46Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
diff --git a/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml
index f3a67a7e..9bc732dd 100644
--- a/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.hes-so.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-07-20T08:33:38Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-14T06:31:06Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
index 41a57ba7..1c0f8dfe 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.switch.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-05-05T15:15:15Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-17T06:59:34Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -83,43 +83,6 @@ pSfkm5o6j1ysHdGdoojvd+BikyPR7hGEs1lukWxump98WxdIHzmo5ErBr770nWRR
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIFVDCCBDygAwIBAgIULqFVZ3v/ZWU2QoNe1Y/XyQSqGeAwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTEzMTIwOTEyMTgw
-N1oXDTE1MTIwOTEyMTcyNFowgcgxEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
-BgEEAYI3PAIBAhMEQmVybjEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x
-GzAZBgNVBAUTEkNILTAzNS43LjAwMS4yNzgtOTELMAkGA1UEBhMCQ0gxEDAOBgNV
-BAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJpY2gxDzANBgNVBAoTBlNXSVRDSDEc
-MBoGA1UEAxMTYWFpLWxvZ29uLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKplsvC4tYqZuV9IOjCWn6r5gMxMnmJ2EVZkMU8SSW4To8aB
-/dhPc8MUkHQ3bQoew4iolSzBdQ8dCeALCHQLmHD5rqXsRvsTjtkPS7SjaEM4viLF
-dz8oC8Y3x9RA5ruZf5KKPh6f2Dd/1s0IKpf7lPJx6px4ho2QwnOmwIAe3+QWrhK5
-136hmtyObl+rDDkzCwBnir6BXYEPHMSXqR9u9McfCXHjw3qow/qSv2+Ae4lVHh2K
-fiNbFTMa2t5zF53NyQNbK33ckrAJ1R1QcysBT3lyPK4wy3IACZkR2S6Af/GLGE5y
-DWCiwZqKRI+TUcGGHNj7+GEFCfdfHgY8og8Rl/MCAwEAAaOCAa4wggGqMHMGCCsG
-AQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9i
-YWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwu
-Y29tL3F2c3NsZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYI
-KwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRv
-cnkwOAYDVR0RBDEwL4ITYWFpLWxvZ29uLnN3aXRjaC5jaIIYeDUwOS5hYWktbG9n
-b24uc3dpdGNoLmNoMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xn
-Mi5jcmwwHQYDVR0OBBYEFO5qHZPNwV4RRgjWgE/kQYdVOMgYMA0GCSqGSIb3DQEB
-CwUAA4IBAQAwEck5/yI4crrtFbfMDQzqBCXVQqLQPLZQuy6LcltubJgMY2gixwUk
-g11zTpP8ydZWUzZJ4TdmJwQSxWOiHrmrkpXjPMJ/NKCS7VUjsR9qSLDeJzEs61E0
-Pk8ssP/Caza7B5kUoY52NAfgCLyqGNNqDSCM02JD/sUIF4T5+OiVaDDzKPdBkOHE
-Rei3SQPXcLygCnwaXVWkmQLoqXESIXqmOwbWoACmBolMHKPGzp/4rvp3ejPUwYru
-FIwRkLdxvdKOzE/feFbX4GkXgvg6GmELxSZbakbuQoNeS/aTLYR2Y/GuE4UrA533
-Sih8+vYwOym3ZyV+cdIM1uoInD5lJmgl
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
MIIDLDCCAhSgAwIBAgIJAIHilzMu/j8KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
BAMTE2FhaS1sb2dvbi5zd2l0Y2guY2gwHhcNMTMxMjAyMTUxNzI5WhcNMTYxMjAx
MTUxNzI5WjAeMRwwGgYDVQQDExNhYWktbG9nb24uc3dpdGNoLmNoMIIBIjANBgkq
diff --git a/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml
index b90b827c..4599d1c5 100644
--- a/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.wsl.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-15T06:47:44Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-16T13:51:40Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
diff --git a/swamid-interfederations-2.0/auth.howcloud.com-saml-metadata.php.xml b/swamid-interfederations-2.0/auth.howcloud.com-saml-metadata.php.xml
new file mode 100644
index 00000000..aba10da0
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.howcloud.com-saml-metadata.php.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.howcloud.com/saml/metadata.php">
+ <!--
+ This is a php-saml custom implementation SP for HowCloud Ltd.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-16T09:22:38Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">HowCloud</mdui:DisplayName>
+ <mdui:Description xml:lang="en">HowCloud provides interactive learning tools to connect students and teachers online</mdui:Description>
+ <mdui:Logo height="64" width="64">https://cdn.howcloud.com/img/64x64-howcloud-isolated-logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID4zCCAsugAwIBAgIJAL5LjB+U8BdvMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
+ VQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTEPMA0GA1UEBwwGTG9uZG9uMRUw
+ EwYDVQQKDAxIb3dDbG91ZCBMdGQxGjAYBgNVBAMMEWF1dGguaG93Y2xvdWQuY29t
+ MR8wHQYJKoZIhvcNAQkBFhBqb2VAaG93Y2xvdWQuY29tMB4XDTE1MDkwNjE3MjQz
+ NFoXDTI1MDkwNTE3MjQzNFowgYcxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApTb21l
+ LVN0YXRlMQ8wDQYDVQQHDAZMb25kb24xFTATBgNVBAoMDEhvd0Nsb3VkIEx0ZDEa
+ MBgGA1UEAwwRYXV0aC5ob3djbG91ZC5jb20xHzAdBgkqhkiG9w0BCQEWEGpvZUBo
+ b3djbG91ZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7HjNQ
+ kgDtiBqTl/yZ+unwbUJTbsPpI7L+28ghM5ZZ4LOxAjy/C8tgTt3O21tVmqaudWXq
+ /GDJ6werc0zYOW9eEjSiOwilKgC1XUMYfPEN49GFNBMxQWWc2h6MW+zyAcbOHMlq
+ z519F9KBn8Dh4OCFPwAneybULMmkYjKooZypM9Pl/HSZr4gE0Gmm+GnZZGd1/iEg
+ xs2s4hEdyN8H+pgGRUw4XuVZyS8Gj++eBtkRBZ1pYNn7wbf9Dy/xFP7r+m2DheSc
+ SEQH8THXhVNV0dHHQgwa2gwjobyd45yf31QUsXKe78T40QT6M/k4F90A32SA11qz
+ +8Nx8YvwbyPiPCANAgMBAAGjUDBOMB0GA1UdDgQWBBQL6gyPDrMk6hfdZBkqk0rV
+ G4QT9jAfBgNVHSMEGDAWgBQL6gyPDrMk6hfdZBkqk0rVG4QT9jAMBgNVHRMEBTAD
+ AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAYeHWEi80HwwnA1kh5roISU3FkShrZyZCx
+ Vb1QEL1TsHHAtls+72KF/oeT80E0EWNIMNpql23ptzedcu7OwNpjVRiSFTlRanV1
+ ymXQ3O8THPkCo9IwQwUj0DLrD9iwDTpHrcbEyvty5iGASiCy4omocZ7G4OOwtllF
+ 0t/uyWdbY/aRmQu/ehGI0JmFcIU6Vp64YB2oFOvkzOMczvu1GcgdBpOKJgTiIu5F
+ TnLGxaIK4WtzxBon6zyXf+vba2LznRQm2QNbco1sTJVLJOGZbnaksqCYDDd7KE/L
+ J8HHgfKiXC66T2JydG0xlUk7zdxDo9SfxVg9qgyyJBlKYPNEnO9P
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID4zCCAsugAwIBAgIJAL5LjB+U8BdvMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
+ VQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTEPMA0GA1UEBwwGTG9uZG9uMRUw
+ EwYDVQQKDAxIb3dDbG91ZCBMdGQxGjAYBgNVBAMMEWF1dGguaG93Y2xvdWQuY29t
+ MR8wHQYJKoZIhvcNAQkBFhBqb2VAaG93Y2xvdWQuY29tMB4XDTE1MDkwNjE3MjQz
+ NFoXDTI1MDkwNTE3MjQzNFowgYcxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApTb21l
+ LVN0YXRlMQ8wDQYDVQQHDAZMb25kb24xFTATBgNVBAoMDEhvd0Nsb3VkIEx0ZDEa
+ MBgGA1UEAwwRYXV0aC5ob3djbG91ZC5jb20xHzAdBgkqhkiG9w0BCQEWEGpvZUBo
+ b3djbG91ZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7HjNQ
+ kgDtiBqTl/yZ+unwbUJTbsPpI7L+28ghM5ZZ4LOxAjy/C8tgTt3O21tVmqaudWXq
+ /GDJ6werc0zYOW9eEjSiOwilKgC1XUMYfPEN49GFNBMxQWWc2h6MW+zyAcbOHMlq
+ z519F9KBn8Dh4OCFPwAneybULMmkYjKooZypM9Pl/HSZr4gE0Gmm+GnZZGd1/iEg
+ xs2s4hEdyN8H+pgGRUw4XuVZyS8Gj++eBtkRBZ1pYNn7wbf9Dy/xFP7r+m2DheSc
+ SEQH8THXhVNV0dHHQgwa2gwjobyd45yf31QUsXKe78T40QT6M/k4F90A32SA11qz
+ +8Nx8YvwbyPiPCANAgMBAAGjUDBOMB0GA1UdDgQWBBQL6gyPDrMk6hfdZBkqk0rV
+ G4QT9jAfBgNVHSMEGDAWgBQL6gyPDrMk6hfdZBkqk0rVG4QT9jAMBgNVHRMEBTAD
+ AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAYeHWEi80HwwnA1kh5roISU3FkShrZyZCx
+ Vb1QEL1TsHHAtls+72KF/oeT80E0EWNIMNpql23ptzedcu7OwNpjVRiSFTlRanV1
+ ymXQ3O8THPkCo9IwQwUj0DLrD9iwDTpHrcbEyvty5iGASiCy4omocZ7G4OOwtllF
+ 0t/uyWdbY/aRmQu/ehGI0JmFcIU6Vp64YB2oFOvkzOMczvu1GcgdBpOKJgTiIu5F
+ TnLGxaIK4WtzxBon6zyXf+vba2LznRQm2QNbco1sTJVLJOGZbnaksqCYDDd7KE/L
+ J8HHgfKiXC66T2JydG0xlUk7zdxDo9SfxVg9qgyyJBlKYPNEnO9P
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <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://auth.howcloud.com/saml/acs.php" index="1"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en-US">HowCloud Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en-US">HowCloud</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en-US">http://www.howcloud.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Joseph</GivenName>
+ <SurName>Ros</SurName>
+ <EmailAddress>mailto:joe@howcloud.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Joseph</GivenName>
+ <SurName>Ros</SurName>
+ <EmailAddress>mailto:joe@howcloud.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml
index a0bef3da..dde81bce 100644
--- a/swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml
@@ -64,49 +64,6 @@
<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>
- MIIEujCCA6KgAwIBAgIQRLomkyosVgECbA0c3XaRHzANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMTAwMzAwMDAwMFoXDTE1MTAwMzIzNTk1OVowgYwxCzAJBgNV
- BAYTAkdCMRMwEQYDVQQIEwpNaWRsb3RoaWFuMRIwEAYDVQQHEwlFZGluYnVyZ2gx
- HzAdBgNVBAoTFkhlcmlvdC1XYXR0IFVuaXZlcnNpdHkxEDAOBgNVBAsTB1NDSE9M
- QVIxITAfBgNVBAMTGGNvdXJzZXMuc2Nob2xhci5ody5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBANjbD0Ux5Uv0WiNcGkafLQKrrMDMiq8JS/tM
- VYQ5u0AaYFTekO+LMzqqB/mOHlgm5Rs1xEo9VgG7gdFV943P61lTn/qweB1mHU7a
- zJG16He+5yu21eJ+iT9kwTi7LU17208xEhkClEuy7pwGOW5+wiDNtpk3OSeqpEAW
- EVPbwRPHC8Zyh3dbe/LFD8H9dxScmxYC8FTPAGGJWi1L4zXWwtMEJW4VlubYbaWQ
- NlUuNyyiI+00jowg96aFDSwUqDBGo7uf0gYuVrgjUk1pjNdTEgq872JXRHN4e4P4
- 6bVMKYskLSkW4AMaEeCmnNaabJN0P3VJar1/Ptc/nJ3BKwlCRycCAwEAAaOCAWsw
- ggFnMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTC
- 1f/4bAhBMH3eDvZ5AU1Z7gPd3zAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
- ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
- BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
- bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
- MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
- CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAjBgNVHREEHDAa
- ghhjb3Vyc2VzLnNjaG9sYXIuaHcuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAVp
- IYPdo0+/kLxIcuqEu0q5v5Xgwj4cpug13IZGzrkorKNZvsMrclTl7WR+4XdTlseW
- q1oQBqXAca6IftsheRJicQHKGdjUcdKWcKIR1dESiJTS6ZgVn+2P9+7cqO6g+7KA
- KfgQOtbaWIjfuyyitrFdHpmNiDu6IbL7CE1D66SEpmGeudEd3iOqJ5Jg2cMYzp3m
- 5bgibxsUL6RmZZy4FTs3+EaTAgwYplToHWswYVcBKUOT8zHViaLoAGIa91Jdk8gs
- he+WuTto9CopcLzbYhDq6+V4Z7wSPxXvIhsYR4XueFAdtfikwtJuG5ILtLylJBBE
- IdO6f+kcAEgl9zyanis=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
- <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
- <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>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SLO/Redirect"/>
diff --git a/swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..3364a192
--- /dev/null
+++ b/swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dans.idp.knaw.nl/simplesaml/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-09-10T20:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="nl">Data Archiving and Networked Services (KNAW)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Data Archiving and Networked Services (KNAW)</mdui:DisplayName>
+ <mdui:Description xml:lang="nl">Data Archiving and Networked Services (KNAW)</mdui:Description>
+ <mdui:Description xml:lang="en">Data Archiving and Networked Services (KNAW)</mdui:Description>
+ <mdui:Logo height="38" width="108">https://static.surfconext.nl/media/idp/knaw-dans.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Data Archiving and Networked Services KNAW DANS</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">Data Archiving and Networked Services KNAW DANS</mdui:Keywords>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/37250172e5ee0e20a9477cdb1c0f9c19"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="nl">Data Archiving and Networked Services (KNAW)</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Data Archiving and Networked Services (KNAW)</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="nl">Data Archiving and Networked Services (KNAW)</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Data Archiving and Networked Services (KNAW)</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="nl">http://www.dans.knaw.nl/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.dans.knaw.nl/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml b/swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml
index cf4b6ccd..aebcee75 100644
--- a/swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml
@@ -4,6 +4,11 @@
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-26T14:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
diff --git a/swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml
index b19d3179..aadf8bbf 100644
--- a/swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml
@@ -45,40 +45,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEwDCCA6igAwIBAgIRAOIFRAsgYGQ47TBLkuFk0xUwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjA5MTEwMDAwMDBaFw0xNTA5MTEyMzU5NTlaMIGKMQswCQYD
- VQQGEwJHQjEQMA4GA1UECBMHUm9tZm9yZDEOMAwGA1UEBxMFRXNzZXgxGjAYBgNV
- BAoTEVJlZGJyaWRnZSBDb2xsZWdlMRMwEQYDVQQLEwpFLUxlYXJuaW5nMSgwJgYD
- VQQDEx9lbC1zaGliLnJlZGJyaWRnZS1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
- 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs4orLy5QnpSUHTjIhQL7VxQd6qXWSwBzqcCz
- i7/Z+q5PYI8J+HplveLcqL1qC7vpDRYY4qmYukXRFjXFqxFahEovaeIfjBrSYr1M
- v2TkCIxmwG0vndr/CEUVb5Dq13+Tw5JVg3on5LGIt0FGfYvmOCCBu0skUxE/ltC3
- tuU6ZYRGNuaX0yCCGTm7AAX9G/xRDWlUlyVTzgDk8ndL1IrTR66xB3Y7ufjlXssE
- mhOo87cnzOEmPs5hZLiJDsBW6j2I+zYaQjZz97fyIwkLOXenvi/XNA8DiiTqSJIV
- 5WmicXaqC5oBZ0D7J4k2W2qFO9X4DSAVCdCyUgFVTkBQa9+QywIDAQABo4IBcjCC
- AW4wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOLF
- y0014/mnDphFXRx1nl/SCObhMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
- MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
- AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
- YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
- AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
- KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCoGA1UdEQQjMCGC
- H2VsLXNoaWIucmVkYnJpZGdlLWNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQAD
- ggEBAK+y2q9cP34wYcOvF5c3jSUJB4bp4nWIJiWwgE8xJfoVAeGQCoUhQzZn8Fnu
- yl/HzkeTXvBz6ujlyrZNgn9+DA8ZW3HAJEUDOBqtXZ9gqJlxe3fmO8s1oCy3gxdf
- p6oXlfSkKHHIgt0njmoa19NgjCys95WCwWjNmbrHQ+q5M03mxHNgtwA/vK7EGBL2
- UKSjEncSw+NLp/FpDTcwu/haHACR5cvzIMjCMWsiGDcK8PwiqnvPhthoBf92Yo7c
- RQ7/EvQIvQGv1Sp9vGrfDj7BHT5OCpi8tkYMJSQ81+nsjQfGZB9yr/q1LwlHlFDi
- 2mGhuEODCFY1HUmMM9OD1yNH/co=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://el-shib.redbridge-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://el-shib.redbridge-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -127,40 +93,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEwDCCA6igAwIBAgIRAOIFRAsgYGQ47TBLkuFk0xUwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjA5MTEwMDAwMDBaFw0xNTA5MTEyMzU5NTlaMIGKMQswCQYD
- VQQGEwJHQjEQMA4GA1UECBMHUm9tZm9yZDEOMAwGA1UEBxMFRXNzZXgxGjAYBgNV
- BAoTEVJlZGJyaWRnZSBDb2xsZWdlMRMwEQYDVQQLEwpFLUxlYXJuaW5nMSgwJgYD
- VQQDEx9lbC1zaGliLnJlZGJyaWRnZS1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
- 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs4orLy5QnpSUHTjIhQL7VxQd6qXWSwBzqcCz
- i7/Z+q5PYI8J+HplveLcqL1qC7vpDRYY4qmYukXRFjXFqxFahEovaeIfjBrSYr1M
- v2TkCIxmwG0vndr/CEUVb5Dq13+Tw5JVg3on5LGIt0FGfYvmOCCBu0skUxE/ltC3
- tuU6ZYRGNuaX0yCCGTm7AAX9G/xRDWlUlyVTzgDk8ndL1IrTR66xB3Y7ufjlXssE
- mhOo87cnzOEmPs5hZLiJDsBW6j2I+zYaQjZz97fyIwkLOXenvi/XNA8DiiTqSJIV
- 5WmicXaqC5oBZ0D7J4k2W2qFO9X4DSAVCdCyUgFVTkBQa9+QywIDAQABo4IBcjCC
- AW4wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOLF
- y0014/mnDphFXRx1nl/SCObhMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
- MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
- AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
- YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
- AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
- KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCoGA1UdEQQjMCGC
- H2VsLXNoaWIucmVkYnJpZGdlLWNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQAD
- ggEBAK+y2q9cP34wYcOvF5c3jSUJB4bp4nWIJiWwgE8xJfoVAeGQCoUhQzZn8Fnu
- yl/HzkeTXvBz6ujlyrZNgn9+DA8ZW3HAJEUDOBqtXZ9gqJlxe3fmO8s1oCy3gxdf
- p6oXlfSkKHHIgt0njmoa19NgjCys95WCwWjNmbrHQ+q5M03mxHNgtwA/vK7EGBL2
- UKSjEncSw+NLp/FpDTcwu/haHACR5cvzIMjCMWsiGDcK8PwiqnvPhthoBf92Yo7c
- RQ7/EvQIvQGv1Sp9vGrfDj7BHT5OCpi8tkYMJSQ81+nsjQfGZB9yr/q1LwlHlFDi
- 2mGhuEODCFY1HUmMM9OD1yNH/co=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://el-shib.redbridge-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://el-shib.redbridge-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -181,4 +113,9 @@
<SurName>Calcanis</SurName>
<EmailAddress>mailto:ccalcanis@redbridge-college.ac.uk</EmailAddress>
</ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Steven</GivenName>
+ <SurName>Rix</SurName>
+ <EmailAddress>mailto:SRix@redbridge-college.ac.uk</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.napier.ac.uk-idp-pingfederate.xml b/swamid-interfederations-2.0/federation.napier.ac.uk-idp-pingfederate.xml
new file mode 100644
index 00000000..4094f630
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.napier.ac.uk-idp-pingfederate.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.napier.ac.uk/idp/pingfederate">
+ <!--
+ This is a PingFederate IdP for Edinburgh Napier University.
+ -->
+ <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-11T13:43:48Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">napier.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDeDCCAmCgAwIBAgIGAU+sUxvAMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNVBAYT
+ AkdCMRIwEAYDVQQIEwlFZGluYnVyZ2gxEjAQBgNVBAcTCUVkaW5idXJnaDEkMCIG
+ A1UEChMbRWRpbmJ1cmdoIE5hcGllciBVbml2ZXJzaXR5MSAwHgYDVQQDExdmZWRl
+ cmF0aW9uLm5hcGllci5hYy51azAeFw0xNTA5MDgwOTM5MzFaFw0zNTA5MDQwOTM5
+ MzFaMH0xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlFZGluYnVyZ2gxEjAQBgNVBAcT
+ CUVkaW5idXJnaDEkMCIGA1UEChMbRWRpbmJ1cmdoIE5hcGllciBVbml2ZXJzaXR5
+ MSAwHgYDVQQDExdmZWRlcmF0aW9uLm5hcGllci5hYy51azCCASIwDQYJKoZIhvcN
+ AQEBBQADggEPADCCAQoCggEBAMLtdCNUtcf8tt0/nq07hzjF8TIJMkPXwPCRxo0o
+ rBYOH3NB6GYbDODXu4W7AmhF8p+BsgKL0wkl+Zl53+AJdThMfU1rN+Ih3co3qpjZ
+ xDHmnj4HzKGAdRWTQsnSA5/gY9WWWsIT/7aannP7yAQXeOO1Qch8+D8ZqGpkoLYK
+ hNMeILHIBnuaTit2DsTuFaCaibJ9ky2TxUZQXh8h+InChCGYY6bnKQKRaFszD/B6
+ N5JfYWyNqwHcnx1qTWmQWWLbt1ZlGE7/OwkMVzdNOalOf5SunDjA17U0lX0gpO/0
+ NpOLHGCx9RgDlQzJ1fXGLGQ+iLWNCcUlbxCyPWPZxb1ATmUCAwEAATANBgkqhkiG
+ 9w0BAQsFAAOCAQEAhUHBGidQ7SPwgSDIOFKuYfoKBqeziRp675SACxVMS+wqrAlx
+ hNqAyJVmc4+pslEggwaVL3MKvXQHKizd2dS1U4Gd7Ew43/FzDoRpeQ33aASS1FR1
+ ZkPAfhNsVtcW+fGrx/vg9bmf2BUcYkHKAJ69wkuHhfhEyqU0Jplerlr1q0+XcE4K
+ TH0FxhmDjCJyKEgW7SBU1CU7Vb3EKDw43NSkEoex89I5Ck0GPGLkCK7roP+jTQ6K
+ tg0UI45sJhsTp/JvciP1XK6JHgiIWp6L/TcRQeCsX04Binb8WerPgDWdP9A4oroB
+ 0UsLuEW0FBsLhnMyCVSJt+xbR0ctVu12LuYcIA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.napier.ac.uk:8443/idp/soap.ssaml1" index="0"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.napier.ac.uk/idp/SSO.saml2"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.napier.ac.uk/idp/SSO.saml2"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.napier.ac.uk/idp/isx.saml1"/>
+ </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">napier.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDeDCCAmCgAwIBAgIGAU+sUxvAMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNVBAYT
+ AkdCMRIwEAYDVQQIEwlFZGluYnVyZ2gxEjAQBgNVBAcTCUVkaW5idXJnaDEkMCIG
+ A1UEChMbRWRpbmJ1cmdoIE5hcGllciBVbml2ZXJzaXR5MSAwHgYDVQQDExdmZWRl
+ cmF0aW9uLm5hcGllci5hYy51azAeFw0xNTA5MDgwOTM5MzFaFw0zNTA5MDQwOTM5
+ MzFaMH0xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlFZGluYnVyZ2gxEjAQBgNVBAcT
+ CUVkaW5idXJnaDEkMCIGA1UEChMbRWRpbmJ1cmdoIE5hcGllciBVbml2ZXJzaXR5
+ MSAwHgYDVQQDExdmZWRlcmF0aW9uLm5hcGllci5hYy51azCCASIwDQYJKoZIhvcN
+ AQEBBQADggEPADCCAQoCggEBAMLtdCNUtcf8tt0/nq07hzjF8TIJMkPXwPCRxo0o
+ rBYOH3NB6GYbDODXu4W7AmhF8p+BsgKL0wkl+Zl53+AJdThMfU1rN+Ih3co3qpjZ
+ xDHmnj4HzKGAdRWTQsnSA5/gY9WWWsIT/7aannP7yAQXeOO1Qch8+D8ZqGpkoLYK
+ hNMeILHIBnuaTit2DsTuFaCaibJ9ky2TxUZQXh8h+InChCGYY6bnKQKRaFszD/B6
+ N5JfYWyNqwHcnx1qTWmQWWLbt1ZlGE7/OwkMVzdNOalOf5SunDjA17U0lX0gpO/0
+ NpOLHGCx9RgDlQzJ1fXGLGQ+iLWNCcUlbxCyPWPZxb1ATmUCAwEAATANBgkqhkiG
+ 9w0BAQsFAAOCAQEAhUHBGidQ7SPwgSDIOFKuYfoKBqeziRp675SACxVMS+wqrAlx
+ hNqAyJVmc4+pslEggwaVL3MKvXQHKizd2dS1U4Gd7Ew43/FzDoRpeQ33aASS1FR1
+ ZkPAfhNsVtcW+fGrx/vg9bmf2BUcYkHKAJ69wkuHhfhEyqU0Jplerlr1q0+XcE4K
+ TH0FxhmDjCJyKEgW7SBU1CU7Vb3EKDw43NSkEoex89I5Ck0GPGLkCK7roP+jTQ6K
+ tg0UI45sJhsTp/JvciP1XK6JHgiIWp6L/TcRQeCsX04Binb8WerPgDWdP9A4oroB
+ 0UsLuEW0FBsLhnMyCVSJt+xbR0ctVu12LuYcIA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federation.napier.ac.uk:8443/idp/attrsvc.ssaml2"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.napier.ac.uk:8443/idp/soap.ssaml1"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Edinburgh Napier University</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Edinburgh Napier University (PingFederate)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.napier.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IT Support</GivenName>
+ <EmailAddress>mailto:citsupport@napier.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>James</GivenName>
+ <SurName>Todd</SurName>
+ <EmailAddress>mailto:j.todd@napier.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..ec5a5735
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-couperin.renater.fr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-01T17:29:32Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">couperin.org</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">COUPERIN</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAA3NCSVQICAjb4U/gAAABKUlEQVQokWM0Nk5jIAWwoPFl1L6pGX/m4v0L4V44IPDkFheyAka4DZw8fzJ776obf0Ez4sIB/gUNCt+/QI1mlpIyhrAq5t9Q0v327TPz0na5Vb2ye5eLvXnOpqT7VVb9u6Lu1+NbRFCcpGb8WVb9OwMDw4IGhYsHBSCC+5aLP7nFVTzzlrrxF2HJn2+fs2PxA1w1BNw6y3vzLA8DAwMn71+G59g8jQn60tWRuUwENaCBAdfAyfNn5pmzM8+cVTP+jKLh7TM2CMMp8iWyBueoVwwMDN8+M986ywsRgYbS2+fsxzYLW/m+DS9+YuDwASKtZvwZEvGremXgRjAiJz6nyJe+ac/hCYmBgeHNM7ZVvbLIkcOImVpl1L5B9Hz7zIyW8hiwRhymImQAABoAaLnD7wajAAAAAElFTkSuQmCC</mdui:Logo>
+ <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Service d'authentification de Couperin</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">COUPERIN</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Service d'authentification de Couperin</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>
+ MIIDSDCCAjCgAwIBAgIVAMULo4bCEwXQpVzPDquvwEPmzkVrMA0GCSqGSIb3DQEB
+CwUAMCIxIDAeBgNVBAMMF2lkcC1jb3VwZXJpbi5yZW5hdGVyLmZyMB4XDTE1MDYw
+MjEzMjc1M1oXDTM1MDYwMjEzMjc1M1owIjEgMB4GA1UEAwwXaWRwLWNvdXBlcmlu
+LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtjxsz
+BuG1iCzsTXkK+6koRh28hxJqOIlitP3hawDeXx+m73jNm9nYxvbXi4wNVLIfXMGk
+ien8yhwC7jn5daBz1/DpwJHxi9qC3/c5IrN3MmfcSYsS6pVW1+bLssOBdRusu8CN
+cltECD/F8NsTNubx0Dp3iQzOj+2ePiDZT7hF2qKneOl6VQAT5m6+CC9SlrhZKlAo
+j2Y71cSmnulzOpx/791duI1fFhOG+uB01iimekPTzCAs34g8nA3g7t776Pvf4lL6
+HyQdgg/5ty+lFT4Z01gpqO+3E3m0AVZx44RtU1+e8tpJtwHNksDwRh4hFlV5EVHC
+R8+Pqqm915QZNP13AgMBAAGjdTBzMB0GA1UdDgQWBBTM5/T7q4JJ5LhIHRNnTA3g
+s4qhWjBSBgNVHREESzBJghdpZHAtY291cGVyaW4ucmVuYXRlci5mcoYuaHR0cHM6
+Ly9pZHAtY291cGVyaW4ucmVuYXRlci5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAQEAhtPzNITQtpPpLLzDo1ihtgDcUOpdM0DAQ0vvLjaPNBRWqwGA
+STfAd9a90JZmO862Q8BMTdHHF4Buy+eROTL1w0VXkuP423sJvqlpQ2PhiZAf0Eyf
+50SyQnzXQQ2+VUoMws+oe+qyZWsi6eGV10lmVs+su982pJnH730B+CzMCPK7WHtt
+22tF63XjAZwBWK9iYx3+H7uAHf09PA8cE2Tvf8VotrrZP4JA9zThj/oXt+eKYR4d
+9uO1aL0aX8uJvW1pBzHLduUpoGEKoaTf4JxRereiuuKCCiMcI3ETSpq7QpmChzt9
+t07R76998/yfPxz/Dakn82YII+tPFsgpgJXT4g==
+ </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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-couperin.renater.fr/idp/profile/Shibboleth/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">couperin.org</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVAMULo4bCEwXQpVzPDquvwEPmzkVrMA0GCSqGSIb3DQEB
+CwUAMCIxIDAeBgNVBAMMF2lkcC1jb3VwZXJpbi5yZW5hdGVyLmZyMB4XDTE1MDYw
+MjEzMjc1M1oXDTM1MDYwMjEzMjc1M1owIjEgMB4GA1UEAwwXaWRwLWNvdXBlcmlu
+LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtjxsz
+BuG1iCzsTXkK+6koRh28hxJqOIlitP3hawDeXx+m73jNm9nYxvbXi4wNVLIfXMGk
+ien8yhwC7jn5daBz1/DpwJHxi9qC3/c5IrN3MmfcSYsS6pVW1+bLssOBdRusu8CN
+cltECD/F8NsTNubx0Dp3iQzOj+2ePiDZT7hF2qKneOl6VQAT5m6+CC9SlrhZKlAo
+j2Y71cSmnulzOpx/791duI1fFhOG+uB01iimekPTzCAs34g8nA3g7t776Pvf4lL6
+HyQdgg/5ty+lFT4Z01gpqO+3E3m0AVZx44RtU1+e8tpJtwHNksDwRh4hFlV5EVHC
+R8+Pqqm915QZNP13AgMBAAGjdTBzMB0GA1UdDgQWBBTM5/T7q4JJ5LhIHRNnTA3g
+s4qhWjBSBgNVHREESzBJghdpZHAtY291cGVyaW4ucmVuYXRlci5mcoYuaHR0cHM6
+Ly9pZHAtY291cGVyaW4ucmVuYXRlci5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAQEAhtPzNITQtpPpLLzDo1ihtgDcUOpdM0DAQ0vvLjaPNBRWqwGA
+STfAd9a90JZmO862Q8BMTdHHF4Buy+eROTL1w0VXkuP423sJvqlpQ2PhiZAf0Eyf
+50SyQnzXQQ2+VUoMws+oe+qyZWsi6eGV10lmVs+su982pJnH730B+CzMCPK7WHtt
+22tF63XjAZwBWK9iYx3+H7uAHf09PA8cE2Tvf8VotrrZP4JA9zThj/oXt+eKYR4d
+9uO1aL0aX8uJvW1pBzHLduUpoGEKoaTf4JxRereiuuKCCiMcI3ETSpq7QpmChzt9
+t07R76998/yfPxz/Dakn82YII+tPFsgpgJXT4g==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-couperin.renater.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">COUPERIN</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">COUPERIN</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>chabli Anass</md:SurName>
+ <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..690582dd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.llgc.org.uk/idp/shibboleth">
+ <!--
+ This is a Shibboleth IdP for the National Library of Wales.
+ -->
+ <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-11T09:38:34Z">
+ <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">llgc.org.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDOzCCAiOgAwIBAgIUNwI1rG1GW4KhaBBV9eamjmqtA/0wDQYJKoZIhvcNAQEF
+ BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QubGxnYy5vcmcudWswHhcNMTUwOTEwMDg1
+ MTM4WhcNMzUwOTEwMDg1MTM4WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5sbGdjLm9y
+ Zy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIdiMUrH+n6Gkn5K
+ GmJgtKy8BeJ5Ome3Y5eS3YrdBAyIR0mFjelwuWbZdpByD4zaqbqVuKUTNJslPb5g
+ YeagrhGCoGr6WgRHGUN7+MDPLrRHbl5NPqXXkjEZyDbEle6phlItK4JyR5X3DUWo
+ 08aYz01nVg+O+ausLEgCmP4bPDm/x5yNCjqg+jyxogwoIevhIqg3ZvYSZeCqmu3Z
+ K5O1RAofCbyMc7qambuNelfO/wgwv/MHIb/k0eMhzfr4JbDcCmO1uhx4XkVvPuRS
+ JnSDt24Ys3ByrRWUl3k8XygPoF9wuCzbmhGX5uWobvPXn0AojqoEyssFhkAUynSJ
+ NQ01n/ECAwEAAaNvMG0wHQYDVR0OBBYEFOnOx26moRMowzyEmzizjCcXEN4QMEwG
+ A1UdEQRFMEOCFGlkcC10ZXN0LmxsZ2Mub3JnLnVrhitodHRwczovL2lkcC10ZXN0
+ LmxsZ2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQBc
+ hz3TSLkztcI4fo7D0ZSrcQctBRQQ49uGPHJmkU/3O6ru32J3ooEnSV5MgEucE8k7
+ obdn9Iwx9UpROdsy6FlUFwNKsoBvt6X0xh+5vz7TqnZIZKV7YMmeaBsrml7qxVcJ
+ HDCFGJcnCNPjfZhq/Ebm9yjiFiWa+/0G137i454wxSO0VWjBG/AKXh+Q7rWYiizl
+ b43VJAwhfMV+EirlWbSK8tDyUfEPPI8gmpaNFAz4GohZKHHaBfPoQmfVFXEvaaVJ
+ 0UUjKXItpyV5GmOLloJRLKdTLV00sxDAlcqNaY5pJQb1AUwlc3yqhB6vT7I0jSh+
+ b2ksiYiK8n1E6BC6oG2v
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.org.uk: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-test.llgc.org.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.llgc.org.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">llgc.org.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDOzCCAiOgAwIBAgIUNwI1rG1GW4KhaBBV9eamjmqtA/0wDQYJKoZIhvcNAQEF
+ BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QubGxnYy5vcmcudWswHhcNMTUwOTEwMDg1
+ MTM4WhcNMzUwOTEwMDg1MTM4WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5sbGdjLm9y
+ Zy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIdiMUrH+n6Gkn5K
+ GmJgtKy8BeJ5Ome3Y5eS3YrdBAyIR0mFjelwuWbZdpByD4zaqbqVuKUTNJslPb5g
+ YeagrhGCoGr6WgRHGUN7+MDPLrRHbl5NPqXXkjEZyDbEle6phlItK4JyR5X3DUWo
+ 08aYz01nVg+O+ausLEgCmP4bPDm/x5yNCjqg+jyxogwoIevhIqg3ZvYSZeCqmu3Z
+ K5O1RAofCbyMc7qambuNelfO/wgwv/MHIb/k0eMhzfr4JbDcCmO1uhx4XkVvPuRS
+ JnSDt24Ys3ByrRWUl3k8XygPoF9wuCzbmhGX5uWobvPXn0AojqoEyssFhkAUynSJ
+ NQ01n/ECAwEAAaNvMG0wHQYDVR0OBBYEFOnOx26moRMowzyEmzizjCcXEN4QMEwG
+ A1UdEQRFMEOCFGlkcC10ZXN0LmxsZ2Mub3JnLnVrhitodHRwczovL2lkcC10ZXN0
+ LmxsZ2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQBc
+ hz3TSLkztcI4fo7D0ZSrcQctBRQQ49uGPHJmkU/3O6ru32J3ooEnSV5MgEucE8k7
+ obdn9Iwx9UpROdsy6FlUFwNKsoBvt6X0xh+5vz7TqnZIZKV7YMmeaBsrml7qxVcJ
+ HDCFGJcnCNPjfZhq/Ebm9yjiFiWa+/0G137i454wxSO0VWjBG/AKXh+Q7rWYiizl
+ b43VJAwhfMV+EirlWbSK8tDyUfEPPI8gmpaNFAz4GohZKHHaBfPoQmfVFXEvaaVJ
+ 0UUjKXItpyV5GmOLloJRLKdTLV00sxDAlcqNaY5pJQb1AUwlc3yqhB6vT7I0jSh+
+ b2ksiYiK8n1E6BC6oG2v
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.org.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">National Library of Wales</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">National Library of Wales / Llyfrgell Genedlaethol Cymru</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.llgc.org.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Illtud</GivenName>
+ <SurName>Daniel</SurName>
+ <EmailAddress>mailto:shibboleth-support@llgc.org.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Illtud</GivenName>
+ <SurName>Daniel</SurName>
+ <EmailAddress>mailto:shibboleth-technical@llgc.org.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
index 082b2d47..a828a6da 100644
--- a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
@@ -314,6 +314,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sturje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskorena.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smartno.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-domzale.si</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
<mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
diff --git a/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
index 20f8d4e1..10058738 100644
--- a/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
@@ -23,38 +23,37 @@
<ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+ <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
+MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CAwGQmF5ZXJuMRIwEAYDVQQHDAlSb3NlbmhlaW0xHTAbBgNVBAoMFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVtMRwwGgYDVQQDDBNp
ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
+AQEAt++hJd5t48KJPKqUqz6zzYQYp6JAvxAioSYcTMoWlPwpfEnBHXMdYe9X+Yka
+G4mdn6vrrm60mFPi+IIIHUYYnSB0Q2VV12gOzOfcu+oveGb4Jd0PnR0beud5ns2q
+cfZ/AD8pn2Y2uHYw7Y/yIzAtejhO7waBt6gSthv2Kw/LtvMjCMG0bXhOobOQ1Kqb
+Xw8r3yN8o5DD43SoKHX1HN5krEYqnKu2M/KcO9FJgYlk8RrwWWffXgfTO55ISysX
+dW4B55mDvCxCqQmzKDSbwZBTKoG8RXHtnonmedtm2egVwxH8HPfWj84Fpk2eCVQj
+78fkh+neUWGL/lOCdr3nDy6i6wIDAQABo4ICXjCCAlowTwYDVR0gBEgwRjARBg8r
+BgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
+AQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
+BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBR6kwflRNnIjgBvGKaO
++Jz7PAY2OTAfBgNVHSMEGDAWgBQgZm4lL6ljTaLgJ7qJf8sVuj+ukTAeBgNVHREE
+FzAVghNpZHAuZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19j
+YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5o
+ZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
+CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
+U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5o
+ZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2FjZXJ0L2df
+Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAT0veIj3G+Z2c+lWdFmHjl1MY
+vGLdqSz/kOBTP0TQmaR0F3XfwAeq2vzjLrIKzq2dLta7B8XM2z6SQP076+bDitwn
+PyjzjBHhcH0+9qbW7NyuAqGJ7QLDNgHdTp6Vy9NL3n3DWQcyl5+IJF0/AaOTcGpv
+TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
+Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
+9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -64,38 +63,37 @@ nflFJg==
<ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+ <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
+MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CAwGQmF5ZXJuMRIwEAYDVQQHDAlSb3NlbmhlaW0xHTAbBgNVBAoMFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVtMRwwGgYDVQQDDBNp
ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
+AQEAt++hJd5t48KJPKqUqz6zzYQYp6JAvxAioSYcTMoWlPwpfEnBHXMdYe9X+Yka
+G4mdn6vrrm60mFPi+IIIHUYYnSB0Q2VV12gOzOfcu+oveGb4Jd0PnR0beud5ns2q
+cfZ/AD8pn2Y2uHYw7Y/yIzAtejhO7waBt6gSthv2Kw/LtvMjCMG0bXhOobOQ1Kqb
+Xw8r3yN8o5DD43SoKHX1HN5krEYqnKu2M/KcO9FJgYlk8RrwWWffXgfTO55ISysX
+dW4B55mDvCxCqQmzKDSbwZBTKoG8RXHtnonmedtm2egVwxH8HPfWj84Fpk2eCVQj
+78fkh+neUWGL/lOCdr3nDy6i6wIDAQABo4ICXjCCAlowTwYDVR0gBEgwRjARBg8r
+BgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
+AQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
+BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBR6kwflRNnIjgBvGKaO
++Jz7PAY2OTAfBgNVHSMEGDAWgBQgZm4lL6ljTaLgJ7qJf8sVuj+ukTAeBgNVHREE
+FzAVghNpZHAuZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19j
+YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5o
+ZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
+CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
+U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5o
+ZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2FjZXJ0L2df
+Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAT0veIj3G+Z2c+lWdFmHjl1MY
+vGLdqSz/kOBTP0TQmaR0F3XfwAeq2vzjLrIKzq2dLta7B8XM2z6SQP076+bDitwn
+PyjzjBHhcH0+9qbW7NyuAqGJ7QLDNgHdTp6Vy9NL3n3DWQcyl5+IJF0/AaOTcGpv
+TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
+Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
+9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -122,38 +120,37 @@ nflFJg==
<ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+ <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
+MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CAwGQmF5ZXJuMRIwEAYDVQQHDAlSb3NlbmhlaW0xHTAbBgNVBAoMFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVtMRwwGgYDVQQDDBNp
ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
+AQEAt++hJd5t48KJPKqUqz6zzYQYp6JAvxAioSYcTMoWlPwpfEnBHXMdYe9X+Yka
+G4mdn6vrrm60mFPi+IIIHUYYnSB0Q2VV12gOzOfcu+oveGb4Jd0PnR0beud5ns2q
+cfZ/AD8pn2Y2uHYw7Y/yIzAtejhO7waBt6gSthv2Kw/LtvMjCMG0bXhOobOQ1Kqb
+Xw8r3yN8o5DD43SoKHX1HN5krEYqnKu2M/KcO9FJgYlk8RrwWWffXgfTO55ISysX
+dW4B55mDvCxCqQmzKDSbwZBTKoG8RXHtnonmedtm2egVwxH8HPfWj84Fpk2eCVQj
+78fkh+neUWGL/lOCdr3nDy6i6wIDAQABo4ICXjCCAlowTwYDVR0gBEgwRjARBg8r
+BgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
+AQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
+BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBR6kwflRNnIjgBvGKaO
++Jz7PAY2OTAfBgNVHSMEGDAWgBQgZm4lL6ljTaLgJ7qJf8sVuj+ukTAeBgNVHREE
+FzAVghNpZHAuZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19j
+YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5o
+ZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
+CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
+U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5o
+ZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2FjZXJ0L2df
+Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAT0veIj3G+Z2c+lWdFmHjl1MY
+vGLdqSz/kOBTP0TQmaR0F3XfwAeq2vzjLrIKzq2dLta7B8XM2z6SQP076+bDitwn
+PyjzjBHhcH0+9qbW7NyuAqGJ7QLDNgHdTp6Vy9NL3n3DWQcyl5+IJF0/AaOTcGpv
+TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
+Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
+9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -163,38 +160,37 @@ nflFJg==
<ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+ <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
+MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CAwGQmF5ZXJuMRIwEAYDVQQHDAlSb3NlbmhlaW0xHTAbBgNVBAoMFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVtMRwwGgYDVQQDDBNp
ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
+AQEAt++hJd5t48KJPKqUqz6zzYQYp6JAvxAioSYcTMoWlPwpfEnBHXMdYe9X+Yka
+G4mdn6vrrm60mFPi+IIIHUYYnSB0Q2VV12gOzOfcu+oveGb4Jd0PnR0beud5ns2q
+cfZ/AD8pn2Y2uHYw7Y/yIzAtejhO7waBt6gSthv2Kw/LtvMjCMG0bXhOobOQ1Kqb
+Xw8r3yN8o5DD43SoKHX1HN5krEYqnKu2M/KcO9FJgYlk8RrwWWffXgfTO55ISysX
+dW4B55mDvCxCqQmzKDSbwZBTKoG8RXHtnonmedtm2egVwxH8HPfWj84Fpk2eCVQj
+78fkh+neUWGL/lOCdr3nDy6i6wIDAQABo4ICXjCCAlowTwYDVR0gBEgwRjARBg8r
+BgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
+AQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
+BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBR6kwflRNnIjgBvGKaO
++Jz7PAY2OTAfBgNVHSMEGDAWgBQgZm4lL6ljTaLgJ7qJf8sVuj+ukTAeBgNVHREE
+FzAVghNpZHAuZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19j
+YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5o
+ZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
+CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
+U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5o
+ZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2FjZXJ0L2df
+Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAT0veIj3G+Z2c+lWdFmHjl1MY
+vGLdqSz/kOBTP0TQmaR0F3XfwAeq2vzjLrIKzq2dLta7B8XM2z6SQP076+bDitwn
+PyjzjBHhcH0+9qbW7NyuAqGJ7QLDNgHdTp6Vy9NL3n3DWQcyl5+IJF0/AaOTcGpv
+TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
+Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
+9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..f83bf4b2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.grena.ge/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://mtd.gif.grena.ge" registrationInstant="2015-07-17T13:04:24Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://gif.grena.ge/admin/editor/uploads/files/GIF%20Identity%20Federation%20Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">GRENA Identity Provider</mdui:DisplayName>
+ <mdui:Description xml:lang="en">GRENA Identity Provider</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://gif.grena.ge</mdui:InformationURL>
+ <mdui:Logo width="375" height="156" xml:lang="en">https://idp.grena.ge/logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:GeolocationHint>geo:41.70478,44.78696</mdui:GeolocationHint>
+ <mdui:IPHint>217.147.239.162/32</mdui:IPHint>
+ <mdui:DomainHint>idp.grena.ge</mdui:DomainHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIID6zCCAtOgAwIBAgIJAMK8nCcQGikvMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
+VQQGEwJHRTEQMA4GA1UECAwHR2VvcmdpYTEQMA4GA1UEBwwHVGJpbGlzaTFBMD8G
+A1UECgw4R2VvcmdpYW4gUmVzZWFyY2ggQW5kIEVkdWNhdGlvbmFsIE5ldHdvcmtp
+bmcgQXNzb2NpYXRpb24xFTATBgNVBAMMDGlkcC5ncmVuYS5nZTAeFw0xNTA3MTcx
+MTIwMTlaFw0yNTA3MTYxMTIwMTlaMIGLMQswCQYDVQQGEwJHRTEQMA4GA1UECAwH
+R2VvcmdpYTEQMA4GA1UEBwwHVGJpbGlzaTFBMD8GA1UECgw4R2VvcmdpYW4gUmVz
+ZWFyY2ggQW5kIEVkdWNhdGlvbmFsIE5ldHdvcmtpbmcgQXNzb2NpYXRpb24xFTAT
+BgNVBAMMDGlkcC5ncmVuYS5nZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKmRiKfjvn2QbIqLA+yaZf1OpKhMAhFSWcWPZD7kyc87BJXOD3YOgeds+RP8
+mLLjQZPWcSeZFJWHCVHv7KlktKtm2oZ3W44cnAIFhhrC0t2mT1pnYjYGuw7TiLsr
+qtjcsaxnzxOlp0rQH478sdGJwOhn6ue37sQ9rg9WL8LQ0NZtnuSshCHc7l+wla1k
+EwhGkWEmiNtmgFR+1PeXAmwsBI0TDP7dA4yAUycD9npAWniEzNhIDA/2+q7E6FlV
+hVW2aGF0LyJW83TgsXQdmzo/Ty2vun6SszW4jhkJ6o5zBNejIDvBuxI/z0Qsnxv+
+sSBjTxSR47hpdGOcp53B3jzLzScCAwEAAaNQME4wHQYDVR0OBBYEFCOwPyzLpYFQ
+a2pFDQb1caVLFakjMB8GA1UdIwQYMBaAFCOwPyzLpYFQa2pFDQb1caVLFakjMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKEbjiRTIxTQsA6JuDc5GjdS
+axaYXy3vCjkqxEKT+yG4EglBVKn2sZAPK4sZAOM3rQo1h4edQ8y4EO9U/CqvqLjY
+4A4UEzqoLbREJGoQ58BNSvbl9DDktW2S0tTo+Jb7GRL0MnLxKNk3iyn474l/oC7o
+3v4V9RaaUC5Q+/cmsGbJVsTuvI/kKta4smE59jsZTsmw4opW8Hi0rzENAw4Yw4we
+qM2ADO+fHzadaRenQyRaUz5HtKKJjDpbXSAvPpQVdcX18Ci8lrkTEcxHcEguviQb
+0GPUicJISIenHlfwmQyRZpxfi4EtvvSl8Eyr2EiOHgUjI/4MspHWuVEkQDaQGoE=
+</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>
+MIID6zCCAtOgAwIBAgIJAMK8nCcQGikvMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
+VQQGEwJHRTEQMA4GA1UECAwHR2VvcmdpYTEQMA4GA1UEBwwHVGJpbGlzaTFBMD8G
+A1UECgw4R2VvcmdpYW4gUmVzZWFyY2ggQW5kIEVkdWNhdGlvbmFsIE5ldHdvcmtp
+bmcgQXNzb2NpYXRpb24xFTATBgNVBAMMDGlkcC5ncmVuYS5nZTAeFw0xNTA3MTcx
+MTIwMTlaFw0yNTA3MTYxMTIwMTlaMIGLMQswCQYDVQQGEwJHRTEQMA4GA1UECAwH
+R2VvcmdpYTEQMA4GA1UEBwwHVGJpbGlzaTFBMD8GA1UECgw4R2VvcmdpYW4gUmVz
+ZWFyY2ggQW5kIEVkdWNhdGlvbmFsIE5ldHdvcmtpbmcgQXNzb2NpYXRpb24xFTAT
+BgNVBAMMDGlkcC5ncmVuYS5nZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKmRiKfjvn2QbIqLA+yaZf1OpKhMAhFSWcWPZD7kyc87BJXOD3YOgeds+RP8
+mLLjQZPWcSeZFJWHCVHv7KlktKtm2oZ3W44cnAIFhhrC0t2mT1pnYjYGuw7TiLsr
+qtjcsaxnzxOlp0rQH478sdGJwOhn6ue37sQ9rg9WL8LQ0NZtnuSshCHc7l+wla1k
+EwhGkWEmiNtmgFR+1PeXAmwsBI0TDP7dA4yAUycD9npAWniEzNhIDA/2+q7E6FlV
+hVW2aGF0LyJW83TgsXQdmzo/Ty2vun6SszW4jhkJ6o5zBNejIDvBuxI/z0Qsnxv+
+sSBjTxSR47hpdGOcp53B3jzLzScCAwEAAaNQME4wHQYDVR0OBBYEFCOwPyzLpYFQ
+a2pFDQb1caVLFakjMB8GA1UdIwQYMBaAFCOwPyzLpYFQa2pFDQb1caVLFakjMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKEbjiRTIxTQsA6JuDc5GjdS
+axaYXy3vCjkqxEKT+yG4EglBVKn2sZAPK4sZAOM3rQo1h4edQ8y4EO9U/CqvqLjY
+4A4UEzqoLbREJGoQ58BNSvbl9DDktW2S0tTo+Jb7GRL0MnLxKNk3iyn474l/oC7o
+3v4V9RaaUC5Q+/cmsGbJVsTuvI/kKta4smE59jsZTsmw4opW8Hi0rzENAw4Yw4we
+qM2ADO+fHzadaRenQyRaUz5HtKKJjDpbXSAvPpQVdcX18Ci8lrkTEcxHcEguviQb
+0GPUicJISIenHlfwmQyRZpxfi4EtvvSl8Eyr2EiOHgUjI/4MspHWuVEkQDaQGoE=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.grena.ge/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.grena.ge/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Georgian Research And Educational Networking Association</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Georgian Research And Educational Networking Association</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://grena.ge/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Temur</md:GivenName>
+ <md:SurName>Maisuradze</md:SurName>
+ <md:EmailAddress>mailto:sysadmin@grena.ge</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
index 7d959347..81717e21 100644
--- a/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
@@ -88,7 +88,6 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
<md:OrganizationURL xml:lang="en">http://www.hkr.se</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:Company>Högskolan Kristianstad</md:Company>
- <md:EmailAddress>roland.svedman@hkr.se</md:EmailAddress>
+ <md:EmailAddress>operations@swamid.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml
new file mode 100644
index 00000000..88618c0c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-karlsruhe.de/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-05-31T12:34:09Z">
+ <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://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-karlsruhe.de</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Hochschule Karlsruhe - Technik und Wirtschaft</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Applied Sciences Karlsruhe</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity Provider der Hochschule Karlsruhe</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider of University of Applied Sciences Karlsruhe</mdui:Description>
+ <mdui:Logo height="16" width="16">https://www.hs-karlsruhe.de/fileadmin/hska/IZ/images/idp-hska_logo_favicon.jpg</mdui:Logo>
+ <mdui:Logo height="80" width="232">https://www.hs-karlsruhe.de/fileadmin/hska/IZ/images/idp-hska_logo_RGB_small.jpg</mdui:Logo>
+ <mdui:InformationURL xml:lang="de">http://www.hs-karlsruhe.de/iz</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.hs-karlsruhe.de/iz</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="de">http://www.hs-karlsruhe.de/impressum.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.hs-karlsruhe.de/en/footer-navigation/legal-notice.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.hs-karlsruhe.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.hs-karlsruhe.de,OU=IZ,O=Hochschule Karlsruhe - Technik und Wirtschaft,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGOTCCBSGgAwIBAgIHFOluF5TrEzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
+bHNydWhlMTYwNAYDVQQKEy1Ib2Noc2NodWxlIEthcmxzcnVoZSAtIFRlY2huaWsg
+dW5kIFdpcnRzY2hhZnQxEDAOBgNVBAMTB0hTS0EtQ0ExJDAiBgkqhkiG9w0BCQEW
+FWl6LWNhQGhzLWthcmxzcnVoZS5kZTAeFw0xMjEyMTMxNTEzMTJaFw0xNzEyMTIx
+NTEzMTJaMIGhMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1i
+ZXJnMRIwEAYDVQQHEwlLYXJsc3J1aGUxNjA0BgNVBAoTLUhvY2hzY2h1bGUgS2Fy
+bHNydWhlIC0gVGVjaG5payB1bmQgV2lydHNjaGFmdDELMAkGA1UECxMCSVoxHDAa
+BgNVBAMTE2lkcC5ocy1rYXJsc3J1aGUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCdIPrTI3taaSKjrubvIMjY5LXUIFsEih6etSWtB3N7eBx/4QIZ
+2WDGvS8Wh2m+rQDFgt83CV2M4Dc1X8tSm4LW2Jaj08IIc2VhC/uq+lRT825mMyLL
+dxwLnFF1bq3z781MF5SnSJLjfpd0YNoS8ubLSKWhMe0f4HGUZZ0g6IXGFQ9fDSGg
+em3UsdWQSLZBDUP0u6axsFg4PHUlABvtDFaHEGWct1gOLFvj78fEcP0xpYcIG/Yb
+o+7OIXbo6ujQ3rRXIyRQkTCJqfCGV+iuRZ98cY0M43kdnO8p3QYdjfARzy50Jloz
+2UvNurUpzoqqo68Mkzgvmyrz07gnslWYDx13AgMBAAGjggJlMIICYTA5BgNVHSAE
+MjAwMBEGDysGAQQBga0hgiwBAQQDADARBg8rBgEEAYGtIYIsAgEEAwAwCAYGZ4EM
+AQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
+BggrBgEFBQcDATAdBgNVHQ4EFgQU/ow8CX1n7XYtZINE1Du423aCERwwHwYDVR0j
+BBgwFoAUTi3+fERcod/hjdI3AJJAkCzbIHswQwYDVR0RBDwwOoITaWRwLmhzLWth
+cmxzcnVoZS5kZYEjSVotQmVudXR6ZXJiZXJhdHVuZ0Bocy1rYXJsc3J1aGUuZGUw
+gYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1r
+YXJsc3J1aGUtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAy
+LnBjYS5kZm4uZGUvaHMta2FybHNydWhlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHZ
+BggrBgEFBQcBAQSBzDCByTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRm
+bi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2hzLWthcmxzcnVoZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMta2FybHNydWhl
+LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFreG
+e5Efkl3SOi4hlKAlal7VsAZqwtQCzxICa3HftmhKlUJSKYhG9zMngYJdL+Kwa1aa
+VvwkGCGH7EtqCVQwTfb6Dgm5Skozxn3BZHywJUANvJuSXBGhc3V3UwSMQXwEunEn
+EiGb0NNleAC6oDdg8BPqzUzz3LudKpcEPt+V8wGmeSW14qf6+VWjVTdpxydAXu7N
+fDwQtyU0j2ANmOeoI5qsSO+dr5Kpl8OVqM2kRKF6YCPAHsT0B4944/uhtLPj8+jC
+HauQDCp2XZgqAAGn3j+JVQ8JrIga6WTi0LahPGjMjCFhtjJ65cIQZ6eHv0lXb7ly
+fSqu+5mEPB9XF5S/2w==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/SOAP/ECP"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-karlsruhe.de</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.hs-karlsruhe.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.hs-karlsruhe.de,OU=IZ,O=Hochschule Karlsruhe - Technik und Wirtschaft,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGOTCCBSGgAwIBAgIHFOluF5TrEzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
+bHNydWhlMTYwNAYDVQQKEy1Ib2Noc2NodWxlIEthcmxzcnVoZSAtIFRlY2huaWsg
+dW5kIFdpcnRzY2hhZnQxEDAOBgNVBAMTB0hTS0EtQ0ExJDAiBgkqhkiG9w0BCQEW
+FWl6LWNhQGhzLWthcmxzcnVoZS5kZTAeFw0xMjEyMTMxNTEzMTJaFw0xNzEyMTIx
+NTEzMTJaMIGhMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1i
+ZXJnMRIwEAYDVQQHEwlLYXJsc3J1aGUxNjA0BgNVBAoTLUhvY2hzY2h1bGUgS2Fy
+bHNydWhlIC0gVGVjaG5payB1bmQgV2lydHNjaGFmdDELMAkGA1UECxMCSVoxHDAa
+BgNVBAMTE2lkcC5ocy1rYXJsc3J1aGUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCdIPrTI3taaSKjrubvIMjY5LXUIFsEih6etSWtB3N7eBx/4QIZ
+2WDGvS8Wh2m+rQDFgt83CV2M4Dc1X8tSm4LW2Jaj08IIc2VhC/uq+lRT825mMyLL
+dxwLnFF1bq3z781MF5SnSJLjfpd0YNoS8ubLSKWhMe0f4HGUZZ0g6IXGFQ9fDSGg
+em3UsdWQSLZBDUP0u6axsFg4PHUlABvtDFaHEGWct1gOLFvj78fEcP0xpYcIG/Yb
+o+7OIXbo6ujQ3rRXIyRQkTCJqfCGV+iuRZ98cY0M43kdnO8p3QYdjfARzy50Jloz
+2UvNurUpzoqqo68Mkzgvmyrz07gnslWYDx13AgMBAAGjggJlMIICYTA5BgNVHSAE
+MjAwMBEGDysGAQQBga0hgiwBAQQDADARBg8rBgEEAYGtIYIsAgEEAwAwCAYGZ4EM
+AQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
+BggrBgEFBQcDATAdBgNVHQ4EFgQU/ow8CX1n7XYtZINE1Du423aCERwwHwYDVR0j
+BBgwFoAUTi3+fERcod/hjdI3AJJAkCzbIHswQwYDVR0RBDwwOoITaWRwLmhzLWth
+cmxzcnVoZS5kZYEjSVotQmVudXR6ZXJiZXJhdHVuZ0Bocy1rYXJsc3J1aGUuZGUw
+gYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1r
+YXJsc3J1aGUtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAy
+LnBjYS5kZm4uZGUvaHMta2FybHNydWhlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHZ
+BggrBgEFBQcBAQSBzDCByTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRm
+bi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2hzLWthcmxzcnVoZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMta2FybHNydWhl
+LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFreG
+e5Efkl3SOi4hlKAlal7VsAZqwtQCzxICa3HftmhKlUJSKYhG9zMngYJdL+Kwa1aa
+VvwkGCGH7EtqCVQwTfb6Dgm5Skozxn3BZHywJUANvJuSXBGhc3V3UwSMQXwEunEn
+EiGb0NNleAC6oDdg8BPqzUzz3LudKpcEPt+V8wGmeSW14qf6+VWjVTdpxydAXu7N
+fDwQtyU0j2ANmOeoI5qsSO+dr5Kpl8OVqM2kRKF6YCPAHsT0B4944/uhtLPj8+jC
+HauQDCp2XZgqAAGn3j+JVQ8JrIga6WTi0LahPGjMjCFhtjJ65cIQZ6eHv0lXb7ly
+fSqu+5mEPB9XF5S/2w==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e339</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e339</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Hochschule Karlsruhe - Technik und Wirtschaft</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Karlsruhe</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.hs-karlsruhe.de</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.hs-karlsruhe.de/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>User</md:GivenName>
+ <md:SurName>Helpdesk</md:SurName>
+ <md:EmailAddress>mailto:iz-benutzerberatung@hs-karlsruhe.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>User</md:GivenName>
+ <md:SurName>Helpdesk</md:SurName>
+ <md:EmailAddress>mailto:iz-benutzerberatung@hs-karlsruhe.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Günther</md:GivenName>
+ <md:SurName>Schreiner</md:SurName>
+ <md:EmailAddress>mailto:guenther.schreiner@hs-karlsruhe.de</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
index 4f989ed4..4d232902 100644
--- a/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
@@ -96,18 +96,18 @@ MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
<md:ContactPerson contactType="administrative">
<md:Company>Swedish Red Cross University College</md:Company>
<md:SurName>IT-support</md:SurName>
- <md:EmailAddress>itsupport@rkh.se</md:EmailAddress>
+ <md:EmailAddress>servicedesk@rkh.se</md:EmailAddress>
<md:TelephoneNumber>+46858751607/+46858751603</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Swedish Red Cross University College</md:Company>
<md:SurName>IT-support</md:SurName>
- <md:EmailAddress>itsupport@rkh.se</md:EmailAddress>
+ <md:EmailAddress>servicedesk@rkh.se</md:EmailAddress>
<md:TelephoneNumber>+46858751607</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Swedish Red Cross University College</md:Company>
<md:SurName>IT-Support Röda Korsets Högskola</md:SurName>
- <md:EmailAddress>itsupport@rkh.se</md:EmailAddress>
+ <md:EmailAddress>servicedesk@rkh.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml
new file mode 100644
index 00000000..d7b5267c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unb.ca/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-01-23T20:50:00Z"/>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.ca</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of New Brunswick</mdui:DisplayName>
+ <mdui:Description xml:lang="en">University of New Brunswick</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.unb.ca</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIURLDfhqryV9GxVrS3QEZfziUWRGAwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLnVuYi5jYTAeFw0xMTA4MjUxNjM1MjdaFw0zMTA4
+MjUxNjM1MjdaMBUxEzARBgNVBAMTCmlkcC51bmIuY2EwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCXvPrW/Udu8RmKI/7vI3LsayG3yJhEMgcZ9KswHZ3x
+dE7avwIwE20brD2fEMmt46SKCRUF9shpZslaahGTq0jor5dvLUY2lG3B7R5fsTAe
+s69wNRrsx1QSw7ACTbv9rfURSzIn0iUeDCOVIcCp9Ol5Cr3uN5POmaQ2F+xVfVOT
+TbZ8dQcrFHq19Fs3la3izkYCq1490VwQqA6QEsCpDXMRUEfe4MZNl+OLms1MMJr+
+gTvL6SPYJb03sygLnVQJ+1xVuEAS2zfe0/mvo1ef1Vnn+52nxup96CJXdYKX5QjT
+6XQKKQNXq1VomchuJs/HgUB3+StIoahHVWZhh6Zh1/NDAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC51bmIuY2GGIWh0dHBzOi8vaWRwLnVuYi5jYS9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUfdegQvD/Wf4gdypoSF5P5uf7wgMwDQYJKoZIhvcNAQEF
+BQADggEBAAf9zd3zkHwTKRx4diCWjHjDqZ4cmekaxJbUItp3E/ZfYbvcT0oKITo/
+CKYAvXcvDL9XiWiwGz9MVAkRCr0OLb2WALMaCOiyZ3FkirikLpQX8h9CmDDkuNve
+Lf3ZA4GUkzJmNHpkFLemP36ydh5pGX15KGZTcGFG+Nhz+MkIzsX/Pz19vZrwBWTM
++05mnaEgn6qX0gkJw56+5xFNz9plDLGkVpSCv//0zHuLfzS6RfVwFptXIQx31G1E
+ogRrXrUfW1k3AD9hY0/YNIIZ8JO3rSRyGr1MEnIIeQ0abZEmF5Nrhje/G1n/scq9
+NGM3l0dquBRhq0MP6DY4/L0lLn87h2M=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unb.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unb.ca/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unb.ca/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unb.ca/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unb.ca/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unb.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unb.ca/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.ca</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIURLDfhqryV9GxVrS3QEZfziUWRGAwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLnVuYi5jYTAeFw0xMTA4MjUxNjM1MjdaFw0zMTA4
+MjUxNjM1MjdaMBUxEzARBgNVBAMTCmlkcC51bmIuY2EwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCXvPrW/Udu8RmKI/7vI3LsayG3yJhEMgcZ9KswHZ3x
+dE7avwIwE20brD2fEMmt46SKCRUF9shpZslaahGTq0jor5dvLUY2lG3B7R5fsTAe
+s69wNRrsx1QSw7ACTbv9rfURSzIn0iUeDCOVIcCp9Ol5Cr3uN5POmaQ2F+xVfVOT
+TbZ8dQcrFHq19Fs3la3izkYCq1490VwQqA6QEsCpDXMRUEfe4MZNl+OLms1MMJr+
+gTvL6SPYJb03sygLnVQJ+1xVuEAS2zfe0/mvo1ef1Vnn+52nxup96CJXdYKX5QjT
+6XQKKQNXq1VomchuJs/HgUB3+StIoahHVWZhh6Zh1/NDAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC51bmIuY2GGIWh0dHBzOi8vaWRwLnVuYi5jYS9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUfdegQvD/Wf4gdypoSF5P5uf7wgMwDQYJKoZIhvcNAQEF
+BQADggEBAAf9zd3zkHwTKRx4diCWjHjDqZ4cmekaxJbUItp3E/ZfYbvcT0oKITo/
+CKYAvXcvDL9XiWiwGz9MVAkRCr0OLb2WALMaCOiyZ3FkirikLpQX8h9CmDDkuNve
+Lf3ZA4GUkzJmNHpkFLemP36ydh5pGX15KGZTcGFG+Nhz+MkIzsX/Pz19vZrwBWTM
++05mnaEgn6qX0gkJw56+5xFNz9plDLGkVpSCv//0zHuLfzS6RfVwFptXIQx31G1E
+ogRrXrUfW1k3AD9hY0/YNIIZ8JO3rSRyGr1MEnIIeQ0abZEmF5Nrhje/G1n/scq9
+NGM3l0dquBRhq0MP6DY4/L0lLn87h2M=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unb.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University of New Brunswick</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University of New Brunswick</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.unb.ca</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>UNB Information Technology Services Help Desk</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@unb.ca</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
index d039a3a7..57849ac0 100644
--- a/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unige.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-04-17T17:13:51Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-16T16:59:51Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -82,8 +82,7 @@ mvLUHB+HLHvU53517kDxazwQx2g=
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unige.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
<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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
@@ -157,7 +156,6 @@ M4BZ2IY2Ts91B58Noy+uhlISbxOaSeV1iuJu
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unige.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
<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>
diff --git a/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml
index 372fdf09..c05b6c56 100644
--- a/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml
@@ -19,6 +19,32 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDNzCCAh+gAwIBAgIUZBH1ZmHI1RRRvGe5/kKYyMcO2w8wDQYJKoZIhvcNAQEF
+BQAwHjEcMBoGA1UEAwwTaWRwLnVuaXYtYXZpZ25vbi5mcjAeFw0xNTA5MTUxMDA3
+MTNaFw0zNTA5MTUxMDA3MTNaMB4xHDAaBgNVBAMME2lkcC51bml2LWF2aWdub24u
+ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqOR3uzcmrMGtGCXQc
+6k0A1GkLsIz6VNYYuMbNEcY9SAu5zLlkCK6PEce8tkBEGQimsUmyxyznb3N36O+a
+lr4YydGD3RcyeHzV20YVwTk+U8UnjkTNfMIH+Ng5v7J/0i+4ZhIltBf1+uKpPrDr
+7FPztpKm14rhx4tsvVxZKhxTm3MznZhQJ1RjqF8rMr/TXqMupTO+BE0V+M/CAzmH
+V5M4USd2iQ23LJe2ONeLe8lfRt2J49YZwfpbCUPgefG3LzAowEDmZIUBdkmAEh58
+4dyOgGlJzUMTpQW6AGbWsg7aoDh54uh+VSot/xy6viSYQ1aKQj5a6rtCLpqT2pTu
+v675AgMBAAGjbTBrMB0GA1UdDgQWBBRX2tuI/GxYv4xoLqgvCNWxqhmGgzBKBgNV
+HREEQzBBghNpZHAudW5pdi1hdmlnbm9uLmZyhipodHRwczovL2lkcC51bml2LWF2
+aWdub24uZnIvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAIX3Y3qc
+b/mDu6p+L9xPHPJcnwurKjocRInR8yl5LmqLFj9LDd+W5vZakUQc0F22CcA0xQZ7
+CGgTxO1jQHcGN0rpxlEeXiJWL5dw0aW8IGNc3BUsL8peRyDc8dywkD1/nYjHJJEW
+I411E5B9MpME7bkMHsLP+pNFa9LFCS1qodUuhn0Uh/k/khBNXQ9StiVGmXcq/SGK
+9I1S4BMsHYQzZZvxJ0dV0YHxyvpW8Z2BcegIqT0NrjT4Hvx+Qt9pypfBZB+cl+7c
+e0lkWPNsuL4wxXCVh11OFAUF0fB7pVza2jKTj6t6ydW51tDmiaYSI8nqXyF3X7wy
+27nzwk0AdRYbU40=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDODCCAiCgAwIBAgIVAKFKpfPrDnkBOhfhK+OqWshuX1PZMA0GCSqGSIb3DQEB
BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWF2aWdub24uZnIwHhcNMTIwNzE4MTMx
NTQxWhcNMTUwNzE4MTMxNTQxWjAeMRwwGgYDVQQDExNpZHAudW5pdi1hdmlnbm9u
diff --git a/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml
index a359e06b..05de4f5b 100644
--- a/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml
@@ -19,32 +19,51 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIE2TCCA8GgAwIBAgIQQx9CsvgcOG0a1Tvla0G65TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDkxMjAwMDAwMFoXDTE1MDkxMjIzNTk1OVowdzELMAkGA1UE
-BhMCRlIxIzAhBgNVBAoMGlVuaXZlcnNpdMOpIEx1bWllcmUtTHlvbiAyMScwJQYD
-VQQLDB5EU0kgVW5pdmVyc2l0w6kgTHVtaWVyZSBMeW9uIDIxGjAYBgNVBAMTEWlk
-cC51bml2LWx5b24yLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-4NRYOErWGGkM3nVhXJZdaILItB3ZS9fwHLPQvsbLy3sbm1IZq0vDaOjXXK+8RFFn
-q6ogmuwI+LvHO7ru+wcEuplCoVsNNVjWaD8109O9Vu160xxsyNgw1w7ly+0ToByI
-WzDpksBVoIkNK4XO4/b5gauiPTVm+T8UBvVQ4K2iT/G1AzcBgKKBeU0icy83mC5q
-7qP+X4CDptjCcDwbr4woZ/ckY+7G1tB1EnPE24Y7kPPFwgUU6kAIXvlmnsvmY22b
-SKNYL6LCYX3ugkc4uH5jAy4usmACtATKeC/ecgHhKfG1a+ID9TD5vDKxl6ICLi2h
-sMJFR/cNnKcc2kJYHYZNUQIDAQABo4IBoDCCAZwwHwYDVR0jBBgwFoAUDL2TaAzz
-3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNGHb+t8B/nZLRDgGVzpSZFoqXTBMA4G
-A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMFgGA1UdEQRRME+CEWlkcC51bml2LWx5b24yLmZyghJp
-ZHAxLnVuaXYtbHlvbjIuZnKCEmlkcDIudW5pdi1seW9uMi5mcoISaWRwMy51bml2
-LWx5b24yLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAJFkuPz9WIxbSCgK07Zdu5RBsV
-jVCvn6uu1NXznSfROTMQOMuGaOhS+OOLf6mdU/zN9NzFuX0Y9cCX+NqBPzqLjpS1
-Odv2QX1N3EcXJoXOQgmHLDV1wD/8EUR3enc679sOyaSy22i70JLRbgpgHlnGJLIW
-fuYW5lB1Y+iuhUtS4I/ScySNds0DwfC/kHymI8IYpcNFfvEGgYF976e/c6DgNwyQ
-hP96svqli3SO5rx+kUDaJROEZS4d9TA671A/40DKbJN0EuuDmr9Y4zzUVBUeyADY
-MVymo1FuDKpu6laIg6mbezvSwGbqQyQMMg5RA7zWiUJUaBXnBbgUR4Y0+xA8
+ MIIDfzCCAmegAwIBAgIUEMeIVUaZhvRDqDGddKXxpUkeNa0wDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVaWRwLWx5Mi51bml2LWx5b24yLmZyMB4XDTE1MDkxNjEz
+MjE0N1oXDTM1MDkxNjEzMjE0N1owIDEeMBwGA1UEAxMVaWRwLWx5Mi51bml2LWx5
+b24yLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArsK+D1//XUqq
+snuVjgQS4YH675eaMxeZrJIMm401xs/R5eKKVR7o6i9hNHAKPcYOoYN4oBJlT5ey
+LeNqPY2eY/VgwrM+kHsoRUGHrs6nVZCfQmJwjuxIa9x+Pkz/hP8uirZIHErRVTVc
+wmFh0txqOuaUPeP8deo3QU5Ef3DaNPDVKAtxpNJ8KnBDo+3FfKZtgy34acTK0gV4
+gjkPVyLKSFDTS/qX3tqw85Gq8P5E5RtkZxgNH6gzomULzQNgq5X069Z9ylHT9NcD
+Bx/bdfKReRYUPCVcmeMLYaH9v4oThGp/4xx+SjVC9orWIt7gCp78WeYWFEtFHvgJ
+i4XrqkM2RwIDAQABo4GwMIGtMIGLBgNVHREEgYMwgYCCFWlkcC1seTIudW5pdi1s
+eW9uMi5mcoIRaWRwLnVuaXYtbHlvbjIuZnKCEmlkcDEudW5pdi1seW9uMi5mcoIS
+aWRwMi51bml2LWx5b24yLmZyhixodHRwczovL2lkcC1seTIudW5pdi1seW9uMi5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUR8350noOu1DupabV/mWW6otQBmsw
+DQYJKoZIhvcNAQEFBQADggEBAEZlQ6vhYC0mrYGtWdF6nsjkW7lNQIqLOP37VPrl
+UJKbkNjJpaq7KmUGFrO7Bsvz5Gahdqx63YfxJYX8xy3717cOyVyv+8pulFARdG47
+sIKBKF9mVywrqhWgCZBuD2rdXfrkHdAdF1INv5pB6HWWnsbYkjEezyNUyY2+k5lg
++aMB5M9u1F9R2l3pAh24DejNBxYg68daERxiAb1ij5pT2KGE66RTiY4AcQRhuLkf
+Xs49dq8zUWOi07M/Fc+NvtTGH4kkGfjmP0s4MXMRqQq5I045YsD6u2pHYDXPq8gC
+gV4nyX84VcokhCvuxaG6tdMYaciJdHsnrbBoprT3cHjJNgk=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMzCCAhugAwIBAgIUBpfnmhLCkTwSlxzmAuiYTFCGCo4wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwMS51bml2LWx5b24yLmZyMB4XDTEyMDkxODA3NDIy
+OVoXDTMyMDkxODA3NDIyOVowHTEbMBkGA1UEAxMSaWRwMS51bml2LWx5b24yLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmgbC3Sv9JHXp6oEVeFF6
+gkUgJlmY9wiqJFOHhupE4KkON5wRCfdclIY6nkX32DedUNYYI2KrHzIwPqo0c8cr
+Tc+kjdBATVMH+vddBcqqM3HZt3/DqxDcvMfGng0P8MS5+GQbiE5ckFf7bdYpa+Go
+1tyu3jLM9b0iz6b28Ud0Tv/sqk7EiHmJBCwRdlFR7ZXeIHdRk1HsUeJ9yU92g2x0
+DybXec4Qp4/7R4Viprckjt5Dfu2Ty3J4JWhYx0h1lfRC0m91kujzVYSCxPqMQeuN
+Vz4CnBa9lks9NCLmi2KE8I7USRD0OjWn27ODE1u068rMVWOzdWsB8cUnVOC31TX/
+1QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAxLnVuaXYtbHlvbjIuZnKGKWh0dHBz
+Oi8vaWRwMS51bml2LWx5b24yLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQZ
+zmfPgsRblkHBPIH6NAT0Kspo6jANBgkqhkiG9w0BAQUFAAOCAQEAkxejAtB1LWTx
+TRMAgO2esGj3rIjYvpr0fGCC2PY5HOx7Gj0OEqaBn5OFx1VnyQ3YuJdPfI3dYoe/
+FeZtaE6yw8RR3OwdWYYayQ31sOxXydRV4UEImZARqunPEMYlsp+fqwPK7+AVFc4i
+KvPjw588YvBYRTHafz6zXLZ3nEPHr8dCqAyZfhGavm82RTZg7am4D1So8t9M+tDk
+ULjeWoNajiut41GjeVsS637G/DwDBxES4VRpbzQORblOKFqd0JM12osIi569QRkq
+v/ETWbTTTBP29pqVXRoqx9uG1JUODCguG3ugS8oqoXtSpPArLwKfW658Iw0dfAc4
+j/QOF0eZVg==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml b/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml
new file mode 100644
index 00000000..9edc788b
--- /dev/null
+++ b/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://login.nrg.eu/adfs/services/trust">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-09-16T08:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="nl">Nuclear Research and Consultancy Group</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Nuclear Research and Consultancy Group</mdui:DisplayName>
+ <mdui:Description xml:lang="nl">Nuclear Research and Consultancy Group</mdui:Description>
+ <mdui:Description xml:lang="en">Nuclear Research and Consultancy Group</mdui:Description>
+ <mdui:Logo height="87" width="108">https://static.surfconext.nl/media/idp/nrg.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Nuclear Research and Consultancy Group NRG</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">Nuclear Research and Consultancy Group NRG</mdui:Keywords>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/341307fa6d9114669c896af91f70bb61"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Nuclear Research and Consultancy Group</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Nuclear Research and Consultancy Group</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.surffederatie.nl</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml b/swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml
new file mode 100644
index 00000000..d7875d29
--- /dev/null
+++ b/swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.umcs.pl:9443/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-09-11T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umcs.pl</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Maria Curie-Sklodowska University</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Maria Curie-Sklodowska University</mdui:Description>
+ <mdui:Description xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej w Lublinie</mdui:Description>
+ <mdui:Logo height="92" width="300" xml:lang="en">https://login.umcs.pl/static/images/logo.png</mdui:Logo>
+ <mdui:Logo height="92" width="300" xml:lang="pl">https://login.umcs.pl/static/images/logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>umcs.pl</mdui:DomainHint>
+ <mdui:IPHint>87.246.208.0/24</mdui:IPHint>
+ <mdui:GeolocationHint>geo:51.245915,22.541437</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJTCCAg2gAwIBAgIVAMVDBap8O1TOuLbc37xKkG0zsNfgMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
+MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmX0MTZmiGeXmt29aPBtAdHswTqup43Le
+4rb2rVzXYHoEUreRIqXFsVGSiYOYP/5CZbQlurLnGrjBNcaZeohNRff0Iv1piE6M
+5F7S9/ENTPthwq6r8O59Frf9d4mH+z8PsE81LAV1nbM4zKBVIoH9Jm22aNgNdjld
+WylRl3KJIft167CscuaBPdRG7nh/ABYXqU27FnBlDU1JISyzq6gxELsi0YX+Kvib
+p6bACc5mLkOi1jxVpHuGsW6xxd3T/HtbcIndakILykOly2lSGTCsS7uHqJZQBX7C
+pTYhpnHQCNvVP8lCgUM90z/NOux1/ZBzZSd4xrPZq6zSK+Leqh3HfwIDAQABo2Yw
+ZDAdBgNVHQ4EFgQUKRM8qhPrchrWnU7pyPN+QRvQ978wQwYDVR0RBDwwOoINbG9n
+aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
+b2xldGgwDQYJKoZIhvcNAQELBQADggEBAH5mHd6wnywlretwZDell/qezGjTWfox
+Ktnzw2w+40blKVIWb0oarrDmae1piaK5nVsjdoFusAEMylwME1kvCBZIiVLegKmh
+Asrk+4Fequ+LiF+JOHWbYUs+Lyq2vkKkceqHPl08uuzhRYreVfoC6FbvdiRhQGmC
+ZKCWYB8ZTWT85JkDw94OoGqCesAzoCVf525n0b4E/+ohHEYIEZdApcyRs9VmdccU
+H+ZUJFqCXtvqZss+o6bMuBSLMV8xOIbgFex8Pgl8NA01FizfKF8jR1iTQ9IKXecJ
+DZ4SNNLpb4ZEM+5HySt2wDlDsfdJcZdYYNV/Wi3xcv74WJzxCdHYoSo=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJTCCAg2gAwIBAgIVAOKw8Okl/Qs8gxrRP+Kih0g5ZVyDMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ3WhcN
+MzUwNTEzMTMxNDQ3WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi+4EcjSB5ZG8o/2Jwen5/Kd/NeI2dyss
+rRpw403vjokLQQFI63WqQgGMr3NLeRnOsJloCIF+MsjZQKtZUizLUE1+kOeSB8W7
+QTDcbT6wIl3BpudTLW07ryu6/n7np7Pax9QYjUvSdcZSQ9OUNeYEBFbW3BKYj/E2
+HXj58AFBfMGzQ2SRWEilfvg9gO4LThm4zGhZcSb8YOiGOc1QXrnHfwYStzI/Sp33
+tvbHaioRPXYnwJMad1gKDjeLNiYsQol+MN3pzhLVPrj9BONAuqJTV1W43UXi0r0M
+vKvnyujFf9WS9fdiTtEtFAYVV1urS2S3pEr7neYgsCD8Bty1cVuMqwIDAQABo2Yw
+ZDAdBgNVHQ4EFgQU3zsy3P/ZT7W0unk4RR3k+ZWw6CcwQwYDVR0RBDwwOoINbG9n
+aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
+b2xldGgwDQYJKoZIhvcNAQELBQADggEBAFOQVZU4doxAUjVjcxgDH6jqCPEz8Rpt
+nVd7GtN8J18yhctzQj3vf+Zit5JSD3DhMD+MHCzLzwPJskSFe/cHaDhNEhxgd3hk
+I0gxi3F9Ahn/H3NY4wm/J1WaM66F2LEv6M8+bbX70fMknUJInvWsejRNaULANIjm
+GdFdFcni64S3pY2CAWr9EVLajavDG70BEqnTk7JpdLeUb27cSDL4gLi04KiGEgr9
+DhuU+dHaoQHmSwsV7P/e21bXtaF9e2KSq3QH1Ar4sIIwanbzixYp6nqIhpEUgMqt
+FJK+09j1gXF3zoBqQBKiu6LPskGSdysF1HLImTOZKnqJWdagZBAzhPc=
+ </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>
+MIIDJTCCAg2gAwIBAgIVAMov+qL27DY7b0GGhKB6cR5yAjjmMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
+MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkQQ1fjvDeSEW33cYblgSUacmQQe4zjdG
+YjX9a2Sw44GpzMjSXQIwtQvtGQ1aiuD7GqDdp+NltlOFDQKAoqwRckMzSiGtP8S7
+Mrd/FGLfc5Nx8O8p3EL/m9WHvxSeFV7l5djTGALlWk8ppfT3SD5uUyaG8YCi3e2g
+rVV81LTduOzei4l/lBtyFXh4uMaOGEvDHTUCtq4b10w8HCX/hCzdj1lwaXlqdUnO
+mLbpTB2aVDaJTna/AZHextQ2F4MyigrZugYl0W5wtJA/zZJULPQCu1mgwG2mqhYW
+HLwbQqM0J3OQSOp1bGwT0r8Uf9D0Nc2JfQXt/zgIkCS/4rldhIFNYQIDAQABo2Yw
+ZDAdBgNVHQ4EFgQU5S97xnyCThAtWlWbb0AumEwsoxQwQwYDVR0RBDwwOoINbG9n
+aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
+b2xldGgwDQYJKoZIhvcNAQELBQADggEBAB82Jxbep9eZZlmgX9ZrO8zOuL01VN8y
+0qBlN/4lkAToDJYfbaYr76HZLuBSDvWirkOh8R6HykK30k7WqF1HS9c+tnPSUTZb
+1UppQcYjkbnde6NGX9iN+wJo4V96QxEz8XJKHvmXVdE1CQ7pi+b912DpjxZrjdRg
+9zgUCm3bbFgYkmB1pFO0nxWT+AbKlVjerFYwJ5Wm02bE5Dwy6mksENN8/LhmvJaz
+4cAv8Lza2e17KmD/CYGncWc+L++kP40CW+kCierHubfe0BtCyq/e4NcONXGoLotB
+wM4RQ5jYrtF1hkeVKs5UhXdsWc0V+1SvBj23fjXaXHj1QadlFr9Hzcg=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umcs.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.umcs.pl:9443/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.umcs.pl:9443/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.umcs.pl:9443/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umcs.pl</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJTCCAg2gAwIBAgIVAMVDBap8O1TOuLbc37xKkG0zsNfgMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
+MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmX0MTZmiGeXmt29aPBtAdHswTqup43Le
+4rb2rVzXYHoEUreRIqXFsVGSiYOYP/5CZbQlurLnGrjBNcaZeohNRff0Iv1piE6M
+5F7S9/ENTPthwq6r8O59Frf9d4mH+z8PsE81LAV1nbM4zKBVIoH9Jm22aNgNdjld
+WylRl3KJIft167CscuaBPdRG7nh/ABYXqU27FnBlDU1JISyzq6gxELsi0YX+Kvib
+p6bACc5mLkOi1jxVpHuGsW6xxd3T/HtbcIndakILykOly2lSGTCsS7uHqJZQBX7C
+pTYhpnHQCNvVP8lCgUM90z/NOux1/ZBzZSd4xrPZq6zSK+Leqh3HfwIDAQABo2Yw
+ZDAdBgNVHQ4EFgQUKRM8qhPrchrWnU7pyPN+QRvQ978wQwYDVR0RBDwwOoINbG9n
+aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
+b2xldGgwDQYJKoZIhvcNAQELBQADggEBAH5mHd6wnywlretwZDell/qezGjTWfox
+Ktnzw2w+40blKVIWb0oarrDmae1piaK5nVsjdoFusAEMylwME1kvCBZIiVLegKmh
+Asrk+4Fequ+LiF+JOHWbYUs+Lyq2vkKkceqHPl08uuzhRYreVfoC6FbvdiRhQGmC
+ZKCWYB8ZTWT85JkDw94OoGqCesAzoCVf525n0b4E/+ohHEYIEZdApcyRs9VmdccU
+H+ZUJFqCXtvqZss+o6bMuBSLMV8xOIbgFex8Pgl8NA01FizfKF8jR1iTQ9IKXecJ
+DZ4SNNLpb4ZEM+5HySt2wDlDsfdJcZdYYNV/Wi3xcv74WJzxCdHYoSo=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJTCCAg2gAwIBAgIVAOKw8Okl/Qs8gxrRP+Kih0g5ZVyDMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ3WhcN
+MzUwNTEzMTMxNDQ3WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi+4EcjSB5ZG8o/2Jwen5/Kd/NeI2dyss
+rRpw403vjokLQQFI63WqQgGMr3NLeRnOsJloCIF+MsjZQKtZUizLUE1+kOeSB8W7
+QTDcbT6wIl3BpudTLW07ryu6/n7np7Pax9QYjUvSdcZSQ9OUNeYEBFbW3BKYj/E2
+HXj58AFBfMGzQ2SRWEilfvg9gO4LThm4zGhZcSb8YOiGOc1QXrnHfwYStzI/Sp33
+tvbHaioRPXYnwJMad1gKDjeLNiYsQol+MN3pzhLVPrj9BONAuqJTV1W43UXi0r0M
+vKvnyujFf9WS9fdiTtEtFAYVV1urS2S3pEr7neYgsCD8Bty1cVuMqwIDAQABo2Yw
+ZDAdBgNVHQ4EFgQU3zsy3P/ZT7W0unk4RR3k+ZWw6CcwQwYDVR0RBDwwOoINbG9n
+aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
+b2xldGgwDQYJKoZIhvcNAQELBQADggEBAFOQVZU4doxAUjVjcxgDH6jqCPEz8Rpt
+nVd7GtN8J18yhctzQj3vf+Zit5JSD3DhMD+MHCzLzwPJskSFe/cHaDhNEhxgd3hk
+I0gxi3F9Ahn/H3NY4wm/J1WaM66F2LEv6M8+bbX70fMknUJInvWsejRNaULANIjm
+GdFdFcni64S3pY2CAWr9EVLajavDG70BEqnTk7JpdLeUb27cSDL4gLi04KiGEgr9
+DhuU+dHaoQHmSwsV7P/e21bXtaF9e2KSq3QH1Ar4sIIwanbzixYp6nqIhpEUgMqt
+FJK+09j1gXF3zoBqQBKiu6LPskGSdysF1HLImTOZKnqJWdagZBAzhPc=
+ </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>
+MIIDJTCCAg2gAwIBAgIVAMov+qL27DY7b0GGhKB6cR5yAjjmMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
+MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkQQ1fjvDeSEW33cYblgSUacmQQe4zjdG
+YjX9a2Sw44GpzMjSXQIwtQvtGQ1aiuD7GqDdp+NltlOFDQKAoqwRckMzSiGtP8S7
+Mrd/FGLfc5Nx8O8p3EL/m9WHvxSeFV7l5djTGALlWk8ppfT3SD5uUyaG8YCi3e2g
+rVV81LTduOzei4l/lBtyFXh4uMaOGEvDHTUCtq4b10w8HCX/hCzdj1lwaXlqdUnO
+mLbpTB2aVDaJTna/AZHextQ2F4MyigrZugYl0W5wtJA/zZJULPQCu1mgwG2mqhYW
+HLwbQqM0J3OQSOp1bGwT0r8Uf9D0Nc2JfQXt/zgIkCS/4rldhIFNYQIDAQABo2Yw
+ZDAdBgNVHQ4EFgQU5S97xnyCThAtWlWbb0AumEwsoxQwQwYDVR0RBDwwOoINbG9n
+aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
+b2xldGgwDQYJKoZIhvcNAQELBQADggEBAB82Jxbep9eZZlmgX9ZrO8zOuL01VN8y
+0qBlN/4lkAToDJYfbaYr76HZLuBSDvWirkOh8R6HykK30k7WqF1HS9c+tnPSUTZb
+1UppQcYjkbnde6NGX9iN+wJo4V96QxEz8XJKHvmXVdE1CQ7pi+b912DpjxZrjdRg
+9zgUCm3bbFgYkmB1pFO0nxWT+AbKlVjerFYwJ5Wm02bE5Dwy6mksENN8/LhmvJaz
+4cAv8Lza2e17KmD/CYGncWc+L++kP40CW+kCierHubfe0BtCyq/e4NcONXGoLotB
+wM4RQ5jYrtF1hkeVKs5UhXdsWc0V+1SvBj23fjXaXHj1QadlFr9Hzcg=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umcs.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej w Lublinie</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Maria Curie-Sklodowska University</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Maria Curie-Sklodowska University</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="pl">http://www.umcs.pl/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.umcs.pl/en/</md:OrganizationURL>
+ </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml
index c1ac0003..417d769e 100644
--- a/swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml
@@ -11,10 +11,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">IFAM - IFAM - Instituto Federal do Amazonas</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">IFAM - IFAM - Instituto Federal do Amazonas</mdui:DisplayName>
- <mdui:Description xml:lang="en">IFAM - IFAM - Instituto Federal do Amazonas</mdui:Description>
- <mdui:Description xml:lang="pt-br">IFAM - IFAM - Instituto Federal do Amazonas</mdui:Description>
+ <mdui:DisplayName xml:lang="en">IFAM - Instituto Federal do Amazonas</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IFAM - Instituto Federal do Amazonas</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.ifam.edu.br/</mdui:InformationURL>
<mdui:InformationURL xml:lang="pt-br">http://www.ifam.edu.br/</mdui:InformationURL>
</mdui:UIInfo>
@@ -27,24 +27,24 @@
bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWF6b25hczENMAsGA1UECxMEREdUSTEqMCgG
CSqGSIb3DQEJARYbamFuZGVyc29uX3NpbHZhQGlmYW0uZWR1LmJyMQ8wDQYDVQQH
EwZNYW5hdXMxETAPBgNVBAgTCEFtYXpvbmFzMQswCQYDVQQGEwJCUjEfMB0GA1UE
-AxMWc2hpYmJvbGV0aC5pZmFtLmVkdS5icjAeFw0xNTA5MTAxNjExNTFaFw0xODA5
-MDkxNjExNTFaMIG8MS0wKwYDVQQKEyRJRkFNIC0gSW5zdGl0dXRvIEZlZGVyYWwg
+AxMWc2hpYmJvbGV0aC5pZmFtLmVkdS5icjAeFw0xNTA5MTExNDM4MjRaFw0xODA5
+MTAxNDM4MjRaMIG8MS0wKwYDVQQKEyRJRkFNIC0gSW5zdGl0dXRvIEZlZGVyYWwg
ZG8gQW1hem9uYXMxDTALBgNVBAsTBERHVEkxKjAoBgkqhkiG9w0BCQEWG2phbmRl
cnNvbl9zaWx2YUBpZmFtLmVkdS5icjEPMA0GA1UEBxMGTWFuYXVzMREwDwYDVQQI
EwhBbWF6b25hczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xldGguaWZh
-bS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3T9rMfrIK
-rOVeUOO+cUr0sJctCYCSLf7Us2B0rewYezGmn19ZjX+3ona7fKu68LpKRBns6YmD
-6xU+JHdsxTxHL4ksF8CGIbBIIBXXGPCAY8/mbZHI0BfxMfwYxiu4+BjdIu1TYVYN
-VMPmQyuDrHOvd4skrrO24zF3ybtEit1z5GmjGp6GTl5XidgopmrHfk+/ja4kXW2P
-qoDlSUvZH0Uw+Vw7fcN3IWZq0t+LAFlQ2BnIpwvuUaubu9M0dDlqPablPwkZpexJ
-v3SKupj4L5TjtfkIembZFBy6RPg9HMuzOblUU6ix5EhlA5tCR1mvCnSOxhydVXgk
-tmModkuQnsDhAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGdfiOorvQWWXvss3EdH
-5Kr52uApt8yuykLZCUlSdjpUEv9vijnn260k/E4p/4nRYePSGsFzQPySt1jURb5U
-aS/PtF+JKLdNcrvu8z9sqXQAnDa9aBLJ45ATSfiZgWh744leWXhh1MPrOwf+yw36
-NzkTRq+gkheloOC5RQ+dLOhhp+wHhtG/anwvWz2VrIjG282QVJQyWh5wPCA5QkDW
-S7AqpqlgKd5RWJds+UOKFLgAQwvtfQMCtaAuduMUxJ+uEgqwTamdcgYO9k5WfbZF
-4kauMCP269aYK6qxU06yQzMqHHYWhSyzAmJqbnZeeLuqS5dGOw3099pUElc0XuYb
-PRM=
+bS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwe8oW4kt+
+10kAHIs5ktvLFB1Re/x4DAOxPMDrTVrM9rK8KRp9ITjlHgCgwsE/hLmyebRlTPCA
+PVGol2yAX6MUqTaF8CEqoUs3E2Cs2vpFWUjcx7oP89TsL1nLHF+Ye33gfYUtOi/V
+mK0jP4BW4/OI/5GaYj3WhYSJd9ygWLeScxokricn+yrQzOH0pdbRFxXsiwURQCdD
+YWD5DKSER/44M1HK430Tl+5UST/9hGhTn7L5cfxC+iJUkythj6ZYEWp3e1SHfqWF
+/QgGk2nKT3B2PgMnLfiXRsry4cVaukty4r/9cRJAgC241wGbWEWnXiPshWOJIqBi
+sFhiqWvT5E81AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADgvNKCE3XgLvEk3HUND
+JdrWzeK2XIw9c8z0Qr4im901tpPKaJrt13M+C+lou9K1uQm6Bvf8Cb0KL35P/jtM
+Zmxquu1syvxmRW1utOTt4jJUYA3k8E+dXMic995IWEQPIQMpFD53gE3/LF6QqD8F
+FsMYsy832J83v55+TWqMNSwG9Y6usOm/UqHyxh1/PKldHTCpr9bMY5Pba0ko++0B
+8TUVA71uquwvJaSPbGWhf6IvWKiZZXyNyswF59UmOZJzzk3biEOdCALlRNy4UOn9
+3HzXQpIvueRNQ4uKUw6CxbyFZBv5oosN399A0zqYQGNSYRJIx66T7UcsW1MoNM5f
+gl0=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -71,24 +71,25 @@ MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxLTArBgNVBAoTJElGQU0gLSBJ
bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWF6b25hczENMAsGA1UECxMEREdUSTEqMCgG
CSqGSIb3DQEJARYbamFuZGVyc29uX3NpbHZhQGlmYW0uZWR1LmJyMQ8wDQYDVQQH
EwZNYW5hdXMxETAPBgNVBAgTCEFtYXpvbmFzMQswCQYDVQQGEwJCUjEfMB0GA1UE
-AxMWc2hpYmJvbGV0aC5pZmFtLmVkdS5icjAeFw0xNTA5MTAxNjExNTFaFw0xODA5
-MDkxNjExNTFaMIG8MS0wKwYDVQQKEyRJRkFNIC0gSW5zdGl0dXRvIEZlZGVyYWwg
+AxMWc2hpYmJvbGV0aC5pZmFtLmVkdS5icjAeFw0xNTA5MTExNDM4MjRaFw0xODA5
+MTAxNDM4MjRaMIG8MS0wKwYDVQQKEyRJRkFNIC0gSW5zdGl0dXRvIEZlZGVyYWwg
ZG8gQW1hem9uYXMxDTALBgNVBAsTBERHVEkxKjAoBgkqhkiG9w0BCQEWG2phbmRl
cnNvbl9zaWx2YUBpZmFtLmVkdS5icjEPMA0GA1UEBxMGTWFuYXVzMREwDwYDVQQI
EwhBbWF6b25hczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xldGguaWZh
-bS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3T9rMfrIK
-rOVeUOO+cUr0sJctCYCSLf7Us2B0rewYezGmn19ZjX+3ona7fKu68LpKRBns6YmD
-6xU+JHdsxTxHL4ksF8CGIbBIIBXXGPCAY8/mbZHI0BfxMfwYxiu4+BjdIu1TYVYN
-VMPmQyuDrHOvd4skrrO24zF3ybtEit1z5GmjGp6GTl5XidgopmrHfk+/ja4kXW2P
-qoDlSUvZH0Uw+Vw7fcN3IWZq0t+LAFlQ2BnIpwvuUaubu9M0dDlqPablPwkZpexJ
-v3SKupj4L5TjtfkIembZFBy6RPg9HMuzOblUU6ix5EhlA5tCR1mvCnSOxhydVXgk
-tmModkuQnsDhAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGdfiOorvQWWXvss3EdH
-5Kr52uApt8yuykLZCUlSdjpUEv9vijnn260k/E4p/4nRYePSGsFzQPySt1jURb5U
-aS/PtF+JKLdNcrvu8z9sqXQAnDa9aBLJ45ATSfiZgWh744leWXhh1MPrOwf+yw36
-NzkTRq+gkheloOC5RQ+dLOhhp+wHhtG/anwvWz2VrIjG282QVJQyWh5wPCA5QkDW
-S7AqpqlgKd5RWJds+UOKFLgAQwvtfQMCtaAuduMUxJ+uEgqwTamdcgYO9k5WfbZF
-4kauMCP269aYK6qxU06yQzMqHHYWhSyzAmJqbnZeeLuqS5dGOw3099pUElc0XuYb
-PRM=
+bS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwe8oW4kt+
+10kAHIs5ktvLFB1Re/x4DAOxPMDrTVrM9rK8KRp9ITjlHgCgwsE/hLmyebRlTPCA
+PVGol2yAX6MUqTaF8CEqoUs3E2Cs2vpFWUjcx7oP89TsL1nLHF+Ye33gfYUtOi/V
+mK0jP4BW4/OI/5GaYj3WhYSJd9ygWLeScxokricn+yrQzOH0pdbRFxXsiwURQCdD
+YWD5DKSER/44M1HK430Tl+5UST/9hGhTn7L5cfxC+iJUkythj6ZYEWp3e1SHfqWF
+/QgGk2nKT3B2PgMnLfiXRsry4cVaukty4r/9cRJAgC241wGbWEWnXiPshWOJIqBi
+sFhiqWvT5E81AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADgvNKCE3XgLvEk3HUND
+JdrWzeK2XIw9c8z0Qr4im901tpPKaJrt13M+C+lou9K1uQm6Bvf8Cb0KL35P/jtM
+Zmxquu1syvxmRW1utOTt4jJUYA3k8E+dXMic995IWEQPIQMpFD53gE3/LF6QqD8F
+FsMYsy832J83v55+TWqMNSwG9Y6usOm/UqHyxh1/PKldHTCpr9bMY5Pba0ko++0B
+8TUVA71uquwvJaSPbGWhf6IvWKiZZXyNyswF59UmOZJzzk3biEOdCALlRNy4UOn9
+3HzXQpIvueRNQ4uKUw6CxbyFZBv5oosN399A0zqYQGNSYRJIx66T7UcsW1MoNM5f
+gl0=
+
</ds:X509Certificate>
</ds:X509Data>
@@ -100,10 +101,10 @@ PRM=
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">IFAM - IFAM - Instituto Federal do Amazonas</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">IFAM - IFAM - Instituto Federal do Amazonas</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">IFAM - IFAM - Instituto Federal do Amazonas</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">IFAM - IFAM - Instituto Federal do Amazonas</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">IFAM - Instituto Federal do Amazonas</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">IFAM - Instituto Federal do Amazonas</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.ifam.edu.br/</md:OrganizationURL>
<md:OrganizationURL xml:lang="pt-br">http://www.ifam.edu.br/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
index 15b5f2f1..ec0f4912 100644
--- a/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
@@ -75,6 +75,7 @@ K18PEJr4gbSWIPjE1lQEyqGD5n0ZrU/xJiM8BlvUdStJChk=
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/SLO"/>
<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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mh-hannover.de/idp/profile/Shibboleth/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -134,6 +135,7 @@ K18PEJr4gbSWIPjE1lQEyqGD5n0ZrU/xJiM8BlvUdStJChk=
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="de">e435</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml
new file mode 100644
index 00000000..a9ea80b6
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.jstor.org/shibboleth">
+ <!--
+ This is a "JSTOR" Shibboleth SP for Ithaka Harbors, Inc.
+ -->
+ <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"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-16T08:54:29Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">JSTOR</mdui:DisplayName>
+ <mdui:Description xml:lang="en">JSTOR is a digital library of academic journals, books, and primary sources.</mdui:Description>
+ <mdui:Logo height="80" width="80">https://jstorstatic.global.ssl.fastly.net/images/J_Logo_80x80px.png</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://jstorstatic.global.ssl.fastly.net/images/J_Logo_16x16px.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDwjCCAqqgAwIBAgIJAJgkGmQBfO0tMA0GCSqGSIb3DQEBBQUAMGcxCzAJBgNV
+ BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
+ VQQKEwlzZW1hbnRpY28xIDAeBgNVBAMTF3NoaWJib2xldGgyc3AuanN0b3Iub3Jn
+ MB4XDTE1MDgyMDEwMjEyMVoXDTM1MDgxNTEwMjEyMVowZzELMAkGA1UEBhMCVUsx
+ DzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoTCXNl
+ bWFudGljbzEgMB4GA1UEAxMXc2hpYmJvbGV0aDJzcC5qc3Rvci5vcmcwggEiMA0G
+ CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDuvYnVYRRNnT700akTCLjMpeYMiybx
+ +QDbBZUagVPJ7ozTXBSM6f+NgLBBa7BZ4/lSKH7y0DSP7xpu2IDZGDclwOse8tG7
+ rV+CgXJj7Kt7fRoJsk2KYmMPwD0KGJDw7MpZFb+2m1h3542QoJqQFxCHvPa4vas1
+ LhxAcSSsLdFvlAYWPQliBISls1YitEbtCzLke26jYHrat1H79miprcrQ966zyEyb
+ JIFAmtftHTuC+RhpOw6VS9y30GK5/i/iofj37lBQ83FNCsGnzgjLeJCMrQz1SYOI
+ jGmsjKntUs0/lhEaES2OohGIIkqBZZ6A4ZzWWJqPhdeysluQ1mU+j+dVAgMBAAGj
+ cTBvME4GA1UdEQRHMEWCF3NoaWJib2xldGgyc3AuanN0b3Iub3JnhipodHRwczov
+ L3NoaWJib2xldGgyc3AuanN0b3Iub3JnL3NoaWJib2xldGgwHQYDVR0OBBYEFDtp
+ FSMX6Vm2e+Corjd0Y86bkI7lMA0GCSqGSIb3DQEBBQUAA4IBAQDqCMPX1TR6E32T
+ FYmhD1m/HOmugfYXj85rMWQmBzP8PoCVY3YylS8ludV2EQKaIueMRqQa/d4VXRGS
+ 5g7hQ9z3/G6MHpPD3a/gESN0+49poZ3W/fIV5lbH2osTTntZbKtZY/XEf712eCfw
+ 29shrnSLWosfsTI1kN1HqGS/ZpoeKP/jf2pMCfp1zsng0hcGaC+6FPQhAGz0FAOj
+ URNA4uZ6QUwmUlAFRfw9HG25sZmsWl5Aq8DKa0sjbo3VPD/bAw919+cnuu0Yhtkm
+ DhqQFdFGUhFvH+wuY366L7UhWBLqhLhERqJ4qBe06Qeg7JrAvK7fqPBWNTbDtEkI
+ NNLmpeHL
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <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>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Ithaka Harbors, Inc.</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">JSTOR</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://about.jstor.org/about/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Brian</GivenName>
+ <SurName>Larsen</SurName>
+ <EmailAddress>mailto:brian.larsen@ithaka.org</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Brian</GivenName>
+ <SurName>Larsen</SurName>
+ <EmailAddress>mailto:brian.larsen@ithaka.org</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml
index cf559510..2f63cad9 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml
@@ -32,24 +32,25 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDTjCCAjagAwIBAgIJAJmXHJSDKJ7QMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
- BAMTHGFubmFscy5hY3ByYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNjA5MTgyMTQy
- WhcNMjUwNjA2MTgyMTQyWjAnMSUwIwYDVQQDExxhbm5hbHMuYWNwcmMuc2lsdmVy
- Y2hhaXIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApXndR9T7
- cjAutgUnDEx6Qcbq+au98+6mUjnftrPtZNAtFU0rbE2snZGZVQZeuN0dGgRr1NaS
- 5x4g3HFjJaewftgulLpbchsfCnN6ZC1FVO2344AcOSgGTQ78ou2dayr/7z5ovI/J
- QP7x29vC2JAbf98HuK8ActSU1HJ7paU7BXSm1KM65jSOkZsw2iPmbAfYScI4KNDs
- KFJAqXz4Ss0mtitgZxa6VmVj4SspcezfET9l8AOO0cjh9N+eEUcgfz8rDGRk4Jsk
- iOlsJRwz0pMuPBSyZ7vgajCOVrBBBtTAzlc1Dj3TPzqzgwWMvej47UPqgvvRf6qF
- NhzHdbuDsvyDIwIDAQABo30wezBaBgNVHREEUzBRghxhbm5hbHMuYWNwcmMuc2ls
- dmVyY2hhaXIuY29thjFodHRwczovL3NwLnNpbHZlcmNoYWlyLmNvbS9hY3Avc3Rh
- Z2luZy9zaGliYm9sZXRoMB0GA1UdDgQWBBTlOSAZe6AtfxB56WFesihNJsVyxzAN
- BgkqhkiG9w0BAQUFAAOCAQEATgJxQuil2jTea7S4qdKLmGZIzMaNASff99QfqeCe
- 2ZcB+TSjvnboM349ffrkEUAGkLgd6IY2p+jZali2evvM1WuJ8GxoNnXthaVPLYq5
- R1bPKYpkoEmLest+bkpMFAsGyel2YYRB45pbTnjcVxWm4wzhCf0koGQJUHdwynuZ
- TVnuoOAKUD9D0Bu8YuFEh6rcfGtICJfhTduB0gT1FzlC+Sg0EnXZEfkeeX/6XE+M
- MBvA0HBgGRddJbNl4TMnX31X0mt8jO1xeQbruNBJLX+vbY7O/CwFRiD+hYHQbTxx
- 2dXU5PR/rs0z/9GCw0BSXMCikbe1J8qc4VM5hl78W0kawQ==
+ MIIDXTCCAkWgAwIBAgIJAP0kjtCO5LCSMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
+ BAMTH2FjbGFuZGFuYXRvbXlyYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNTA1MTI1
+ OTQyWhcNMjAwNTAzMTI1OTQyWjAqMSgwJgYDVQQDEx9hY2xhbmRhbmF0b215cmMu
+ c2lsdmVyY2hhaXIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ 4KlybwJfF5/BPhQtkuJVGsgsUtGccJRx+CBb7xh7g/yOk6BprnfPrWkE9bd40WvX
+ SBy8gNLmFeGHRdl52rpxYfD2xFXgMv1kg1E/pArvO/ulWUVO75s4aHDsh2ZyW0yA
+ xEnsKYbpPVwD+dcg/ilZ2PQ+D2Q0vCOXgukbwX0dNw3Dt0uBCMRlJsdkMn82kUHH
+ ZXE1aSw0i4EGgR1JOnFXmcelGhCwN+BK7WodUIJtN22OLPiSjwOEITEhd+cYLPov
+ EhRu5hYGp87ouJscd6SaiNKThJUjzx09MoetxkXB3Oo0zgeJPuE8VFEF/MRZemnb
+ jCNQRXCfUCVYAhVZS12d8wIDAQABo4GFMIGCMGEGA1UdEQRaMFiCH2FjbGFuZGFu
+ YXRvbXlyYy5zaWx2ZXJjaGFpci5jb22GNWh0dHBzOi8vc3Auc2lsdmVyY2hhaXIu
+ Y29tL2FjbGFuZHMvc3RhZ2luZy9zaGliYm9sZXRoMB0GA1UdDgQWBBS3GtGfzTPW
+ uObt+vb/xORB5huW0DANBgkqhkiG9w0BAQUFAAOCAQEAUB6buU3Bti3wCLmypcFQ
+ CCFXNfQSRWCdhD9OE4RDMlT0H2EibiXCN8ST9gxy7OdMk4SPI+fCjfxKW6EMptBs
+ 98EkLD1NW4wtUFDek9ify6OrmUS0zuEIeCYQ6PK1o9Gjltzu7yIxyexkDrR4vZXC
+ KgaCrxImOhmNTNRPcq3KUa8brOeuLqGLGSfZ24eyd7swYYMpwbsaVYTHxIdonSqI
+ xlMcKiDeqZxfndOrwJUbTPJDLTl3OhjWCnYBZsjkP3wVzs47XSki/yIUotWZlmZS
+ 4kzhd/HkufOmKXEgGTXk4n+7KETjJzDaIQVWRiOBZgWGVtBRqglkhiNRg/gTkARJ
+ Ww==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..a169a397
--- /dev/null
+++ b/swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.vpp.midlands3cities.ac.uk/shibboleth">
+ <!--
+ This is a "Test M3C VPP" Shibboleth SP for the University of Nottingham.
+ -->
+ <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"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-11T11:05:52Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.vpp.midlands3cities.ac.uk/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://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Test M3C VPP</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Virtual Postgraduate Platform (Test)</mdui:Description>
+ <mdui:Logo height="64" width="143">https://test.vpp.midlands3cities.ac.uk/shibboleth-ds/logo_transparent.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDVDCCAjygAwIBAgIJAN7ZAAJNPeUPMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+ BAMTHnRlc3QudnBwLm1pZGxhbmRzM2NpdGllcy5hYy51azAeFw0xNTA5MDgxMDQz
+ MTFaFw0yNTA5MDUxMDQzMTFaMCkxJzAlBgNVBAMTHnRlc3QudnBwLm1pZGxhbmRz
+ M2NpdGllcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOVy
+ i5GUm+F28xiNFY26JMyDaZrM4wuEguKF1PygIXygoZvSghGY+2UbElkVT8uq2RPw
+ 78VEevqqUkmImk74omwHqYslzDrUiPuKRNHSuA4juhf0fkfgws7/2uOzpsXwhSUr
+ RhuXdYfYmoTC+mYf5W0p7akaYIaNpiJSMpfMr9QJ9XG1cstILpQLzWi1PrVYyQAe
+ 60FFP8iwXxny0d/GoCcUFcNVZHr/+RGOFpvfaTyx93EJ+MAQBqHjk9MZvCrzw8yp
+ 7USK13WTGscBtptQnFrdsrr/DgLYT47c1uO3msIPILLawG6zmuBc/cYGDnXys/x8
+ Ro2vgvitq0HTs5TV+zcCAwEAAaN/MH0wXAYDVR0RBFUwU4IedGVzdC52cHAubWlk
+ bGFuZHMzY2l0aWVzLmFjLnVrhjFodHRwczovL3Rlc3QudnBwLm1pZGxhbmRzM2Np
+ dGllcy5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBRal19AbLQlRQl0TGi1/iWs
+ v0laLDANBgkqhkiG9w0BAQUFAAOCAQEAgeQesA8L2G0ELsCf+2QeVDiNjC4pNJaY
+ 8fqjXdQnBnzuWr3l4oOA10xNfHWC00q8pWzhdltc5mB8HLLOTqGTg76DF65xBmKR
+ 1Wl2AAigCGOCIKuIeIRWn4d9SxO16aTGRIUhwnRYPk49s37ADm23/dtR1CWFjTM9
+ 37IYUFeXtf4YxIjKcjpWFM/P9zvNfipRugPIvitR+7QIVlbD0PMZlavt6016tPe3
+ ElHNeykkog1Bc/VQfYhB/x6uS+G/BMGKUMWHM/lw1n63G+xjAcge2Zd5tsE9Xlv7
+ EMC0Aw8aFtO/f3rbkV8veNp4kgaxP2fF1LctGuFKMQThYzwcd9rjZQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <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>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test M3C VPP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.midlands3cities.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IT Service Desk</GivenName>
+ <EmailAddress>mailto:itservicedesk@nottingham.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Craig</GivenName>
+ <SurName>Betts</SurName>
+ <EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
index f5395961..76f0efef 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
@@ -19,6 +19,32 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDUDCCAjigAwIBAgIVAJOMiotpzQ96F7hbDILKKowOjLKeMA0GCSqGSIb3DQEB
+BQUAMCQxIjAgBgNVBAMMGWZlZGVyYXRpb24udW5pdi1tb250cDEuZnIwHhcNMTUw
+NzEzMDk0MjUzWhcNMzUwNzEzMDk0MjUzWjAkMSIwIAYDVQQDDBlmZWRlcmF0aW9u
+LnVuaXYtbW9udHAxLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+mLcbN80A1IO2aQlQ3u+0P4sdHfEcM/3GpUbP50/XaN0AB+tAAj96oEJ12n2RJRCu
+feEl0XDHIjng3mvd+8Pvjw2bp0Vq9beu/0eL1Z1c9CputdZRPRerjkkhM8yVEFsG
+BNwpQP0JPK0OzH1Q+99cb8laJi9Utf3UzEwZyvHBC/r/IDjDc55UOltqjluA+K/V
+llXiagCbTo0gnV9mgVeSDWye859oJQnVrNh1wZpoUv31DNJzh9rgDR3WtzHDbiqy
+MN/vCiDTfL01SrOcOoK2vBFEtAo7p+tEKHD5BmBAi20PQZ+AhD4MopIknhj+G7qh
+KRKlFOxhTggSj2vAtMTi0QIDAQABo3kwdzAdBgNVHQ4EFgQUstMRllZRY3BfE0yE
+R6HnlxdTHh0wVgYDVR0RBE8wTYIZZmVkZXJhdGlvbi51bml2LW1vbnRwMS5mcoYw
+aHR0cHM6Ly9mZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyL2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBBQUAA4IBAQBA3N7qebKU9Q0uANBka00/aRthcUCcNlB+k+/w
+8YWbz1Jq+WQDPyCe7vv5V9yxX+8LYj5tZx8d5OK+j/bJAH/pd6BATIR4Q/shHJiR
+ACMUVUAEyfyaA1eKRe0o1igxNmkSt2twR9ac0u4NbeMnMU5DNHV2qEq5mES+mt7Z
+uRhyMT0WXbmpEtEtL+3eLDN2YpysNtXB720WmgMJNot0N/od5t6HZ/qX73RqfDEp
+QG7nmiGC7F4dtqNbseQfiUXBJ3zyqnYp/Foxrj4CCXr7u7LphFwVD1S9P2XEAU7+
+jrnOFBPNFh4Y2Am2S7HRRZgtL0oPhJX8iPweocqY1nZy/RZs
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEhDCCA2ygAwIBAgIRAKpYore6nLYzJ1HYT2nH1gswDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMjA5MTgwMDAwMDBaFw0xNTA5MTgyMzU5NTlaMFUxCzAJBgNV
@@ -48,39 +74,6 @@ tMVy28FqAhY=
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEmjCCA4KgAwIBAgIRAPySCVGZx84C0a/SjMDoFYUwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTEyMTAwMDAwMDBaFw0xMjEyMDkyMzU5NTlaMGsxCzAJBgNV
-BAYTAkZSMRQwEgYDVQQHEwtNb250cGVsbGllcjEiMCAGA1UECgwZVW5pdmVyc2l0
-w6kgTW9udHBlbGxpZXIgMTEiMCAGA1UEAxMZZmVkZXJhdGlvbi51bml2LW1vbnRw
-MS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU8pV0nPebu/GeN
-74xGlXxV64piDi9oPdnfhzymqcwhYKxGafdZT7ig5aPa8oqzgqALx6QGb5MW/Jqq
-sIsnrZ0Viq93WsFix/v023VEbfqMjhS7GvlbkISDFsHwfOqWGOctH4U9YIaxNsPU
-ycicV+xjkcHCeIkV1/iA5WjsmWjYTiS6OjkYBlJi8K7ewUhJqbjMitJOa+MPiHA+
-l2QOweyvBP7CXIBfD+I7SkhAKOkcY1HY3P+E/Jm5FFVq7XgegUI4HnTPYmdFHQcI
-IIH7h9R0zjGI1cNxXGbcU022Fk1yApbJuiohwKwsl5tkdQSQW1MPAyS2Pd5lOh+t
-cKVS64UCAwEAAaOCAWwwggFoMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBTvuTrb1SlFO4wuVCAylqcHvnM6+jAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAkBgNVHREEHTAbghlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMA0GCSqG
-SIb3DQEBBQUAA4IBAQBs719Xv+zweuNrvdoss2F0iOkIyyUp9dM5lHKU4gRqfgfo
-liHFw2K2kISgVEFN1LItH22Il/XQI/GmkCA77SIAFH4e56iavZXhLLXrTRItyEy7
-hytw5E1pOoujgA7muJHOVZC9YPKfxM0Jm+/+AYnvg0gx5XztpIhFiJNrfWCsa4B8
-bxjNOQD/A7ABQ8QB8o/SlbOg5JRvdicRxiJ8b1TJ+qC5amcwyIy2kSUKDlUCB5YG
-dxgENHByQ2jDFbk7bab8C0FqCTYvXDC3zVF3O8teAcLVVqgx77rxi0QaiXglSG5O
-blhyWpP4kTIvlkwJhn8FGdWa7UIrQP4W68yhBSIz
- </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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML2/POST/SSO"/>
@@ -95,6 +88,32 @@ blhyWpP4kTIvlkwJhn8FGdWa7UIrQP4W68yhBSIz
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDUDCCAjigAwIBAgIVAJOMiotpzQ96F7hbDILKKowOjLKeMA0GCSqGSIb3DQEB
+BQUAMCQxIjAgBgNVBAMMGWZlZGVyYXRpb24udW5pdi1tb250cDEuZnIwHhcNMTUw
+NzEzMDk0MjUzWhcNMzUwNzEzMDk0MjUzWjAkMSIwIAYDVQQDDBlmZWRlcmF0aW9u
+LnVuaXYtbW9udHAxLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+mLcbN80A1IO2aQlQ3u+0P4sdHfEcM/3GpUbP50/XaN0AB+tAAj96oEJ12n2RJRCu
+feEl0XDHIjng3mvd+8Pvjw2bp0Vq9beu/0eL1Z1c9CputdZRPRerjkkhM8yVEFsG
+BNwpQP0JPK0OzH1Q+99cb8laJi9Utf3UzEwZyvHBC/r/IDjDc55UOltqjluA+K/V
+llXiagCbTo0gnV9mgVeSDWye859oJQnVrNh1wZpoUv31DNJzh9rgDR3WtzHDbiqy
+MN/vCiDTfL01SrOcOoK2vBFEtAo7p+tEKHD5BmBAi20PQZ+AhD4MopIknhj+G7qh
+KRKlFOxhTggSj2vAtMTi0QIDAQABo3kwdzAdBgNVHQ4EFgQUstMRllZRY3BfE0yE
+R6HnlxdTHh0wVgYDVR0RBE8wTYIZZmVkZXJhdGlvbi51bml2LW1vbnRwMS5mcoYw
+aHR0cHM6Ly9mZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyL2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBBQUAA4IBAQBA3N7qebKU9Q0uANBka00/aRthcUCcNlB+k+/w
+8YWbz1Jq+WQDPyCe7vv5V9yxX+8LYj5tZx8d5OK+j/bJAH/pd6BATIR4Q/shHJiR
+ACMUVUAEyfyaA1eKRe0o1igxNmkSt2twR9ac0u4NbeMnMU5DNHV2qEq5mES+mt7Z
+uRhyMT0WXbmpEtEtL+3eLDN2YpysNtXB720WmgMJNot0N/od5t6HZ/qX73RqfDEp
+QG7nmiGC7F4dtqNbseQfiUXBJ3zyqnYp/Foxrj4CCXr7u7LphFwVD1S9P2XEAU7+
+jrnOFBPNFh4Y2Am2S7HRRZgtL0oPhJX8iPweocqY1nZy/RZs
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEhDCCA2ygAwIBAgIRAKpYore6nLYzJ1HYT2nH1gswDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMjA5MTgwMDAwMDBaFw0xNTA5MTgyMzU5NTlaMFUxCzAJBgNV
@@ -124,39 +143,6 @@ tMVy28FqAhY=
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEmjCCA4KgAwIBAgIRAPySCVGZx84C0a/SjMDoFYUwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTEyMTAwMDAwMDBaFw0xMjEyMDkyMzU5NTlaMGsxCzAJBgNV
-BAYTAkZSMRQwEgYDVQQHEwtNb250cGVsbGllcjEiMCAGA1UECgwZVW5pdmVyc2l0
-w6kgTW9udHBlbGxpZXIgMTEiMCAGA1UEAxMZZmVkZXJhdGlvbi51bml2LW1vbnRw
-MS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU8pV0nPebu/GeN
-74xGlXxV64piDi9oPdnfhzymqcwhYKxGafdZT7ig5aPa8oqzgqALx6QGb5MW/Jqq
-sIsnrZ0Viq93WsFix/v023VEbfqMjhS7GvlbkISDFsHwfOqWGOctH4U9YIaxNsPU
-ycicV+xjkcHCeIkV1/iA5WjsmWjYTiS6OjkYBlJi8K7ewUhJqbjMitJOa+MPiHA+
-l2QOweyvBP7CXIBfD+I7SkhAKOkcY1HY3P+E/Jm5FFVq7XgegUI4HnTPYmdFHQcI
-IIH7h9R0zjGI1cNxXGbcU022Fk1yApbJuiohwKwsl5tkdQSQW1MPAyS2Pd5lOh+t
-cKVS64UCAwEAAaOCAWwwggFoMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBTvuTrb1SlFO4wuVCAylqcHvnM6+jAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAkBgNVHREEHTAbghlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMA0GCSqG
-SIb3DQEBBQUAA4IBAQBs719Xv+zweuNrvdoss2F0iOkIyyUp9dM5lHKU4gRqfgfo
-liHFw2K2kISgVEFN1LItH22Il/XQI/GmkCA77SIAFH4e56iavZXhLLXrTRItyEy7
-hytw5E1pOoujgA7muJHOVZC9YPKfxM0Jm+/+AYnvg0gx5XztpIhFiJNrfWCsa4B8
-bxjNOQD/A7ABQ8QB8o/SlbOg5JRvdicRxiJ8b1TJ+qC5amcwyIy2kSUKDlUCB5YG
-dxgENHByQ2jDFbk7bab8C0FqCTYvXDC3zVF3O8teAcLVVqgx77rxi0QaiXglSG5O
-blhyWpP4kTIvlkwJhn8FGdWa7UIrQP4W68yhBSIz
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML1/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 7621578d..0d02e5cb 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -71,7 +71,6 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">handelsskolen.com</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cphbusiness.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kea.dk</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nybuni.dans.kmd.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eadania.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dansidp.stads.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umit.dk</shibmd:Scope>
@@ -90,6 +89,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drcmr.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">simac.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsyd.dk</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smu.edu.sg</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml b/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml
index cd59ef94..98c99114 100644
--- a/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml
+++ b/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml
@@ -5,6 +5,22 @@
-->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor>
@@ -40,6 +56,12 @@
</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>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
diff --git a/swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml b/swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml
new file mode 100644
index 00000000..431a1b4a
--- /dev/null
+++ b/swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://www.pharmacopoeia.com/oa/metadata">
+ <!--
+ This is a "British Pharmacopoeia" SP for The Stationery Office Ltd.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-14T13:31:36Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" 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:Description xml:lang="en">British Pharmacopoeia</mdui:Description>
+ <mdui:DisplayName xml:lang="en">British Pharmacopoeia</mdui:DisplayName>
+ <mdui:Logo height="106" width="480">https://www.pharmacopoeia.com/assets/bp/images/british-pharmacopoeia.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDcDCCAligAwIBAgIJAKNqg3+e59PHMA0GCSqGSIb3DQEBBQUAMC4xDDAKBgNV
+ BAoTA1RTTzEeMBwGA1UEAxMVd3d3LnBoYXJtYWNvcG9laWEuY29tMB4XDTE1MDgw
+ NzE1NDczNVoXDTI1MDgwNDE1NDczNVowLjEMMAoGA1UEChMDVFNPMR4wHAYDVQQD
+ ExV3d3cucGhhcm1hY29wb2VpYS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ ggEKAoIBAQCtAr/AsZ79dO0pgPupqfStUaz5DmNqgkNhFBzyurii3T7A/gYhKK+d
+ buDgZCLTXLUHW64fOlM7vRDFWdmiZpwguVfm3PWaB8+i5drwPP2/3AEE3W0WzTeo
+ dwxkGJCz9syQh2CStC/kW0bDVpn4O7QguwVtSX1oD6PunAcwIvri9wESkw6UeyZ1
+ /rWgEXBhp6rXUyJi638dR6/nr8UTCEaxg2vUugw/yR4NqrB2tP2MAC1nsoG2QWwJ
+ YoCnc7mAbELSloohgGMKAIf9bxq6avwOq+87YU/tgA0qMnwtgquTtKZWcowth3pG
+ b8e4sbEZReDCskuDZYoCZbHY+xJva05tAgMBAAGjgZAwgY0wHQYDVR0OBBYEFB6r
+ bmDDRDm0jgjnoldiBzw8xbmGMF4GA1UdIwRXMFWAFB6rbmDDRDm0jgjnoldiBzw8
+ xbmGoTKkMDAuMQwwCgYDVQQKEwNUU08xHjAcBgNVBAMTFXd3dy5waGFybWFjb3Bv
+ ZWlhLmNvbYIJAKNqg3+e59PHMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ ggEBACYjvdAjjvz4xRgC8HMpx+LFg3k0XCyEGxz8CZWOW3C+9fHLv906KHt/89Vb
+ Xq219cAfqjDKhtBrRDjslFbuFXtxlpT4GeGfkr8FskqH/4yUDEPzoE1tsZ++dEeJ
+ JNRx6beS8x25YfHhT5oNIqLHu0S5sppl0175ipLzZLzvFOmCeRKJB4mI88vlN3PH
+ gryT2uLDshfufiLzsJyGsJhwVxjJrTZpZkVVIsLN6euxeVi+b9dH+8aZlLULtYoU
+ 2kpGXv46PNFW01vl+J/EVxq3YitsdWzopSmjHYIZR0eKXDG4bAS6ulPAAElDsKlE
+ 0e00+Q6k8r5lfTGa50KV3OMQGR8=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDcDCCAligAwIBAgIJAKNqg3+e59PHMA0GCSqGSIb3DQEBBQUAMC4xDDAKBgNV
+ BAoTA1RTTzEeMBwGA1UEAxMVd3d3LnBoYXJtYWNvcG9laWEuY29tMB4XDTE1MDgw
+ NzE1NDczNVoXDTI1MDgwNDE1NDczNVowLjEMMAoGA1UEChMDVFNPMR4wHAYDVQQD
+ ExV3d3cucGhhcm1hY29wb2VpYS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ ggEKAoIBAQCtAr/AsZ79dO0pgPupqfStUaz5DmNqgkNhFBzyurii3T7A/gYhKK+d
+ buDgZCLTXLUHW64fOlM7vRDFWdmiZpwguVfm3PWaB8+i5drwPP2/3AEE3W0WzTeo
+ dwxkGJCz9syQh2CStC/kW0bDVpn4O7QguwVtSX1oD6PunAcwIvri9wESkw6UeyZ1
+ /rWgEXBhp6rXUyJi638dR6/nr8UTCEaxg2vUugw/yR4NqrB2tP2MAC1nsoG2QWwJ
+ YoCnc7mAbELSloohgGMKAIf9bxq6avwOq+87YU/tgA0qMnwtgquTtKZWcowth3pG
+ b8e4sbEZReDCskuDZYoCZbHY+xJva05tAgMBAAGjgZAwgY0wHQYDVR0OBBYEFB6r
+ bmDDRDm0jgjnoldiBzw8xbmGMF4GA1UdIwRXMFWAFB6rbmDDRDm0jgjnoldiBzw8
+ xbmGoTKkMDAuMQwwCgYDVQQKEwNUU08xHjAcBgNVBAMTFXd3dy5waGFybWFjb3Bv
+ ZWlhLmNvbYIJAKNqg3+e59PHMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ ggEBACYjvdAjjvz4xRgC8HMpx+LFg3k0XCyEGxz8CZWOW3C+9fHLv906KHt/89Vb
+ Xq219cAfqjDKhtBrRDjslFbuFXtxlpT4GeGfkr8FskqH/4yUDEPzoE1tsZ++dEeJ
+ JNRx6beS8x25YfHhT5oNIqLHu0S5sppl0175ipLzZLzvFOmCeRKJB4mI88vlN3PH
+ gryT2uLDshfufiLzsJyGsJhwVxjJrTZpZkVVIsLN6euxeVi+b9dH+8aZlLULtYoU
+ 2kpGXv46PNFW01vl+J/EVxq3YitsdWzopSmjHYIZR0eKXDG4bAS6ulPAAElDsKlE
+ 0e00+Q6k8r5lfTGa50KV3OMQGR8=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pharmacopoeia.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pharmacopoeia.com/oa/auth/rcv/saml2/post" index="2"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">The Stationery Office Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">British Pharmacopoeia</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.pharmacopoeia.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Nichol</GivenName>
+ <SurName>Pope</SurName>
+ <EmailAddress>mailto:nichol.pope@tso.co.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Jaspaul</GivenName>
+ <SurName>Khurana</SurName>
+ <EmailAddress>mailto:Jaspaul.Khurana@tso.co.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml b/swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml
index c99fcf41..9814cde1 100644
--- a/swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studentsupermarket.com/shibboleth">
<!--
- This is a "Student Supermarket" Shibboleth SP for Domnet Digital Limited.
+ This is a "Student Supermarket" Shibboleth SP for Student Supermarket Ltd.
-->
<Extensions>
<DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -79,18 +79,18 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
- <OrganizationName xml:lang="en">Domnet Digital Limited</OrganizationName>
+ <OrganizationName xml:lang="en">Student Supermarket Ltd</OrganizationName>
<OrganizationDisplayName xml:lang="en">Student Supermarket</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.studentsupermarket.com/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
<GivenName>Robert</GivenName>
<SurName>Gray</SurName>
- <EmailAddress>mailto:robert@domnet.net</EmailAddress>
+ <EmailAddress>mailto:robert@studentsupermarket.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Ali</GivenName>
<SurName>Onder</SurName>
- <EmailAddress>mailto:ali@aralsoft.com</EmailAddress>
+ <EmailAddress>mailto:ali@studentsupermarket.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 34dcc8c5..a0890748 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -269,7 +269,6 @@
<xi:include href="swamid-2.0/se.timeedit.net-su-student-sp.xml"/>
<xi:include href="swamid-2.0/produktwebb.uu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/activate.du.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/stipendier.uu.se-stipendium.xml"/>
<xi:include href="swamid-2.0/konto-test.weblogin.uu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/lobo2.lab.sunet.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/tools.kib.ki.se-shibboleth.xml"/>
@@ -287,7 +286,6 @@
<xi:include href="swamid-2.0/its-utv03.ad.umu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/wisumstage.its.umu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/data.kb.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/blender.c3se.chalmers.se-a.xml"/>
<xi:include href="swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt"/>
<xi:include href="swamid-2.0/expert.uhrdemo.antagning.se_aws-sp.txt"/>
@@ -458,4 +456,9 @@
<xi:include href="swamid-2.0/daisy.dsv.su.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/daisy2.dsv.su.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/www.nais.uhr.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+ <xi:include href="swamid-2.0/internt.geol.lu.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/play.hkr.se.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index f5f40921..eb4de61a 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -45,4 +45,5 @@
<xi:include href="swamid-2.0/idptest.hj.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml"/>
+ <xi:include href="swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml"/>
</EntitiesDescriptor>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 22:32:14 +0000