summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0
diff options
context:
space:
mode:
Diffstat (limited to 'swamid-interfederations-2.0')
-rw-r--r--swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml121
-rw-r--r--swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml10
-rw-r--r--swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml118
-rw-r--r--swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml190
-rw-r--r--swamid-interfederations-2.0/cmi-nuig.calpendo.com-shibboleth.xml104
-rw-r--r--swamid-interfederations-2.0/cmu-shib.hosted.exlibrisgroup.com-shib.xml93
-rw-r--r--swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml6
-rw-r--r--swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml82
-rw-r--r--swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml2
-rw-r--r--swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml97
-rw-r--r--swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml59
-rw-r--r--swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml12
-rw-r--r--swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml12
-rw-r--r--swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml105
-rw-r--r--swamid-interfederations-2.0/sp.catalog.clarin.eu.xml2
-rw-r--r--swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml66
-rw-r--r--swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml111
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml53
-rw-r--r--swamid-interfederations-2.0/vpp.midlands3cities.ac.uk-shibboleth.xml98
-rw-r--r--swamid-interfederations-2.0/wayf.wayf.dk.xml1
-rw-r--r--swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.xml82
-rw-r--r--swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml26
26 files changed, 1104 insertions, 361 deletions
diff --git a/swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..48099bcd
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.pmodwrc.ch/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-22T09:13:33Z">
+ <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">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor errorURL="http://www.pmodwrc.ch/helpdesk/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmodwrc.ch</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">PMOD/WRC - Observatorium Davos</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">PMOD/WRC - Observatory Davos</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Physikalisch-Meteorologisches Observatorium Davos / World Radiation Center</mdui:Description>
+ <mdui:Description xml:lang="en">Physikalisch-Meteorologisches Observatorium Davos / World Radiation Center</mdui:Description>
+ <mdui:Keywords xml:lang="de">pmod wrc davos observatory world+radiation+center</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">pmod wrc davos observatory world+radiation+center</mdui:Keywords>
+ <mdui:Logo height="16" width="16">data:image/png;base64,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</mdui:Logo>
+ <mdui:Logo height="23" width="80">data:image/png;base64,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</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://www.pmodwrc.ch/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="de">http://www.pmodwrc.ch/</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>193.5.60.0/24</mdui:IPHint>
+ <mdui:IPHint>2001:620:1b0::/48</mdui:IPHint>
+ <mdui:DomainHint>pmodwrc.ch</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:46.813268333,9.844476667</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>
+MIIDPDCCAiSgAwIBAgIVALG9ecvQJDCXzNRP46ZzLxS4GhtYMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFGFhaS1sb2dpbi5wbW9kd3JjLmNoMB4XDTE1MDkwNDA4
+MzM0OVoXDTE4MDkwNDA4MzM0OVowHzEdMBsGA1UEAwwUYWFpLWxvZ2luLnBtb2R3
+cmMuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJUqXZfgggAPBq
+lto9/Kp35iKRqQnYuEYBnGWU2R+DyTBVulQMICxKj1eusQkPbx1kJHUYluEvqQAB
+Fo7L92XJstToDPrqcPM9K6raiGIQkvMs8XjpimxTc5+BxwXd8j6W8nt7FSJwJMbr
+rJbPJa4d70hE6YLWeUIOlRcCqQIjimYn15bRTT3lyvyqft/aA7PGmcGwXHUUuqSM
+eYcdTznmukf7DHXsELMFo8mh4mhgNtv9hOTljWzDm3E1Seltzn8dWt8BCNRhCrux
+9zbvW6O4pwuEpmEAe8Y6oiRzsPmERpYvNuCXCbiFKAM4+4urIR9HBRIYQ+O0d2Hd
+Mra1f9JlAgMBAAGjbzBtMB0GA1UdDgQWBBQhIfuXzA9F23uk457x7OAaaw1+VjBM
+BgNVHREERTBDghRhYWktbG9naW4ucG1vZHdyYy5jaIYraHR0cHM6Ly9hYWktbG9n
+aW4ucG1vZHdyYy5jaC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+VQQ2H4Jk7jcPpGTCgjUooodcP3HnbXBJAjN3yQPCQFAaHy508uVn94Bsf6YB9lDL
+YI8+A/YK3gVasS920PO82WXX+6GJfN69zymoLzx/1glG8TlQUChsIdaQ3wYEpY1M
+Xe60wppCMMGrAX6Xm6FMJ0eAhCYB198s3rq912Qo45X0IRatt/9/hX8d6papM3ix
+KLnxSFoYmtjuLBu3m3iafGjKLhqrSuUjijQkUpiBhU9L+mHYqsiFhWtN0shDDArV
+/L/p5/Cgit73Y4DxEiduQLsvOY7qMRT/2B8BeOGfsPmFEhgOW4bsqD0PPDSFU/0V
+5ZEAFD7qOs5ewWuoyZkSkw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.pmodwrc.ch/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.pmodwrc.ch/idp/profile/SAML2/POST/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">pmodwrc.ch</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVALG9ecvQJDCXzNRP46ZzLxS4GhtYMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFGFhaS1sb2dpbi5wbW9kd3JjLmNoMB4XDTE1MDkwNDA4
+MzM0OVoXDTE4MDkwNDA4MzM0OVowHzEdMBsGA1UEAwwUYWFpLWxvZ2luLnBtb2R3
+cmMuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJUqXZfgggAPBq
+lto9/Kp35iKRqQnYuEYBnGWU2R+DyTBVulQMICxKj1eusQkPbx1kJHUYluEvqQAB
+Fo7L92XJstToDPrqcPM9K6raiGIQkvMs8XjpimxTc5+BxwXd8j6W8nt7FSJwJMbr
+rJbPJa4d70hE6YLWeUIOlRcCqQIjimYn15bRTT3lyvyqft/aA7PGmcGwXHUUuqSM
+eYcdTznmukf7DHXsELMFo8mh4mhgNtv9hOTljWzDm3E1Seltzn8dWt8BCNRhCrux
+9zbvW6O4pwuEpmEAe8Y6oiRzsPmERpYvNuCXCbiFKAM4+4urIR9HBRIYQ+O0d2Hd
+Mra1f9JlAgMBAAGjbzBtMB0GA1UdDgQWBBQhIfuXzA9F23uk457x7OAaaw1+VjBM
+BgNVHREERTBDghRhYWktbG9naW4ucG1vZHdyYy5jaIYraHR0cHM6Ly9hYWktbG9n
+aW4ucG1vZHdyYy5jaC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+VQQ2H4Jk7jcPpGTCgjUooodcP3HnbXBJAjN3yQPCQFAaHy508uVn94Bsf6YB9lDL
+YI8+A/YK3gVasS920PO82WXX+6GJfN69zymoLzx/1glG8TlQUChsIdaQ3wYEpY1M
+Xe60wppCMMGrAX6Xm6FMJ0eAhCYB198s3rq912Qo45X0IRatt/9/hX8d6papM3ix
+KLnxSFoYmtjuLBu3m3iafGjKLhqrSuUjijQkUpiBhU9L+mHYqsiFhWtN0shDDArV
+/L/p5/Cgit73Y4DxEiduQLsvOY7qMRT/2B8BeOGfsPmFEhgOW4bsqD0PPDSFU/0V
+5ZEAFD7qOs5ewWuoyZkSkw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.pmodwrc.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>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">pmodwrc.ch</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">PMOD/WRC - Observatorium Davos</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">PMOD/WRC - Observatory Davos</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.pmodwrc.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.pmodwrc.ch/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Marco</md:GivenName>
+ <md:SurName>Senft</md:SurName>
+ <md:EmailAddress>mailto:marco.senft@pmodwrc.ch</md:EmailAddress>
+ <md:TelephoneNumber>+41 58 467 51 49</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Marco</md:GivenName>
+ <md:SurName>Senft</md:SurName>
+ <md:EmailAddress>mailto:marco.senft@pmodwrc.ch</md:EmailAddress>
+ <md:TelephoneNumber>+41 58 467 51 49</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
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 4599d1c5..4cb81fb4 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="2015-09-16T13:51:40Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-18T13:54:00Z">
<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">
@@ -60,8 +60,8 @@ QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.ch/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>
@@ -99,8 +99,8 @@ QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.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>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..19d2e7f8
--- /dev/null
+++ b/swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+ <!--
+ This is a "M3C Administration" SimpleSAMLphp SP for the University of Nottingham.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-17T10:17:54Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">M3C Administration</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Virtual Postgraduate Platform administration console</mdui:Description>
+ <mdui:Logo height="64" width="143">https://vpp.midlands3cities.ac.uk/shibboleth-ds/logo_transparent.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIFnzCCBIegAwIBAgIJAJo8nGGZ+AUAMA0GCSqGSIb3DQEBBQUAMIHkMQswCQYD
+ VQQGEwJVSzEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3Rp
+ dG5naGFtMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAbBgNV
+ BAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSgwJgYDVQQDEx9hZG1pbi52cHAubWlk
+ bGFuZHMzY2l0aWVzLmFjLnVrMTowOAYJKoZIhvcNAQkBFit1aS1hcHBsaWNhdGlv
+ bi1kZXZlbG9wbWVudEBub3R0aW5naGFtLmFjLnVrMB4XDTE1MDgyNzA3MzA1N1oX
+ DTI1MDgyNjA3MzA1N1owgeQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIEw9Ob3R0aW5n
+ aGFtc2hpcmUxEzARBgNVBAcTCk5vdGl0bmdoYW0xITAfBgNVBAoTGFVuaXZlcnNp
+ dHkgb2YgTm90dGluZ2hhbTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMx
+ KDAmBgNVBAMTH2FkbWluLnZwcC5taWRsYW5kczNjaXRpZXMuYWMudWsxOjA4Bgkq
+ hkiG9w0BCQEWK3VpLWFwcGxpY2F0aW9uLWRldmVsb3BtZW50QG5vdHRpbmdoYW0u
+ YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZfHcd5M8ywt10
+ r1IGXI041IBcZkrf92pLr3tNki3WeDFcMc0fYgTM3bQURnQX4vPwHxGg688/KNg/
+ 0tTAiqdKH1z59OXbKEeRUga4iV+iS3cMJh4wdTM2j7Ii1nWkOXwucJOsYM/1Ctxk
+ PsWxLbbeROEPHKDcetcItpKcgGA9L3gJmgIGW/XhNViOCw/eXsK32JY3V8rgsZnN
+ LJs31ecTZrE6Xii03FgmY2CwIbclqGOcpJujOYy2IdiAkg+g0IhQQfUjJflk2487
+ g9LMMr6Gs2AB80fCpbNBifxHZjiLvjVDvIOqbBRE4Dwj6QX4ATGz6MV1L8+dXb12
+ Rnr1JzNjAgMBAAGjggFQMIIBTDAdBgNVHQ4EFgQU0KQ+wxVQfSjnHvZStfyP7kEf
+ OqUwggEbBgNVHSMEggESMIIBDoAU0KQ+wxVQfSjnHvZStfyP7kEfOqWhgeqkgecw
+ geQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNV
+ BAcTCk5vdGl0bmdoYW0xITAfBgNVBAoTGFVuaXZlcnNpdHkgb2YgTm90dGluZ2hh
+ bTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxKDAmBgNVBAMTH2FkbWlu
+ LnZwcC5taWRsYW5kczNjaXRpZXMuYWMudWsxOjA4BgkqhkiG9w0BCQEWK3VpLWFw
+ cGxpY2F0aW9uLWRldmVsb3BtZW50QG5vdHRpbmdoYW0uYWMudWuCCQCaPJxhmfgF
+ ADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAbX/FnL9VG4/wFGObq
+ uHUJBbxyauoDL0EsZfC5n77GQ1y6I2S0QONYoHo73jjZChgTh4ehs7T4jEH44jIB
+ 9+Mk+PINIuuqAFr/O2bT3W5095QhfsSwUrflJ6EiyzbBLkwzR7lXdI+NX49Ac8t9
+ ix6jdDSFuFkk0mflSWK/CWbh9yg+WJSeZAMVeZouZFG5LwJc9I//Bd2QARkXDniL
+ EQE0sXwP+xYb9jSS6rjHhXYbpOdp8Di6R1/WuqlytpKCZ0BSk2R/jhBdjE0eFrba
+ VhBFdDAYO44lUzzsyNRuoEMSvhHWhUBp2369nuoAl0Y0qST19KxMB6UWU6GhnKa8
+ MhTV
+ </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>
+ MIIFnzCCBIegAwIBAgIJAJo8nGGZ+AUAMA0GCSqGSIb3DQEBBQUAMIHkMQswCQYD
+ VQQGEwJVSzEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3Rp
+ dG5naGFtMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAbBgNV
+ BAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSgwJgYDVQQDEx9hZG1pbi52cHAubWlk
+ bGFuZHMzY2l0aWVzLmFjLnVrMTowOAYJKoZIhvcNAQkBFit1aS1hcHBsaWNhdGlv
+ bi1kZXZlbG9wbWVudEBub3R0aW5naGFtLmFjLnVrMB4XDTE1MDgyNzA3MzA1N1oX
+ DTI1MDgyNjA3MzA1N1owgeQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIEw9Ob3R0aW5n
+ aGFtc2hpcmUxEzARBgNVBAcTCk5vdGl0bmdoYW0xITAfBgNVBAoTGFVuaXZlcnNp
+ dHkgb2YgTm90dGluZ2hhbTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMx
+ KDAmBgNVBAMTH2FkbWluLnZwcC5taWRsYW5kczNjaXRpZXMuYWMudWsxOjA4Bgkq
+ hkiG9w0BCQEWK3VpLWFwcGxpY2F0aW9uLWRldmVsb3BtZW50QG5vdHRpbmdoYW0u
+ YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZfHcd5M8ywt10
+ r1IGXI041IBcZkrf92pLr3tNki3WeDFcMc0fYgTM3bQURnQX4vPwHxGg688/KNg/
+ 0tTAiqdKH1z59OXbKEeRUga4iV+iS3cMJh4wdTM2j7Ii1nWkOXwucJOsYM/1Ctxk
+ PsWxLbbeROEPHKDcetcItpKcgGA9L3gJmgIGW/XhNViOCw/eXsK32JY3V8rgsZnN
+ LJs31ecTZrE6Xii03FgmY2CwIbclqGOcpJujOYy2IdiAkg+g0IhQQfUjJflk2487
+ g9LMMr6Gs2AB80fCpbNBifxHZjiLvjVDvIOqbBRE4Dwj6QX4ATGz6MV1L8+dXb12
+ Rnr1JzNjAgMBAAGjggFQMIIBTDAdBgNVHQ4EFgQU0KQ+wxVQfSjnHvZStfyP7kEf
+ OqUwggEbBgNVHSMEggESMIIBDoAU0KQ+wxVQfSjnHvZStfyP7kEfOqWhgeqkgecw
+ geQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNV
+ BAcTCk5vdGl0bmdoYW0xITAfBgNVBAoTGFVuaXZlcnNpdHkgb2YgTm90dGluZ2hh
+ bTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxKDAmBgNVBAMTH2FkbWlu
+ LnZwcC5taWRsYW5kczNjaXRpZXMuYWMudWsxOjA4BgkqhkiG9w0BCQEWK3VpLWFw
+ cGxpY2F0aW9uLWRldmVsb3BtZW50QG5vdHRpbmdoYW0uYWMudWuCCQCaPJxhmfgF
+ ADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAbX/FnL9VG4/wFGObq
+ uHUJBbxyauoDL0EsZfC5n77GQ1y6I2S0QONYoHo73jjZChgTh4ehs7T4jEH44jIB
+ 9+Mk+PINIuuqAFr/O2bT3W5095QhfsSwUrflJ6EiyzbBLkwzR7lXdI+NX49Ac8t9
+ ix6jdDSFuFkk0mflSWK/CWbh9yg+WJSeZAMVeZouZFG5LwJc9I//Bd2QARkXDniL
+ EQE0sXwP+xYb9jSS6rjHhXYbpOdp8Di6R1/WuqlytpKCZ0BSk2R/jhBdjE0eFrba
+ VhBFdDAYO44lUzzsyNRuoEMSvhHWhUBp2369nuoAl0Y0qST19KxMB6UWU6GhnKa8
+ MhTV
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">M3C Administration</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/aleph.svkhk.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml
index e049b8e9..c7e48c59 100644
--- a/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml
@@ -11,7 +11,7 @@
</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: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>
<eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
<eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
@@ -24,33 +24,82 @@
<mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Studijní a vědecké knihovny v Hradci Králové</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.svkhk.cz/Uvodni-stranka.aspx?lang=en-US</mdui:InformationURL>
<mdui:InformationURL xml:lang="cs">http://www.svkhk.cz/</mdui:InformationURL>
- <mdui:Logo height="40" width="40">https://aleph.svkhk.cz/idp/images/logo_40.png</mdui:Logo>
- <mdui:Logo height="90" width="90">https://aleph.svkhk.cz/idp/images/logo_90.png</mdui:Logo>
+ <mdui:Logo height="40" width="40">https://aleph.svkhk.cz/logo/logo_40.png</mdui:Logo>
+ <mdui:Logo height="90" width="90">https://aleph.svkhk.cz/logo/logo_90.png</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
- <md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUC7dbtKAQedxgZUwv3VFnAGDTwQ4wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOYWxlcGguc3ZraGsuY3owHhcNMTQwMTA2MTcwNDQ2WhcN
-MzQwMTA2MTcwNDQ2WjAZMRcwFQYDVQQDEw5hbGVwaC5zdmtoay5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALT0PjFlLk3sfYzuMd4pWVRAYdsx9Kax
-GkF2/0OpAKJQzUA2yhJw3/JtQNbLkGahSkotsU3sbPaV7s6WTu9rJoth153eoLx1
-nNxATvfJ24MbzcK4vCU2HOOnAxFF40a64kn6BR42FpJMDvaDNrYNGC7QXnt9c16r
-drlJKZ9YeSBZ58ziOioU5hgQb3lo9AoN4/M+KVtTsc98F0oX30LYa7JklmQNukuH
-EL2fiDgQTboT8/D0lFwRb7fUXV7aV5Ycm2M9+vPWGY9/+lHNUWDV7m1V5p9QHtuQ
-Mk+j8eP1dKA7RYmpv40A5QN22YzrzUTuRhKQGthOU+VENAx+weL6ybcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOYWxlcGguc3ZraGsuY3qGJWh0dHBzOi8vYWxlcGguc3Zr
-aGsuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB6RVoK6wbDr4JhJu4Wd4JhW
-pfTXMA0GCSqGSIb3DQEBBQUAA4IBAQBpXII7Nhv1rB40LCIMAwk5K/+J6rZn9ng4
-4pvCT6G+FSDTPA39bVUEunlChaGYHNy4sP9UOr/YvK48zAcmdu5di15q43/FbsAr
-F6jP/7uhM3z7Il0N1/NvsQ2tRdpvuVNGiWRVwQ5RHeLTJSq0Nc1UL1I/oJTOTzcd
-ypflPtnNY6u+VVjoczH+s505mASs8NIsaYPiV2PZIRnsGbzNAz2O7efJsajyCcOV
-H1UmiGoOXaYvAlNI0OdAmLiuTyYCiMPx2HHi9mJnnc6wK5LlH5KP336KQLObLvU4
-/ygOfyI2RELa14PCEnCMPPI4NNry20Pp1kuXfT6B4DB+LvcQfREJ
-
- </ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAJSFrXye/a/LtnzGg52l6Vv2aZ3AMA0GCSqGSIb3DQEB
+CwUAMBkxFzAVBgNVBAMMDmFsZXBoLnN2a2hrLmN6MB4XDTE1MDgyODE1MDgwMloX
+DTM1MDgyODE1MDgwMlowGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk2YhfJ9dmOhNkAn3Bdr2L+ElDZ9Xl
+RQQIo+v18FD3ML99ZqS9y0NHGihDe3i8YTJjTYqV+Rg1aV8g7DdivWrqWJle23yf
+WRQLm+gl407hJ/XVyo5GfsafwIWdW/2gYq0y0wyFTROZsvzM5fYnBap1dpvf0UD7
+ewq5uCcQdSOtQ6hHajJnzn60uWG11sMAiQeaoeo7GdDuvpOH8oVuEMscvZtOHpv8
+c+USYcBMZ2n5H6Cp8/GqmIwJzHHrWbpSTwtcj0Qk/fdDHF/bKkukCpFJZmfF9/9O
+oqN7xD872Fg65ZTVnNt6VcN336aZkXwPsjndtmZlGWyhLNUu3SsIUJvFAgMBAAGj
+YzBhMB0GA1UdDgQWBBSy9TOWhcL1moqEDeJaemfu/clcyTBABgNVHREEOTA3gg5h
+bGVwaC5zdmtoay5jeoYlaHR0cHM6Ly9hbGVwaC5zdmtoay5jei9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAWjWUcrdsnu4coYaqXOPM89MOHqhmuel
+Jv955SMGEVDr9nyyy9+ql8xbQbOdHjAJRwu0VgIPlk87mdikX0+H6Xk1c6cp4ud+
+BgQHJMtZObkAh2+fkkCxiqBUkYGPb+5GqvUBkzZbmO3nfQQ8GbxpelYse1tMeiaJ
+gKBxdaXrBBD2s33bOOZ89IMuDQeUszifVCxeofaS9B5N+wplX8J0svGM0ggxCJoM
+x/KI5F8aCCKoDnAD/I8tYu0fTuIwg04I9WwduYCoTxxzAVQ6Ta1QwqDRqRib8QvY
+6/ioV7XeMqtOSAqWrOwCClb0vDVOjUnKJTSU9O8E5/eBCYzfVrVKdA==
+ </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>
+MIIDIzCCAgugAwIBAgIUEJlCdI6O+jqGU7O1e2RkV53yqJIwDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owHhcNMTUwODI4MTUwNzU4WhcN
+MzUwODI4MTUwNzU4WjAZMRcwFQYDVQQDDA5hbGVwaC5zdmtoay5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMBZOjdrxpmQqnkNeOqGdrSbB7YoV2M
+TWEsNm5lquQeV2zefrZVmjkolSeO1K0o3P4M4r12THBSsEFPIEWqbri7l0ti2GGh
+osSHaUMGGy73mznHgbSDXCW+WBc6hXMn5LFXkwQz88fTDRZ2tVfCIDT4bat07+gn
+VjYdokbBgVeoe+GXQEw4Oax1vjsGCvq3+e7kIw1rW7ieVGF8xAkyk9VFV3nEeIGm
+8aR/Bi3625PZO9F4n5JZ86rjVfI84rXaVig55z8nbH9kGYR4J2hHwM/BSO0vhBJC
+gQSvqdgNbO5SMOcKy0bbBKfPVkvANyKVt1FuE5GlCu/yA2Yb4oVgFKsCAwEAAaNj
+MGEwHQYDVR0OBBYEFFQTBSzOxH3LROx/bkBFyhuStmYrMEAGA1UdEQQ5MDeCDmFs
+ZXBoLnN2a2hrLmN6hiVodHRwczovL2FsZXBoLnN2a2hrLmN6L2lkcC9zaGliYm9s
+ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAwmzkKKSFElavD4lgIclbIn4TtjU0vkr2U
+okA6bfpYyG4YKJF1oYlIRANW0834HImncJ2p7zjVUDVOz4NG6L6P8+C2wq2b8m6u
+XsmlTHWoQq1uMK01weHzjkgRH7Ux/6MUBb/HWCB5o6TTf7QWGTnohudrsvw6rMvS
+kCOsKNdYHRUqduRImil9zI7oB3DgcMqKo+nc7ElXdpdZ+C14i+DmVOLsHyAdU/r+
+wI+5wsg5a318BqML9SybteAP3EtvV8gaDJNtDTtGxR26dUoxyfMBcr1pu0NWcbPx
+K6FU2egg9HD4BD1u6djYZV47aavLjJ0tSErfcHvrz5JMQrnbv3GZ
+ </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>
+MIIDIzCCAgugAwIBAgIUHR8h609/l5ZaqJVRDkOVK6KQWccwDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owHhcNMTUwODI4MTUwODAyWhcN
+MzUwODI4MTUwODAyWjAZMRcwFQYDVQQDDA5hbGVwaC5zdmtoay5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALNWuZY/XJorTyIeONFA6lhfBhhSOaYE
+2wtO0KNMlfqY0HPTDn2uPd2F06411wACW12RwyGErZRluedwaZeVdJfy05x3bXsu
+oGDm1o/JI0hLiH82BupYWAZsMhv6XBiv9F8DC+nKDIOKETElJ7mc80fTLMNPH9Bm
+ICvlXCNKdghfPZdAstZM4YpobGFk/0ZCjU5vWCew8ZOUTsMYtp52A4sGHpieGLXk
+0gejaQK8hG70K9GeaDaKm0UAE5780qM13NFBiBg+gIFYUXLxkVZsn7+hEA6YDewu
+Yq4pKdiFI2M7Aj+m4UucRzO237txeznDKKmSnrrgRG9UV7c9vHkhfpUCAwEAAaNj
+MGEwHQYDVR0OBBYEFM27r6xs8sW5D9dl0IVjah5S9ZZAMEAGA1UdEQQ5MDeCDmFs
+ZXBoLnN2a2hrLmN6hiVodHRwczovL2FsZXBoLnN2a2hrLmN6L2lkcC9zaGliYm9s
+ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAfwgwA9/oEx1jnywTpE+I+7omw9RN1McfA
+EN+vJDuGt0Vz8TcjRHUOGxwXHtbw4/aOkK48Drg/kIKY7dghuNeGJgd31bNsgvBj
+Zdecvn1G8TpRlTZXV71+EliO49zpNX8KSimobPkB+oHSMkt94HTljmka11yogiJi
+ycotZyPq8kGjGrFRh0InfIDfRGd9zD0v698moP8FzNlvckl3jL7tzT95QAA9dO21
+MpM8yEEOmngDz+D/LJeNJVT5cbvIZ3gpfm5yX16PyvFMXr8g9NMf/OhAznAHrL90
+xDF332t8sZ0yvjOOmIVyk2NtktyqGSqA7pRQRUZvzMHw15kyMzEM
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -58,6 +107,7 @@ H1UmiGoOXaYvAlNI0OdAmLiuTyYCiMPx2HHi9mJnnc6wK5LlH5KP336KQLObLvU4
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph.svkhk.cz/idp/profile/SAML2/Redirect/SLO"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.cz: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>
@@ -67,41 +117,87 @@ H1UmiGoOXaYvAlNI0OdAmLiuTyYCiMPx2HHi9mJnnc6wK5LlH5KP336KQLObLvU4
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph.svkhk.cz/idp/profile/SAML2/Redirect/SSO"/>
</md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkhk.cz</shibmd:Scope>
</md:Extensions>
- <md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUC7dbtKAQedxgZUwv3VFnAGDTwQ4wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOYWxlcGguc3ZraGsuY3owHhcNMTQwMTA2MTcwNDQ2WhcN
-MzQwMTA2MTcwNDQ2WjAZMRcwFQYDVQQDEw5hbGVwaC5zdmtoay5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALT0PjFlLk3sfYzuMd4pWVRAYdsx9Kax
-GkF2/0OpAKJQzUA2yhJw3/JtQNbLkGahSkotsU3sbPaV7s6WTu9rJoth153eoLx1
-nNxATvfJ24MbzcK4vCU2HOOnAxFF40a64kn6BR42FpJMDvaDNrYNGC7QXnt9c16r
-drlJKZ9YeSBZ58ziOioU5hgQb3lo9AoN4/M+KVtTsc98F0oX30LYa7JklmQNukuH
-EL2fiDgQTboT8/D0lFwRb7fUXV7aV5Ycm2M9+vPWGY9/+lHNUWDV7m1V5p9QHtuQ
-Mk+j8eP1dKA7RYmpv40A5QN22YzrzUTuRhKQGthOU+VENAx+weL6ybcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOYWxlcGguc3ZraGsuY3qGJWh0dHBzOi8vYWxlcGguc3Zr
-aGsuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB6RVoK6wbDr4JhJu4Wd4JhW
-pfTXMA0GCSqGSIb3DQEBBQUAA4IBAQBpXII7Nhv1rB40LCIMAwk5K/+J6rZn9ng4
-4pvCT6G+FSDTPA39bVUEunlChaGYHNy4sP9UOr/YvK48zAcmdu5di15q43/FbsAr
-F6jP/7uhM3z7Il0N1/NvsQ2tRdpvuVNGiWRVwQ5RHeLTJSq0Nc1UL1I/oJTOTzcd
-ypflPtnNY6u+VVjoczH+s505mASs8NIsaYPiV2PZIRnsGbzNAz2O7efJsajyCcOV
-H1UmiGoOXaYvAlNI0OdAmLiuTyYCiMPx2HHi9mJnnc6wK5LlH5KP336KQLObLvU4
-/ygOfyI2RELa14PCEnCMPPI4NNry20Pp1kuXfT6B4DB+LvcQfREJ
-
- </ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAJSFrXye/a/LtnzGg52l6Vv2aZ3AMA0GCSqGSIb3DQEB
+CwUAMBkxFzAVBgNVBAMMDmFsZXBoLnN2a2hrLmN6MB4XDTE1MDgyODE1MDgwMloX
+DTM1MDgyODE1MDgwMlowGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk2YhfJ9dmOhNkAn3Bdr2L+ElDZ9Xl
+RQQIo+v18FD3ML99ZqS9y0NHGihDe3i8YTJjTYqV+Rg1aV8g7DdivWrqWJle23yf
+WRQLm+gl407hJ/XVyo5GfsafwIWdW/2gYq0y0wyFTROZsvzM5fYnBap1dpvf0UD7
+ewq5uCcQdSOtQ6hHajJnzn60uWG11sMAiQeaoeo7GdDuvpOH8oVuEMscvZtOHpv8
+c+USYcBMZ2n5H6Cp8/GqmIwJzHHrWbpSTwtcj0Qk/fdDHF/bKkukCpFJZmfF9/9O
+oqN7xD872Fg65ZTVnNt6VcN336aZkXwPsjndtmZlGWyhLNUu3SsIUJvFAgMBAAGj
+YzBhMB0GA1UdDgQWBBSy9TOWhcL1moqEDeJaemfu/clcyTBABgNVHREEOTA3gg5h
+bGVwaC5zdmtoay5jeoYlaHR0cHM6Ly9hbGVwaC5zdmtoay5jei9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAWjWUcrdsnu4coYaqXOPM89MOHqhmuel
+Jv955SMGEVDr9nyyy9+ql8xbQbOdHjAJRwu0VgIPlk87mdikX0+H6Xk1c6cp4ud+
+BgQHJMtZObkAh2+fkkCxiqBUkYGPb+5GqvUBkzZbmO3nfQQ8GbxpelYse1tMeiaJ
+gKBxdaXrBBD2s33bOOZ89IMuDQeUszifVCxeofaS9B5N+wplX8J0svGM0ggxCJoM
+x/KI5F8aCCKoDnAD/I8tYu0fTuIwg04I9WwduYCoTxxzAVQ6Ta1QwqDRqRib8QvY
+6/ioV7XeMqtOSAqWrOwCClb0vDVOjUnKJTSU9O8E5/eBCYzfVrVKdA==
+ </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>
+MIIDIzCCAgugAwIBAgIUEJlCdI6O+jqGU7O1e2RkV53yqJIwDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owHhcNMTUwODI4MTUwNzU4WhcN
+MzUwODI4MTUwNzU4WjAZMRcwFQYDVQQDDA5hbGVwaC5zdmtoay5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMBZOjdrxpmQqnkNeOqGdrSbB7YoV2M
+TWEsNm5lquQeV2zefrZVmjkolSeO1K0o3P4M4r12THBSsEFPIEWqbri7l0ti2GGh
+osSHaUMGGy73mznHgbSDXCW+WBc6hXMn5LFXkwQz88fTDRZ2tVfCIDT4bat07+gn
+VjYdokbBgVeoe+GXQEw4Oax1vjsGCvq3+e7kIw1rW7ieVGF8xAkyk9VFV3nEeIGm
+8aR/Bi3625PZO9F4n5JZ86rjVfI84rXaVig55z8nbH9kGYR4J2hHwM/BSO0vhBJC
+gQSvqdgNbO5SMOcKy0bbBKfPVkvANyKVt1FuE5GlCu/yA2Yb4oVgFKsCAwEAAaNj
+MGEwHQYDVR0OBBYEFFQTBSzOxH3LROx/bkBFyhuStmYrMEAGA1UdEQQ5MDeCDmFs
+ZXBoLnN2a2hrLmN6hiVodHRwczovL2FsZXBoLnN2a2hrLmN6L2lkcC9zaGliYm9s
+ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAwmzkKKSFElavD4lgIclbIn4TtjU0vkr2U
+okA6bfpYyG4YKJF1oYlIRANW0834HImncJ2p7zjVUDVOz4NG6L6P8+C2wq2b8m6u
+XsmlTHWoQq1uMK01weHzjkgRH7Ux/6MUBb/HWCB5o6TTf7QWGTnohudrsvw6rMvS
+kCOsKNdYHRUqduRImil9zI7oB3DgcMqKo+nc7ElXdpdZ+C14i+DmVOLsHyAdU/r+
+wI+5wsg5a318BqML9SybteAP3EtvV8gaDJNtDTtGxR26dUoxyfMBcr1pu0NWcbPx
+K6FU2egg9HD4BD1u6djYZV47aavLjJ0tSErfcHvrz5JMQrnbv3GZ
+ </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>
+MIIDIzCCAgugAwIBAgIUHR8h609/l5ZaqJVRDkOVK6KQWccwDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owHhcNMTUwODI4MTUwODAyWhcN
+MzUwODI4MTUwODAyWjAZMRcwFQYDVQQDDA5hbGVwaC5zdmtoay5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALNWuZY/XJorTyIeONFA6lhfBhhSOaYE
+2wtO0KNMlfqY0HPTDn2uPd2F06411wACW12RwyGErZRluedwaZeVdJfy05x3bXsu
+oGDm1o/JI0hLiH82BupYWAZsMhv6XBiv9F8DC+nKDIOKETElJ7mc80fTLMNPH9Bm
+ICvlXCNKdghfPZdAstZM4YpobGFk/0ZCjU5vWCew8ZOUTsMYtp52A4sGHpieGLXk
+0gejaQK8hG70K9GeaDaKm0UAE5780qM13NFBiBg+gIFYUXLxkVZsn7+hEA6YDewu
+Yq4pKdiFI2M7Aj+m4UucRzO237txeznDKKmSnrrgRG9UV7c9vHkhfpUCAwEAAaNj
+MGEwHQYDVR0OBBYEFM27r6xs8sW5D9dl0IVjah5S9ZZAMEAGA1UdEQQ5MDeCDmFs
+ZXBoLnN2a2hrLmN6hiVodHRwczovL2FsZXBoLnN2a2hrLmN6L2lkcC9zaGliYm9s
+ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAfwgwA9/oEx1jnywTpE+I+7omw9RN1McfA
+EN+vJDuGt0Vz8TcjRHUOGxwXHtbw4/aOkK48Drg/kIKY7dghuNeGJgd31bNsgvBj
+Zdecvn1G8TpRlTZXV71+EliO49zpNX8KSimobPkB+oHSMkt94HTljmka11yogiJi
+ycotZyPq8kGjGrFRh0InfIDfRGd9zD0v698moP8FzNlvckl3jL7tzT95QAA9dO21
+MpM8yEEOmngDz+D/LJeNJVT5cbvIZ3gpfm5yX16PyvFMXr8g9NMf/OhAznAHrL90
+xDF332t8sZ0yvjOOmIVyk2NtktyqGSqA7pRQRUZvzMHw15kyMzEM
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.cz: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="cs">Studijní a vědecká knihovna v Hradci Králové</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/cmi-nuig.calpendo.com-shibboleth.xml b/swamid-interfederations-2.0/cmi-nuig.calpendo.com-shibboleth.xml
new file mode 100644
index 00000000..253bfc26
--- /dev/null
+++ b/swamid-interfederations-2.0/cmi-nuig.calpendo.com-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cmi-nuig.calpendo.com/shibboleth">
+ <!--
+ This is a "Calpendo for National University of Ireland Galway" Shibboleth SP for Exprodo Software Limited.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <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-14T14:31:19Z">
+ <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://cmi-nuig.calpendo.com/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/Login" index="1"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/Login" index="2"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Calpendo for National University of Ireland Galway</mdui:DisplayName>
+ <mdui:Logo height="100" width="271">https://downloads.exprodo.com/images/exprodo-software_271x100.png</mdui:Logo>
+ <mdui:Description xml:lang="en">Core facility management, booking system and web-based database for research/clinical facilities.</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDHDCCAgSgAwIBAgIJALCR79ZDW2xvMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+ BAMTEHNoaWIuZXhwcm9kby5jb20wHhcNMTUwNjIyMTUyMTAxWhcNMjUwNjE5MTUy
+ MTAxWjAbMRkwFwYDVQQDExBzaGliLmV4cHJvZG8uY29tMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEAlihJNaZPZ3oGM5NQlpgwJUJxlWZ8rbWrx9Kk5rPB
+ 4Fb0C6CH+YIOKHb9sxVXPL5Vi9JypYE0Y7JRFEKf7qzbFNTEDAKhq0hjJ+XMWiVq
+ PJjbKYW4LJtM05DoPpTe/gKZJRaktGUDGu8m5ifLtd7klhFQmV0duDriDEPiW4ik
+ LeYZGiReIkvWSx4kFnQbERYuyrjXPOnhKw8pnv4HuzR/Js4tmUQbMy9VPbjbWSET
+ o2x9TfCubitIiOguXNGU8hcOv+ys/sWKTddPQ8208qpsfQLo+YSm9NmYDn3bJ3tg
+ SdA/9OTLJSjTZrz7RUZUeCYF/yv0vhRpicDDg1Ym8kdtCQIDAQABo2MwYTBABgNV
+ HREEOTA3ghBzaGliLmV4cHJvZG8uY29thiNodHRwczovL3NoaWIuZXhwcm9kby5j
+ b20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU7xBaV9vU2BCTDlQLhTkL5L6/1ckwDQYJ
+ KoZIhvcNAQEFBQADggEBAChUHGR1vS+giyhBJLy6gvfWFpfmo6dJlVn9zTIiztus
+ SNX3AR7Xe3KLO+YV/8r1vUz5WO+xnUwFQd7Et20M5oeeZqbDqyPJqynepUZ3NeE5
+ GfzERa8Rdvr6t6HoY0H19u0IMiMemtxQpFDt2uLtkawJLw7L3A2hUdbVta8MyUAQ
+ 7WV7raxbNae56DlNuivOY2kkEl9T39xiLNpQ4cHtB2Z1uGLxPcE49j1AzfAM5ugk
+ 29ai5m2neGiTzsvlEvw88pW7CMGcfZEPNsDA4zbQNTAu0FYIhrP60+OifLLZoMen
+ lT/unHR4GJe4dtKbypAo6cvgW2Uu7aCV0wO0ni7MiCE=
+ </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://cmi-nuig.calpendo.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AttributeConsumingService index="0">
+ <ServiceName xml:lang="en">Calpendo for National University of Ireland Galway</ServiceName>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Exprodo Software Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Calpendo for National University of Ireland Galway</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.exprodo.com</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Paul</GivenName>
+ <SurName>Robinson</SurName>
+ <EmailAddress>mailto:paul@exprodo.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Paul</GivenName>
+ <SurName>Robinson</SurName>
+ <EmailAddress>mailto:paul@exprodo.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cmu-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/cmu-shib.hosted.exlibrisgroup.com-shib.xml
new file mode 100644
index 00000000..782cd21e
--- /dev/null
+++ b/swamid-interfederations-2.0/cmu-shib.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cmu-shib.hosted.exlibrisgroup.com/shib">
+ <!--
+ This is a "Cardiff Metropolitan University - Primo" Shibboleth SP for Ex Libris (UK) Limited.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <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-21T10:10:11Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Cardiff Metropolitan University - Primo</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of Cardiff Metropolitan University</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC3DCCAcSgAwIBAgIJAKKaSFTxV8dnMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+ BAMTB2FpbzAwNDEwHhcNMTUwOTA5MTQ1NzE3WhcNMjUwOTA2MTQ1NzE3WjASMRAw
+ DgYDVQQDEwdhaW8wMDQxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ 7HenNoKW0sOzOSke2fmV1ttG/lSbImzvmxlxS5EW6o2Nh01usJSdf3ImvVCPEut1
+ 0Yn2uN/tXs+aU+nL3fyF5jFZCv6E134FkmJ/cWQj+cNWjlrlt0BB2m42Zzy/pdtv
+ FAtQ36NfwmAVmhY+ceSktAKu783KGXQ5e9h/BZLHCojYT7vWHVINI0GIQymKJHm7
+ HrGXw50/HlCkTVAzKOcnvgmbnQQaPEd4/8OWyn9DfQoICt0PdXLOC5nyBRXfJeaq
+ 4JjZGPRq4Au4Dxgd0eWnjSnBHM4bscmwea4Pu37yfHdR2ayUmAU4bytT/+j0WdkU
+ QQDNkO3GT0742gl3x4iQ4wIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDQxMB0G
+ A1UdDgQWBBS3KSf/jmUF/5mPQMRe2U33IJwb/zANBgkqhkiG9w0BAQUFAAOCAQEA
+ 0B9MYZK5HPyBkupXmCZ4bcWl/MN7m8CiVNeNqSJIsDvYYJz1jTr2FMIwY+xupjtK
+ dDpowahzmGwZaZtgb0PUynPOjZvcYvauSKni5NNii1R3MaGiw4sT7qusccl8aTcb
+ V5MRLYCeOvv2R5JA14kmLUko3QVlAi3Vetz/Q60BREl2g1rc5KLsN8vkD8iHlmqt
+ 6Zh+TeL2kcw9MHTCHhPD7h1u4dEAuq827QzHqcTeJRPIrJOyDbuwTbBT6Xe9roY9
+ fIcDUibGOVOFVQkAUqV2gNUJfQgqkfbQGQJjeD3b7zNwTbpMaXwt/LCVNIJaWrwL
+ bzjnfQcDrmHF1208OcY8Hw==
+ </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://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Cardiff Metropolitan University - Primo</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Benoit</GivenName>
+ <SurName>Ginestet</SurName>
+ <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Benoit</GivenName>
+ <SurName>Ginestet</SurName>
+ <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml
index 0866b4f5..f40f8606 100644
--- a/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml
@@ -4,6 +4,12 @@
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-08-03T00:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</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>
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 a828a6da..179c4313 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
@@ -315,6 +315,12 @@
<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>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-velikigaber.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kidricevo.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslasko.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-marijevere.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osribnicanapohorju.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">makspecar.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.irf.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
index 3f46ccdf..e252d5b1 100644
--- a/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
@@ -106,7 +106,7 @@ XCYbfP8E3cs4MB+K
<md:ContactPerson contactType="administrative">
<md:Company>Swedish Institute of Space Physics</md:Company>
<md:SurName>Mats Luspa</md:SurName>
- <md:EmailAddress>datagruppen@irf,se</md:EmailAddress>
+ <md:EmailAddress>datagruppen@irf.se</md:EmailAddress>
<md:TelephoneNumber>+4698079000</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
index 094f7d42..647d8b02 100644
--- a/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
@@ -14,6 +14,8 @@
<mdui:DisplayName xml:lang="en">Forschungszentrum Jülich GmbH</mdui:DisplayName>
<mdui:Description xml:lang="de">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
<mdui:Description xml:lang="en">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
+ <mdui:Logo height="16" width="16">https://apps.fz-juelich.de/logos/Juelich-J-16x16.png</mdui:Logo>
+ <mdui:Logo height="114" width="350">https://apps.fz-juelich.de/logos/Logo_FZ_Juelich_350x114.png</mdui:Logo>
<mdui:InformationURL xml:lang="de">http://www.fz-juelich.de</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.fz-juelich.de</mdui:InformationURL>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
index c504b0af..2683d197 100644
--- a/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
@@ -11,7 +11,7 @@
</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: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>
<eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
<eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
@@ -32,25 +32,24 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUMysVZyotzMFN08smrMEjxr7cBg4wDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQa2F0YWxvZy5zdmtvcy5jejAeFw0xMzExMTEyMDIxMjJa
-Fw0zMzExMTEyMDIxMjJaMBsxGTAXBgNVBAMTEGthdGFsb2cuc3Zrb3MuY3owggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMXDtGvbcdogNvhJbrKZmDxFqb
-9VJ33XYnH+mBPdndP5kMDcE70SZqBpJQlP4JP+0GvETydNlHnK/t7TUE8SyRV+5y
-dLMeuFnAvP4So2OGfJfcivVizSvNSKuiYWBO2c7z90E3e0qBET0/gBSZ/lMvNSu5
-GS7Xe3+j35NGUiwGIzRglMKOAPxiA+szn0wIBsG7JhMdHuZMUASeVJewAxlPVv1p
-C7BrtRYVPmHm8xfqoTFg9RJz8nWDfugKLOPeVfdB17UwQICMYLM6pCvCmDGZ3SFz
-k83oy1GqWnfsXasaEWAL9VpQI5keYO34kgjRadlrSCjaMCSwPEgII6Z7J88HAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGthdGFsb2cuc3Zrb3MuY3qGJ2h0dHBzOi8va2F0
-YWxvZy5zdmtvcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS5NR0hEzdvRO
-kCB+T+bV6A3WQG8wDQYJKoZIhvcNAQEFBQADggEBAHVlLp4Vdb1zrlGQVO0AZBoz
-pPpRx2+MW9nasMPsd8ybYW/mbvAQU1c1MaUCK+rRk3Tu+Jj08A6YJOY5x/yLXxjh
-Us6l6JqIDYn6M/44vMf0fH+DkA40zfnpI8fv07O5Oc8EV1MsBdQm6zBh19MmDxY8
-diuVwTi1E9kR6Q3RIzhH1TERBDOpIfsUGVv5IHywYlUYsxYfOy6A0FjEtenMpfsI
-4NMjUoYVfnC0z5aWU7Vdu5LJIfkNj4HCuxLZur7NBvX3UTEuegzZRewy5edw+/hp
-K1WmgwfZhpsu54HYP1WZcpvCC4nCiZ9b1wiwdAixsl/orsvhTGeJVLtV1MbEaHY=
-
- </ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUOaQEEERrbashpZa05w//pJQCTE0wDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQa2F0YWxvZy5zdmtvcy5jejAeFw0xNTA4MTIyMTE4NTla
+Fw0yNTA4MTIyMTE4NTlaMBsxGTAXBgNVBAMMEGthdGFsb2cuc3Zrb3MuY3owggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClR0WK0cmbSWU8RArh2svrRpft
+S4nHdg41jsbx0uKJWmpjVpxzIO8t1fpvgQEdjSM2mIBBuSeCpBX+O1Hogk8H7d1Y
+h4LLEkGKiBLQNZRxKueDGc1Pc54+iYy6oMcl1fhaoqphSkW9CqJXGb8lGEnfa8+t
++MO62kESeTV/9L1fHb0exJgqzCrml/Byev7uXdaqRWqRVeXxy6eXlWhlLGwkPXMf
+9CbIyE5DyXHUupoJu8aiNh11JuR1VgZLUoOOS3yHE53HK200pISag+PIqc2g6hAw
+GHOjKJRcUrZSaqKKRvv39TLwqq9gPL3pSUVJ+G7GYc+mBFpclz/g+H/cCt0vAgMB
+AAGjZzBlMB0GA1UdDgQWBBQx4EEeJ3tf34XxGVnEpsE1hXAfTjBEBgNVHREEPTA7
+ghBrYXRhbG9nLnN2a29zLmN6hidodHRwczovL2thdGFsb2cuc3Zrb3MuY3ovaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACPiFGXFPzxPH/eTQKbJT5lP
+yOcSE2rtal8W4QDrkE4hU220t/JjQVsRzKMnvsv/rgY6CzEYcMkPitPjJoJXmLWY
+JZaaTxx0LosXA0MU8wBj6JKTMSDJ/EEkJOQuak+2lxxwv6greAAe/Ye+6x1fqN1h
+JE6TMVker9+t4OjM0aTX5LeBvJs7ZKwbTDsnm9y9I8EPwtPnX96M3cd/D7H5h4mF
+UUObFs5lyLqvErUgn3FwKNMmi2FrTI0J1HQtLx87hfeUvriApTOW/apm+kqWE6P5
+iZxetNC82lCt7vGHOz5cXzYN2MEuqqCvAM2dTLO7rRhrSctONV0qrHlg1vZ4Vbw=
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -58,6 +57,7 @@ K1WmgwfZhpsu54HYP1WZcpvCC4nCiZ9b1wiwdAixsl/orsvhTGeJVLtV1MbEaHY=
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/idp/profile/SAML2/Redirect/SLO"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz: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>
@@ -67,7 +67,7 @@ K1WmgwfZhpsu54HYP1WZcpvCC4nCiZ9b1wiwdAixsl/orsvhTGeJVLtV1MbEaHY=
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/idp/profile/SAML2/Redirect/SSO"/>
</md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkos.cz</shibmd:Scope>
</md:Extensions>
@@ -75,33 +75,29 @@ K1WmgwfZhpsu54HYP1WZcpvCC4nCiZ9b1wiwdAixsl/orsvhTGeJVLtV1MbEaHY=
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUMysVZyotzMFN08smrMEjxr7cBg4wDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQa2F0YWxvZy5zdmtvcy5jejAeFw0xMzExMTEyMDIxMjJa
-Fw0zMzExMTEyMDIxMjJaMBsxGTAXBgNVBAMTEGthdGFsb2cuc3Zrb3MuY3owggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMXDtGvbcdogNvhJbrKZmDxFqb
-9VJ33XYnH+mBPdndP5kMDcE70SZqBpJQlP4JP+0GvETydNlHnK/t7TUE8SyRV+5y
-dLMeuFnAvP4So2OGfJfcivVizSvNSKuiYWBO2c7z90E3e0qBET0/gBSZ/lMvNSu5
-GS7Xe3+j35NGUiwGIzRglMKOAPxiA+szn0wIBsG7JhMdHuZMUASeVJewAxlPVv1p
-C7BrtRYVPmHm8xfqoTFg9RJz8nWDfugKLOPeVfdB17UwQICMYLM6pCvCmDGZ3SFz
-k83oy1GqWnfsXasaEWAL9VpQI5keYO34kgjRadlrSCjaMCSwPEgII6Z7J88HAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGthdGFsb2cuc3Zrb3MuY3qGJ2h0dHBzOi8va2F0
-YWxvZy5zdmtvcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS5NR0hEzdvRO
-kCB+T+bV6A3WQG8wDQYJKoZIhvcNAQEFBQADggEBAHVlLp4Vdb1zrlGQVO0AZBoz
-pPpRx2+MW9nasMPsd8ybYW/mbvAQU1c1MaUCK+rRk3Tu+Jj08A6YJOY5x/yLXxjh
-Us6l6JqIDYn6M/44vMf0fH+DkA40zfnpI8fv07O5Oc8EV1MsBdQm6zBh19MmDxY8
-diuVwTi1E9kR6Q3RIzhH1TERBDOpIfsUGVv5IHywYlUYsxYfOy6A0FjEtenMpfsI
-4NMjUoYVfnC0z5aWU7Vdu5LJIfkNj4HCuxLZur7NBvX3UTEuegzZRewy5edw+/hp
-K1WmgwfZhpsu54HYP1WZcpvCC4nCiZ9b1wiwdAixsl/orsvhTGeJVLtV1MbEaHY=
-
- </ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUOaQEEERrbashpZa05w//pJQCTE0wDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQa2F0YWxvZy5zdmtvcy5jejAeFw0xNTA4MTIyMTE4NTla
+Fw0yNTA4MTIyMTE4NTlaMBsxGTAXBgNVBAMMEGthdGFsb2cuc3Zrb3MuY3owggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClR0WK0cmbSWU8RArh2svrRpft
+S4nHdg41jsbx0uKJWmpjVpxzIO8t1fpvgQEdjSM2mIBBuSeCpBX+O1Hogk8H7d1Y
+h4LLEkGKiBLQNZRxKueDGc1Pc54+iYy6oMcl1fhaoqphSkW9CqJXGb8lGEnfa8+t
++MO62kESeTV/9L1fHb0exJgqzCrml/Byev7uXdaqRWqRVeXxy6eXlWhlLGwkPXMf
+9CbIyE5DyXHUupoJu8aiNh11JuR1VgZLUoOOS3yHE53HK200pISag+PIqc2g6hAw
+GHOjKJRcUrZSaqKKRvv39TLwqq9gPL3pSUVJ+G7GYc+mBFpclz/g+H/cCt0vAgMB
+AAGjZzBlMB0GA1UdDgQWBBQx4EEeJ3tf34XxGVnEpsE1hXAfTjBEBgNVHREEPTA7
+ghBrYXRhbG9nLnN2a29zLmN6hidodHRwczovL2thdGFsb2cuc3Zrb3MuY3ovaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACPiFGXFPzxPH/eTQKbJT5lP
+yOcSE2rtal8W4QDrkE4hU220t/JjQVsRzKMnvsv/rgY6CzEYcMkPitPjJoJXmLWY
+JZaaTxx0LosXA0MU8wBj6JKTMSDJ/EEkJOQuak+2lxxwv6greAAe/Ye+6x1fqN1h
+JE6TMVker9+t4OjM0aTX5LeBvJs7ZKwbTDsnm9y9I8EPwtPnX96M3cd/D7H5h4mF
+UUObFs5lyLqvErUgn3FwKNMmi2FrTI0J1HQtLx87hfeUvriApTOW/apm+kqWE6P5
+iZxetNC82lCt7vGHOz5cXzYN2MEuqqCvAM2dTLO7rRhrSctONV0qrHlg1vZ4Vbw=
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://katalog.svkos.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz: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="cs">Moravskoslezská vědecká knihovna v Ostravě</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml b/swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml
index 02c90a29..591223cd 100644
--- a/swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml
+++ b/swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml
@@ -16,7 +16,7 @@
<md:Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="hu">MTA Sztaki Munkatársak</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">MTA Sztaki staffs</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">MTA Sztaki staff</mdui:DisplayName>
<mdui:Description xml:lang="hu">Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</mdui:Description>
<mdui:Description xml:lang="en">Hungarian Academy of Sciences Institute for Computer Science and Control</mdui:Description>
<mdui:InformationURL xml:lang="hu">http://www.sztaki.hu</mdui:InformationURL>
diff --git a/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
index 56fd2623..55cadbda 100644
--- a/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
@@ -12,8 +12,13 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">National Technical University of Athens</mdui:DisplayName>
<mdui:DisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</mdui:DisplayName>
- <mdui:InformationURL xml:lang="en">https://login.ntua.gr/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="el">https://login.ntua.gr/</mdui:InformationURL>
+ <mdui:Description xml:lang="en">National Technical University of Athens Identity Provider</mdui:Description>
+ <mdui:Description xml:lang="el">Υπηρεσία Ταυτότητας του Εθνικού Μετσόβιου Πολυτεχνείου</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.noc.ntua.gr/login</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="el">http://www.noc.ntua.gr/login</mdui:InformationURL>
+ <mdui:Logo width="300" height="302">http://www.ntua.gr/images/logo/pyrforos300.png</mdui:Logo>
+ <mdui:Logo width="150" height="151">http://www.ntua.gr/images/logo/pyrforos150.png</mdui:Logo>
+ <mdui:Logo width="50" height="50">http://www.ntua.gr/images/logo/pyrforos50.png</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DomainHint>ntua.gr</mdui:DomainHint>
@@ -25,39 +30,6 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEmzCCA4OgAwIBAgIBTDANBgkqhkiG9w0BAQUFADA4MQswCQYDVQQGEwJHUjEN
- MAsGA1UEChMETlRVQTEaMBgGA1UEAxMRTlRVQSBDQSAyMDA2LTIwMTgwHhcNMDcw
- MzIzMTE0NjAyWhcNMTcwMzIwMTE0NjAyWjBTMQswCQYDVQQGEwJncjENMAsGA1UE
- ChMEbnR1YTEQMA4GA1UECxMHc2VydmVyczEWMBQGA1UEAxMNbG9naW4ubnR1YS5n
- cjELMAkGA1UEBRMCNzYwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZ9Qnww
- BRe5Kc0EYuVdbkMASUIBc624cYA8QCv9e0S769ePElXSndg7caaSRXG8pN4gkc9+
- LUhvqefUt3ihIDsOIcdDW1tGOJ5b9UH9zjRpUCjubKOcYSxaxFjs+15RGhMweSwm
- DwYcFLpmDvFC7vbh+X8rt5ri4S3YSpT9eZdVAgMBAAGjggIXMIICEzAJBgNVHRME
- AjAAMEwGA1UdIARFMEMwDQYLKwYBBAGHSQMCAQEwMgYLKwYBBAGHSQMBAQEwIzAh
- BggrBgEFBQcCARYVaHR0cDovL2NhLm50dWEuZ3IvY3BzMBEGCWCGSAGG+EIBAQQE
- AwIGQDALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIQYJYIZIAYb4
- QgENBBQWEldXVy1TZXJ2ZXIgb2YgTlRVQTAdBgNVHQ4EFgQUiEqRWLpVT7bpJ6K4
- 9EfC0UPUGpkwWwYDVR0jBFQwUoAUfNqsx+A0dIrLwYwYsWoolK95CJWhN6Q1MDMx
- CzAJBgNVBAYTAkdSMQ0wCwYDVQQKEwROVFVBMRUwEwYDVQQDEwxOVFVBIFJPT1Qg
- Q0GCAQIwLwYDVR0RBCgwJoEPbm9jQG5vYy5udHVhLmdyhwSTZt7dgg1sb2dpbi5u
- dHVhLmdyMBUGA1UdEgQOMAyBCmNhQG50dWEuZ3IwMgYJYIZIAYb4QgEEBCUWI2h0
- dHA6Ly9jYS5udHVhLmdyL3B1Yi9jcmwvY2FjcmwuY3JsMDIGCWCGSAGG+EIBAwQl
- FiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDA0BgNVHR8ELTAr
- MCmgJ6AlhiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDANBgkq
- hkiG9w0BAQUFAAOCAQEAXHXewa99f7iIlhvgdMWp6NXfT9TG9FCGWhtO2V5GeUii
- 2TBYddAH6+tYrVlJ4cN6p444Dhvin8eVA/Y0WfeVll4YasViq6zxSH9FLZkszbKr
- f7CfFyYqChsjcrn/oGJWsfsqGqMGPfdAQSkkpyGOHVMMARCY+gP0S973yK89frkA
- QGG+elGtKx786IeEEbm4YS4Z0VMkD3obJk/QRmiy6lvHadODGcpiGLCZq9G1Es2i
- mcNedy126VjwlNcg6XBbl0shvgGkjqzA89TPFY/FwtklJGfNl8SP88p8I41CsM8Q
- /PFGb40C/OoiQncMfOelJJXz6O+w4jNGdUoJdTCpdQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -96,39 +68,6 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEmzCCA4OgAwIBAgIBTDANBgkqhkiG9w0BAQUFADA4MQswCQYDVQQGEwJHUjEN
- MAsGA1UEChMETlRVQTEaMBgGA1UEAxMRTlRVQSBDQSAyMDA2LTIwMTgwHhcNMDcw
- MzIzMTE0NjAyWhcNMTcwMzIwMTE0NjAyWjBTMQswCQYDVQQGEwJncjENMAsGA1UE
- ChMEbnR1YTEQMA4GA1UECxMHc2VydmVyczEWMBQGA1UEAxMNbG9naW4ubnR1YS5n
- cjELMAkGA1UEBRMCNzYwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZ9Qnww
- BRe5Kc0EYuVdbkMASUIBc624cYA8QCv9e0S769ePElXSndg7caaSRXG8pN4gkc9+
- LUhvqefUt3ihIDsOIcdDW1tGOJ5b9UH9zjRpUCjubKOcYSxaxFjs+15RGhMweSwm
- DwYcFLpmDvFC7vbh+X8rt5ri4S3YSpT9eZdVAgMBAAGjggIXMIICEzAJBgNVHRME
- AjAAMEwGA1UdIARFMEMwDQYLKwYBBAGHSQMCAQEwMgYLKwYBBAGHSQMBAQEwIzAh
- BggrBgEFBQcCARYVaHR0cDovL2NhLm50dWEuZ3IvY3BzMBEGCWCGSAGG+EIBAQQE
- AwIGQDALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIQYJYIZIAYb4
- QgENBBQWEldXVy1TZXJ2ZXIgb2YgTlRVQTAdBgNVHQ4EFgQUiEqRWLpVT7bpJ6K4
- 9EfC0UPUGpkwWwYDVR0jBFQwUoAUfNqsx+A0dIrLwYwYsWoolK95CJWhN6Q1MDMx
- CzAJBgNVBAYTAkdSMQ0wCwYDVQQKEwROVFVBMRUwEwYDVQQDEwxOVFVBIFJPT1Qg
- Q0GCAQIwLwYDVR0RBCgwJoEPbm9jQG5vYy5udHVhLmdyhwSTZt7dgg1sb2dpbi5u
- dHVhLmdyMBUGA1UdEgQOMAyBCmNhQG50dWEuZ3IwMgYJYIZIAYb4QgEEBCUWI2h0
- dHA6Ly9jYS5udHVhLmdyL3B1Yi9jcmwvY2FjcmwuY3JsMDIGCWCGSAGG+EIBAwQl
- FiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDA0BgNVHR8ELTAr
- MCmgJ6AlhiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDANBgkq
- hkiG9w0BAQUFAAOCAQEAXHXewa99f7iIlhvgdMWp6NXfT9TG9FCGWhtO2V5GeUii
- 2TBYddAH6+tYrVlJ4cN6p444Dhvin8eVA/Y0WfeVll4YasViq6zxSH9FLZkszbKr
- f7CfFyYqChsjcrn/oGJWsfsqGqMGPfdAQSkkpyGOHVMMARCY+gP0S973yK89frkA
- QGG+elGtKx786IeEEbm4YS4Z0VMkD3obJk/QRmiy6lvHadODGcpiGLCZq9G1Es2i
- mcNedy126VjwlNcg6XBbl0shvgGkjqzA89TPFY/FwtklJGfNl8SP88p8I41CsM8Q
- /PFGb40C/OoiQncMfOelJJXz6O+w4jNGdUoJdTCpdQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -156,20 +95,26 @@
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">National Technical University of Athens</md:OrganizationName>
- <md:OrganizationName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">NTUA</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">ΕΜΠ</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">National Technical University of Athens</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ntua.gr/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="el">http://www.ntua.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.ntua.gr</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.ntua.gr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:Company>National Technical University of Athens - Network Management Center</md:Company>
- <md:EmailAddress>noc@noc.ntua.gr</md:EmailAddress>
+ <md:Company>National Technical University of Athens</md:Company>
+ <md:EmailAddress>mailto:noc@ntua.gr</md:EmailAddress>
+ <md:TelephoneNumber>+30-210-772-1861</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
- <md:Company>National Technical University of Athens - Network Management Center</md:Company>
- <md:EmailAddress>help-data@noc.ntua.gr</md:EmailAddress>
+ <md:Company>National Technical University of Athens</md:Company>
+ <md:GivenName>NOC Helpdesk</md:GivenName>
+ <md:EmailAddress>mailto:help-data@noc.ntua.gr</md:EmailAddress>
<md:TelephoneNumber>+30-210-772-1861</md:TelephoneNumber>
</md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Ourania Lambrou</md:GivenName>
+ <md:EmailAddress>mailto:rania@noc.ntua.gr</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
index d7875d29..dde0154a 100644
--- a/swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml
@@ -200,4 +200,9 @@ wM4RQ5jYrtF1hkeVKs5UhXdsWc0V+1SvBj23fjXaXHj1QadlFr9Hzcg=
<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:ContactPerson contactType="technical">
+ <md:GivenName>Sekcja Obsługi Informatycznej</md:GivenName>
+ <md:SurName>UMCS</md:SurName>
+ <md:EmailAddress>mailto:usosweb@umcs.pl</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml b/swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml
index ffe5a837..8c97358d 100644
--- a/swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml
@@ -60,65 +60,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 use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDKTCCAhGgAwIBAgIJAOIR3F6LuGvGMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
- BAMTDG11c2Uuamh1LmVkdTAeFw0xMDEwMTgxNjE0MDlaFw0xNTEwMTcxNjE0MDla
- MBcxFTATBgNVBAMTDG11c2Uuamh1LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBAKXSvhMUByiNmgMXXR8H8ilO8erIEV/I3k/P71sm0M1lcQLzRusJ
- u0NUg00MY8D1SQZ8MYNspyL09m1uROJCwG9o8dZK1Xv5ERGCyDlKgV5riXeZvG5z
- w+3oK7FEmvTIfd+Y8PwD23AWs5rmSEjBkmSK8zEyA2uGjScIm3COxsQyPSxSR85m
- zQMpPme2nqLVNhtZ5vKOfNcsTkuuYtfm6rBC0Ioou3upu39G4tSIoaIy24XxT+RS
- O0uahKG9ACm3l9kORefakFd5dReNNEROBiG9j/ciKVgRfO9e9AH15GAgYwa/wwwW
- vTbWsWCIbHJWh+ZrToA3M1deLBZumUxe00ECAwEAAaN4MHYwHQYDVR0OBBYEFCw/
- zCg/0ZwGiY1V1jFOvRx4Ree/MEcGA1UdIwRAMD6AFCw/zCg/0ZwGiY1V1jFOvRx4
- Ree/oRukGTAXMRUwEwYDVQQDEwxtdXNlLmpodS5lZHWCCQDiEdxei7hrxjAMBgNV
- HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAzBTom6sXDhCiBDr5y+l+BezNf
- qaUIgKnPav1eTgtxKGjeMlkSsu17dcbtit4twdnLZ9JGr6waAzNGDTNEKB4c+kNe
- mFKzanCcUbBkM7mX/SolEAWk2MN5q3CPbsYroZKzfDMTuNGrnWrWOOVwAQ4vuraG
- ispnohZ9z4ZZB9oNdJvVIz6bGdygJ//l0kO2dtmrvoaz0NCJVIpfWUyGm6cCT7ou
- lGiItHq08I4MlLGBb745LccJFBtEcR/crSN1ZIO6PXho3CYj8rtb58O4tntsXVK1
- 9MpcCwdbUHRyxyZPqy0FehjRRzPeiNXzoFkFcf8b1TfjG3luyUDnnGVT+B/D
- </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>
- MIIDKTCCAhGgAwIBAgIJAOIR3F6LuGvGMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
- BAMTDG11c2Uuamh1LmVkdTAeFw0xMDEwMTgxNjE0MDlaFw0xNTEwMTcxNjE0MDla
- MBcxFTATBgNVBAMTDG11c2Uuamh1LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
- ADCCAQoCggEBAKXSvhMUByiNmgMXXR8H8ilO8erIEV/I3k/P71sm0M1lcQLzRusJ
- u0NUg00MY8D1SQZ8MYNspyL09m1uROJCwG9o8dZK1Xv5ERGCyDlKgV5riXeZvG5z
- w+3oK7FEmvTIfd+Y8PwD23AWs5rmSEjBkmSK8zEyA2uGjScIm3COxsQyPSxSR85m
- zQMpPme2nqLVNhtZ5vKOfNcsTkuuYtfm6rBC0Ioou3upu39G4tSIoaIy24XxT+RS
- O0uahKG9ACm3l9kORefakFd5dReNNEROBiG9j/ciKVgRfO9e9AH15GAgYwa/wwwW
- vTbWsWCIbHJWh+ZrToA3M1deLBZumUxe00ECAwEAAaN4MHYwHQYDVR0OBBYEFCw/
- zCg/0ZwGiY1V1jFOvRx4Ree/MEcGA1UdIwRAMD6AFCw/zCg/0ZwGiY1V1jFOvRx4
- Ree/oRukGTAXMRUwEwYDVQQDEwxtdXNlLmpodS5lZHWCCQDiEdxei7hrxjAMBgNV
- HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAzBTom6sXDhCiBDr5y+l+BezNf
- qaUIgKnPav1eTgtxKGjeMlkSsu17dcbtit4twdnLZ9JGr6waAzNGDTNEKB4c+kNe
- mFKzanCcUbBkM7mX/SolEAWk2MN5q3CPbsYroZKzfDMTuNGrnWrWOOVwAQ4vuraG
- ispnohZ9z4ZZB9oNdJvVIz6bGdygJ//l0kO2dtmrvoaz0NCJVIpfWUyGm6cCT7ou
- lGiItHq08I4MlLGBb745LccJFBtEcR/crSN1ZIO6PXho3CYj8rtb58O4tntsXVK1
- 9MpcCwdbUHRyxyZPqy0FehjRRzPeiNXzoFkFcf8b1TfjG3luyUDnnGVT+B/D
- </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://muse.jhu.edu/Shibboleth.sso/Artifact/SOAP" index="1"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/SOAP"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/Redirect"/>
diff --git a/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml
index 78718610..740edc2c 100644
--- a/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml
@@ -73,13 +73,13 @@
<OrganizationURL xml:lang="en">http://www.reading.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Celia</GivenName>
- <SurName>Ayres</SurName>
- <EmailAddress>mailto:c.a.ayres@reading.ac.uk</EmailAddress>
+ <GivenName>Sue</GivenName>
+ <SurName>Egleton</SurName>
+ <EmailAddress>mailto:s.egleton@reading.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Neal</GivenName>
- <SurName>Curran</SurName>
- <EmailAddress>mailto:j.n.curran@reading.ac.uk</EmailAddress>
+ <GivenName>Chris</GivenName>
+ <SurName>Chapman</SurName>
+ <EmailAddress>mailto:c.d.chapman@reading.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml b/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml
index fd3a74e5..21e9dbf1 100644
--- a/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml
+++ b/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml
@@ -80,13 +80,13 @@
<OrganizationURL xml:lang="en">http://www.reading.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Celia</GivenName>
- <SurName>Ayres</SurName>
- <EmailAddress>mailto:c.a.ayres@reading.ac.uk</EmailAddress>
+ <GivenName>Sue</GivenName>
+ <SurName>Egleton</SurName>
+ <EmailAddress>mailto:s.egleton@reading.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Neal</GivenName>
- <SurName>Curran</SurName>
- <EmailAddress>mailto:j.n.curran@reading.ac.uk</EmailAddress>
+ <GivenName>Chris</GivenName>
+ <SurName>Chapman</SurName>
+ <EmailAddress>mailto:c.d.chapman@reading.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml b/swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml
new file mode 100644
index 00000000..7f65c1d0
--- /dev/null
+++ b/swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sci-bath.calpendo.com/shibboleth">
+ <!--
+ This is a "Calpendo for University of Bath" Shibboleth SP for Exprodo Software Limited.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <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-14T14:30:23Z">
+ <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://sci-bath.calpendo.com/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Login" index="1"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Login" index="2"/>
+ <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://sci-bath.calpendo.com/Shibboleth.sso/Login" index="3"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Calpendo for University of Bath</mdui:DisplayName>
+ <mdui:Logo height="100" width="271">https://downloads.exprodo.com/images/exprodo-software_271x100.png</mdui:Logo>
+ <mdui:Description xml:lang="en">Core facility management, booking system and web-based database for research/clinical facilities.</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDHDCCAgSgAwIBAgIJALCR79ZDW2xvMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+ BAMTEHNoaWIuZXhwcm9kby5jb20wHhcNMTUwNjIyMTUyMTAxWhcNMjUwNjE5MTUy
+ MTAxWjAbMRkwFwYDVQQDExBzaGliLmV4cHJvZG8uY29tMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEAlihJNaZPZ3oGM5NQlpgwJUJxlWZ8rbWrx9Kk5rPB
+ 4Fb0C6CH+YIOKHb9sxVXPL5Vi9JypYE0Y7JRFEKf7qzbFNTEDAKhq0hjJ+XMWiVq
+ PJjbKYW4LJtM05DoPpTe/gKZJRaktGUDGu8m5ifLtd7klhFQmV0duDriDEPiW4ik
+ LeYZGiReIkvWSx4kFnQbERYuyrjXPOnhKw8pnv4HuzR/Js4tmUQbMy9VPbjbWSET
+ o2x9TfCubitIiOguXNGU8hcOv+ys/sWKTddPQ8208qpsfQLo+YSm9NmYDn3bJ3tg
+ SdA/9OTLJSjTZrz7RUZUeCYF/yv0vhRpicDDg1Ym8kdtCQIDAQABo2MwYTBABgNV
+ HREEOTA3ghBzaGliLmV4cHJvZG8uY29thiNodHRwczovL3NoaWIuZXhwcm9kby5j
+ b20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU7xBaV9vU2BCTDlQLhTkL5L6/1ckwDQYJ
+ KoZIhvcNAQEFBQADggEBAChUHGR1vS+giyhBJLy6gvfWFpfmo6dJlVn9zTIiztus
+ SNX3AR7Xe3KLO+YV/8r1vUz5WO+xnUwFQd7Et20M5oeeZqbDqyPJqynepUZ3NeE5
+ GfzERa8Rdvr6t6HoY0H19u0IMiMemtxQpFDt2uLtkawJLw7L3A2hUdbVta8MyUAQ
+ 7WV7raxbNae56DlNuivOY2kkEl9T39xiLNpQ4cHtB2Z1uGLxPcE49j1AzfAM5ugk
+ 29ai5m2neGiTzsvlEvw88pW7CMGcfZEPNsDA4zbQNTAu0FYIhrP60+OifLLZoMen
+ lT/unHR4GJe4dtKbypAo6cvgW2Uu7aCV0wO0ni7MiCE=
+ </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://sci-bath.calpendo.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AttributeConsumingService index="0">
+ <ServiceName xml:lang="en">Calpendo for University of Bath</ServiceName>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Exprodo Software Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Calpendo for University of Bath</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.exprodo.com</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Paul</GivenName>
+ <SurName>Robinson</SurName>
+ <EmailAddress>mailto:paul@exprodo.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Paul</GivenName>
+ <SurName>Robinson</SurName>
+ <EmailAddress>mailto:paul@exprodo.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index 3a6e6d79..1cfa40b1 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -7,8 +7,8 @@
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
diff --git a/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..e02be295
--- /dev/null
+++ b/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ssl.education.lu/saml/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-09-22T08:30:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-10.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">MENJE-CGIE IAM Users</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">MENJE-CGIE IAM Utilisateurs</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="de">MENJE-CGIE IAM Benutzer</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="lb">MENJE-CGIE IAM Benotzer</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for IAM end users of the Ministry of Education</mdui:Description>
+ <mdui:Description xml:lang="fr">Fournisseur d'Identité IAM pour les utilisateurs du Ministère de l'Éducation nationale</mdui:Description>
+ <mdui:Description xml:lang="de">Identitätsprovider für die IAM Nutzer des Ministeriums für Bildung</mdui:Description>
+ <mdui:Keywords xml:lang="en">IAM CGIE MENJE luxembourg user users login education</mdui:Keywords>
+ <mdui:Logo width="36" height="151" xml:lang="en">https://ssl.education.lu/saml/resources/button_IAM.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
+ <mdui:IPHint>2001:a18::0/32</mdui:IPHint>
+ <mdui:DomainHint>school.lu</mdui:DomainHint>
+ <mdui:DomainHint>iam.education.lu</mdui:DomainHint>
+ <mdui:DomainHint>education.lu</mdui:DomainHint>
+ <mdui:DomainHint>lu</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:49.660068, 6.134062</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:49.610136, 6.127278</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>MIIEHzCCAwegAwIBAgIJAKJTKiAWTLbEMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYDVQQGEwJMVTEKMAgGA1UECAwBIDETMBEGA1UEBwwKTHV4ZW1ib3VyZzE5MDcGA1UECgwwQ2VudHJlIGRlIGdlc3Rpb24gaW5mb3JtYXRpcXVlIGRlIGwnw4PCqWR1Y2F0aW9uMRkwFwYDVQQDDBBpYW0uZWR1Y2F0aW9uLmx1MR8wHQYJKoZIhvcNAQkBFhBoZWxwZGVza0BjZ2llLmx1MB4XDTE0MDUwNjA3MjcwNFoXDTI0MDUwNTA3MjcwNFowgaUxCzAJBgNVBAYTAkxVMQowCAYDVQQIDAEgMRMwEQYDVQQHDApMdXhlbWJvdXJnMTkwNwYDVQQKDDBDZW50cmUgZGUgZ2VzdGlvbiBpbmZvcm1hdGlxdWUgZGUgbCfDg8KpZHVjYXRpb24xGTAXBgNVBAMMEGlhbS5lZHVjYXRpb24ubHUxHzAdBgkqhkiG9w0BCQEWEGhlbHBkZXNrQGNnaWUubHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xxXsMERdSaqG4G6zlZp6VMmU3TGYpsF9neaUKqQLcXtcIYebJP6DL1mBzEOWoATES0osSTEwna2gxI7gDJQ7fu2dCueUjq7cvR1sASjYYSrM1PJNWceuMFKfUNbIxgWo7N++n/kQMRxVTIynY+SpAy2rPRxVEWqDLdlkkjMvW90+X6u03JEMhZgOkwCBN9XoaA0d6lVnv+55cnGUHUUswfS8XjMHsjeLIAAc6o+CDjEmSml3QRvrAysaAAtJac2dWzPDc2/uGxoHGfSrkcLEjfyfMeTRtNf4CQi+MMmvKZr7b/HdeueDx93kHCv3YFPowbKlJFnaiww4DIVLu4RLAgMBAAGjUDBOMB0GA1UdDgQWBBQfyOK6WJEJWaZMCTqsywff9wyqrDAfBgNVHSMEGDAWgBQfyOK6WJEJWaZMCTqsywff9wyqrDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA97H+IraLnVP2EQok2saxkul/liSkS+rTe/La9w4IqQJ9b/nSoB3amqtPhfPZKtdJyFBINOhIQo0V13BjaeX1rgur3u6II8VvJbzQ1Y1cqLDLec2QiOZF+sTZVlYVIoPLiienxLtj0ib7z5Fl5Rfewn6jXfriQd7X1/5ujS8xii0OKiXZDzy5Yn0tdrT5bAJk7GsnUAI5qEpEOQG6seGNqW8BAB6zXbMWJCvx49qL+zH61hwxgwFvMNQEiwhUe0W10KM4AaVcEE5hjjwexJeoDS6J9F2PB8pdUOISmTqILjScqwYtMwrpaKJ7bDqh+dl9Dd5ygIprtpoRNUjiDAA2V</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>MIIEHzCCAwegAwIBAgIJAKJTKiAWTLbEMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYDVQQGEwJMVTEKMAgGA1UECAwBIDETMBEGA1UEBwwKTHV4ZW1ib3VyZzE5MDcGA1UECgwwQ2VudHJlIGRlIGdlc3Rpb24gaW5mb3JtYXRpcXVlIGRlIGwnw4PCqWR1Y2F0aW9uMRkwFwYDVQQDDBBpYW0uZWR1Y2F0aW9uLmx1MR8wHQYJKoZIhvcNAQkBFhBoZWxwZGVza0BjZ2llLmx1MB4XDTE0MDUwNjA3MjcwNFoXDTI0MDUwNTA3MjcwNFowgaUxCzAJBgNVBAYTAkxVMQowCAYDVQQIDAEgMRMwEQYDVQQHDApMdXhlbWJvdXJnMTkwNwYDVQQKDDBDZW50cmUgZGUgZ2VzdGlvbiBpbmZvcm1hdGlxdWUgZGUgbCfDg8KpZHVjYXRpb24xGTAXBgNVBAMMEGlhbS5lZHVjYXRpb24ubHUxHzAdBgkqhkiG9w0BCQEWEGhlbHBkZXNrQGNnaWUubHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xxXsMERdSaqG4G6zlZp6VMmU3TGYpsF9neaUKqQLcXtcIYebJP6DL1mBzEOWoATES0osSTEwna2gxI7gDJQ7fu2dCueUjq7cvR1sASjYYSrM1PJNWceuMFKfUNbIxgWo7N++n/kQMRxVTIynY+SpAy2rPRxVEWqDLdlkkjMvW90+X6u03JEMhZgOkwCBN9XoaA0d6lVnv+55cnGUHUUswfS8XjMHsjeLIAAc6o+CDjEmSml3QRvrAysaAAtJac2dWzPDc2/uGxoHGfSrkcLEjfyfMeTRtNf4CQi+MMmvKZr7b/HdeueDx93kHCv3YFPowbKlJFnaiww4DIVLu4RLAgMBAAGjUDBOMB0GA1UdDgQWBBQfyOK6WJEJWaZMCTqsywff9wyqrDAfBgNVHSMEGDAWgBQfyOK6WJEJWaZMCTqsywff9wyqrDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA97H+IraLnVP2EQok2saxkul/liSkS+rTe/La9w4IqQJ9b/nSoB3amqtPhfPZKtdJyFBINOhIQo0V13BjaeX1rgur3u6II8VvJbzQ1Y1cqLDLec2QiOZF+sTZVlYVIoPLiienxLtj0ib7z5Fl5Rfewn6jXfriQd7X1/5ujS8xii0OKiXZDzy5Yn0tdrT5bAJk7GsnUAI5qEpEOQG6seGNqW8BAB6zXbMWJCvx49qL+zH61hwxgwFvMNQEiwhUe0W10KM4AaVcEE5hjjwexJeoDS6J9F2PB8pdUOISmTqILjScqwYtMwrpaKJ7bDqh+dl9Dd5ygIprtpoRNUjiDAA2V</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssl.education.lu/saml/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://ssl.education.lu/saml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
+ <md:OrganizationName xml:lang="fr">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
+ <md:OrganizationName xml:lang="de">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
+ <md:OrganizationName xml:lang="lb">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fr">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="de">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="lb">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.cgie.lu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.cgie.lu</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>CGIE</md:SurName>
+ <md:EmailAddress>helpdesk@cgie.lu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml b/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml
index b26f3452..2ed84d32 100644
--- a/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml
+++ b/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml
@@ -25,30 +25,26 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEYTCCA0mgAwIBAgIBATANBgkqhkiG9w0BAQUFADCByjELMAkGA1UEBhMCRlIx
-ETAPBgNVBAgMCEJSRVRBR05FMRcwFQYDVQQKDA5FTlNUQSBCUkVUQUdORTExMC8G
-A1UECwwoRUNPTEUgTkFUIFNVUCBJTkdFTiBFVFVERSBURUNITiBBUk1FTUVOVDEm
-MCQGA1UEAwwddWNvcGlhLXNoaWIuZW5zdGEtYnJldGFnbmUuZnIxNDAyBgkqhkiG
-9w0BCQEWJWplYW4tcGF1bC5raXJrYnJpZGVAZW5zdGEtYnJldGFnbmUuZnIwHhcN
-MTUwOTA0MDcyODEzWhcNMjUwOTAxMDcyODEzWjCByjELMAkGA1UEBhMCRlIxETAP
-BgNVBAgMCEJSRVRBR05FMRcwFQYDVQQKDA5FTlNUQSBCUkVUQUdORTExMC8GA1UE
-CwwoRUNPTEUgTkFUIFNVUCBJTkdFTiBFVFVERSBURUNITiBBUk1FTUVOVDEmMCQG
-A1UEAwwddWNvcGlhLXNoaWIuZW5zdGEtYnJldGFnbmUuZnIxNDAyBgkqhkiG9w0B
-CQEWJWplYW4tcGF1bC5raXJrYnJpZGVAZW5zdGEtYnJldGFnbmUuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjTFwcA3jwkswwrf6wiB7HnGqQ7hzc
-etx4DCKWp7q4c5VpSiYaWjXCMWowCS9L9HBvY9acOR2uRPubvIWMAoZPELvFC5uN
-tX3fTLl/tzFxK6AfhS1fgnZI4rLfdwLEVaNcl/EVSlhzYK/vvU8ogiJR0Wnug2kc
-pKngb2lY1lq6Gk1LmxTNMlqBXxDMBpaVrNIoH0c4xb+NkGWW+7LDswGLPz612BIB
-JQnq1Zz3BiE837NRoeoZWLPrgHzb7fKL25NgpaElt60MqM+Pm/T1bC4ki2T8XAmM
-R2R/Bni0f0v2Xl81a2FPAE1BU8w6jTMFSkBfrnrqCAfWtHahxM0Xj2e9AgMBAAGj
-UDBOMB0GA1UdDgQWBBSoLmW/7Ri+xwt2g0D7F+Tl2Cap2jAfBgNVHSMEGDAWgBSo
-LmW/7Ri+xwt2g0D7F+Tl2Cap2jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQAcyAM1+lP7dKnbgqgWv8pe4+K/JP6PX5gCTDjs/OGg/9OpHmFEDAMmN6SM
-5yAbWFAylwu4P3txtViT52SzRT2bOYSlkkh4sbpBz0E0wn41GJXpIEnBHJF26n7X
-FAMpsE9UQKwWwx9+FtVM38AORfkwg+kS/N3OO0FipySqAjiGb7SKo1lY9ZHof/jW
-gBgI0bwtyCTjP0RVzJ4vWPpglXJPddfUvYh3rzDVM2wSzcVw36rl7s2oPgJy0CT9
-mrnJXRMvro3o5/2uT+4qCpJXj0mtWcAiOQDHISXFb7TpKZu8ra/XDpx1dVejo3e8
-fievTXxCFzLqApOjCWA8o5hbmgx1
+ MIIDljCCAn4CCQCfU0WUIcNFIDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+RlIxETAPBgNVBAgMCEJyZXRhZ25lMQ4wDAYDVQQHDAVCcmVzdDEXMBUGA1UECgwO
+RU5TVEEgQnJldGFnbmUxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMSIw
+IAYDVQQDDBljb250cm9sbGVyLmFjY2Vzcy5uZXR3b3JrMB4XDTE1MDkxNzExNTUy
+NloXDTI1MDkxNDExNTUyNlowgYwxCzAJBgNVBAYTAkZSMREwDwYDVQQIDAhCcmV0
+YWduZTEOMAwGA1UEBwwFQnJlc3QxFzAVBgNVBAoMDkVOU1RBIEJyZXRhZ25lMR0w
+GwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTEiMCAGA1UEAwwZY29udHJvbGxl
+ci5hY2Nlc3MubmV0d29yazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AOlH6arzFtnQLs11KKlLn9qwzsIClXFckQjk48kfFnu8+8nHFIXa6VwsQDlFvQ5O
+nyETzMqym7cT3kZuZkvldVH1ds0W7a0yqbOoy83t0GhaPjIaq1xxHsJD8l28Il8H
+AkRKFV4KIUlFFdpFYi4IWx2a8yB3JxS9sbPfslJMzbUkqXzIKuspX96qBDZuZux+
+8YnEUmrtr7ZPJXvQMlGpFkuhv0zg8V/D1EUODBrAFYeqpWFOH0PZhj4DQ+mfmjMO
+53R0zmYbeNC1zPyYg+ZZlgfeVKY5BXyja4ZNvSsUtyic/P9780ZK72NromFx4n/c
+YMi3TFRSQk5Vnn2n68LgZRMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC9TuIpO1
+ijHePC8x0QTqJkX/PA3uWu/dXTL19zHWrXhHJaYzw9FRrNU1TRWPpmhDsbMNig7k
+ldA5Asdqy0kogRRt7NR7Eqylvb5WQyX2z8gMFrNE/czAuDUPOh2b6yPa1lwi3YZo
+ghD8fPA/vM5JF0nb/2LL/mXhVygslhpqaaH+Ybq9iQeQWtWg17hMYoyc+gz5FfGd
+aCK5iwx95AZ6qN5d0BzzC8PAcULgZjbgyOk/AF6PVZklHKs5u/vsyOFhlevj+YfM
+ca90uwRHWn/k67mBa29JYu6i+m0C9ivPTCHn9c4HaVGV023h2UvWXj2gFpUgesO/
+/1CfOyqCdiur4Q==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -57,6 +53,34 @@ fievTXxCFzLqApOjCWA8o5hbmgx1
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDljCCAn4CCQCfU0WUIcNFIDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+RlIxETAPBgNVBAgMCEJyZXRhZ25lMQ4wDAYDVQQHDAVCcmVzdDEXMBUGA1UECgwO
+RU5TVEEgQnJldGFnbmUxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMSIw
+IAYDVQQDDBljb250cm9sbGVyLmFjY2Vzcy5uZXR3b3JrMB4XDTE1MDkxNzExNTUy
+NloXDTI1MDkxNDExNTUyNlowgYwxCzAJBgNVBAYTAkZSMREwDwYDVQQIDAhCcmV0
+YWduZTEOMAwGA1UEBwwFQnJlc3QxFzAVBgNVBAoMDkVOU1RBIEJyZXRhZ25lMR0w
+GwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTEiMCAGA1UEAwwZY29udHJvbGxl
+ci5hY2Nlc3MubmV0d29yazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AOlH6arzFtnQLs11KKlLn9qwzsIClXFckQjk48kfFnu8+8nHFIXa6VwsQDlFvQ5O
+nyETzMqym7cT3kZuZkvldVH1ds0W7a0yqbOoy83t0GhaPjIaq1xxHsJD8l28Il8H
+AkRKFV4KIUlFFdpFYi4IWx2a8yB3JxS9sbPfslJMzbUkqXzIKuspX96qBDZuZux+
+8YnEUmrtr7ZPJXvQMlGpFkuhv0zg8V/D1EUODBrAFYeqpWFOH0PZhj4DQ+mfmjMO
+53R0zmYbeNC1zPyYg+ZZlgfeVKY5BXyja4ZNvSsUtyic/P9780ZK72NromFx4n/c
+YMi3TFRSQk5Vnn2n68LgZRMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC9TuIpO1
+ijHePC8x0QTqJkX/PA3uWu/dXTL19zHWrXhHJaYzw9FRrNU1TRWPpmhDsbMNig7k
+ldA5Asdqy0kogRRt7NR7Eqylvb5WQyX2z8gMFrNE/czAuDUPOh2b6yPa1lwi3YZo
+ghD8fPA/vM5JF0nb/2LL/mXhVygslhpqaaH+Ybq9iQeQWtWg17hMYoyc+gz5FfGd
+aCK5iwx95AZ6qN5d0BzzC8PAcULgZjbgyOk/AF6PVZklHKs5u/vsyOFhlevj+YfM
+ca90uwRHWn/k67mBa29JYu6i+m0C9ivPTCHn9c4HaVGV023h2UvWXj2gFpUgesO/
+/1CfOyqCdiur4Q==
+ </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>
MIIEYTCCA0mgAwIBAgIBATANBgkqhkiG9w0BAQUFADCByjELMAkGA1UEBhMCRlIx
ETAPBgNVBAgMCEJSRVRBR05FMRcwFQYDVQQKDA5FTlNUQSBCUkVUQUdORTExMC8G
A1UECwwoRUNPTEUgTkFUIFNVUCBJTkdFTiBFVFVERSBURUNITiBBUk1FTUVOVDEm
@@ -85,45 +109,6 @@ fievTXxCFzLqApOjCWA8o5hbmgx1
</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>
- MIIFozCCA4ugAwIBAgIJANCQa4zExNxDMA0GCSqGSIb3DQEBCwUAMGgxCzAJBgNV
-BAYTAkZSMTEwLwYDVQQKDChFQ09MRSBOQVQgU1VQIElOR0VOIEVUVURFIFRFQ0hO
-IEFSTUVNRU5UMSYwJAYDVQQDDB11Y29waWEtc2hpYi5lbnN0YS1icmV0YWduZS5m
-cjAeFw0xNTA4MzExMjExMDZaFw0yNTA4MjgxMjExMDZaMGgxCzAJBgNVBAYTAkZS
-MTEwLwYDVQQKDChFQ09MRSBOQVQgU1VQIElOR0VOIEVUVURFIFRFQ0hOIEFSTUVN
-RU5UMSYwJAYDVQQDDB11Y29waWEtc2hpYi5lbnN0YS1icmV0YWduZS5mcjCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMxt/EQbJCgTTCClIYGc5aXJdFIK
-fMIPxcIJwoDPdaVHPR2NHXs0Wgf9s4d7JzNMY9GaJEeHAJhJI21Uz/ZOfrFmvmG0
-JakmY8YF5p/a9sfkcT2Dld4SGGvSiTxnAO/lirWtD0xlZOivtbbGdBy+OUxvgY1P
-Gg4sV6D2S3bebMRePpetaRlOiBuwEmDlteVaoSIUgYqYbScMKh3rjKybqqehel0K
-T0jmQY3nA5TgLkgnfCSwtIEp7H+tPNXVUgqTco3hQqDGV5lK2AkyJWgLWB71qzva
-LPm0ay24k9fJJuogRDGvX8Iw9lXK4pOWQSrsDLAcltMllNL80mq6Vhu8VewJD5Hg
-IOW365yo6I1ynAwa47tb81evHDxJi3m96kCwxiYK2qeySrjMNDUU/9lhHarJocDF
-msMm0d/DpHdTNCT2JQvL3WTwA9eho3Lcheu3M9BVH/OVldiUArklitlEvc/3YZv8
-qjG6AoiqhnLFKg7d2IR1DVzI5mdQ8IG4U2RRD1heKV1tHnc1H4jXIawpaHmBTUz3
-b6+Jg7YIOIYD5aC5CZ9Uyy+FKo1fMItLmjsf4ocdwU+sAlw+4i0kIHFuBBUwfLii
-cdAOf9JYNTiObXEjPhf9goVt91HRBctmXRY62WTGQMIbtNPCAwyKQx3nAtIJgANn
-tjPTRMbpIeUitqXDAgMBAAGjUDBOMB0GA1UdDgQWBBQa2cAjChweJOmB4ED0/CC2
-2h57ZDAfBgNVHSMEGDAWgBQa2cAjChweJOmB4ED0/CC22h57ZDAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQBeooaNt1ySXmsU2eDO2ot/41FQ+Md/SK9E
-ZArJDBMK4lIivJ5w38H+m9WYnFsHohxuqdOd3vD2ebckI/7PPTIc8ZPnQhkIEspj
-zkrbhvMJpL1+yDQK0qa0/P/KEU+2T3zxCShxhMwMZpTvIzV4TvvUsRcgAG4MTrid
-m+Vsb+ZC79GsCfL2Epl2XypFmsqID9dNRQleEnYfpvKL70Ij8EXvr/tQLXa7ocT2
-0ZSX76dMKnecx3LmiO19So11hMiJP32YnvLQ3ptdMFTh09y62hdG3FEDojwwjPmp
-LmYCngHWilUdtIb7Dc9Ud0Ou8NbgPgLx0fQeNVT3KtB4lvBNxtSO3VvMwyNwzIbw
-t9CVVWyHETgJNfYSgYfff5JvdIG4mS69LVII2HZjPXalhz3HoUAnTr9DTpa/hVD6
-hBYXS0eoFnKjVap8zgbs17VXMs9xYZmIkTPnzw+3lFoskSwimE87Ztv6zYT7eCKo
-FWz7hCTBle8CRvpmIcaeD6ON9/ihFWIeR/tfmjZYIIZ6WbsPqt7UJ9vZjkp/neaY
-j9ISRS6vFytnWMDSP3RRMdq9jGv2x1jAFrww9/AEERj/cLUgKE0Li8vCY1GyGfkn
-Fukp2pqxz8AS/fCY1zIiRYL8jlqv0RVCW1mbBSShkpwJK8t9Yyg0VHU03fUPgNNd
-CkJzT3tg8g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://controller.access.network/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://controller.access.network/Shibboleth.sso/SAML2/POST" index="1"/>
<md:AttributeConsumingService index="0">
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml
index cb071dfe..200c6459 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml
@@ -19,32 +19,33 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIErjCCA5agAwIBAgIRAJaT1KIfHVmld1Ki1N6X4JEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA0MjQwMDAwMDBaFw0xNjA0MjMyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLnVuaXYt
-bHlvbjEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtWeh0Zke9
-VBmOOwQUqf25+aw8KTGC/6gwSoj48vGDm6Oo0u8TiEplFSzBBd2CZK2A4vO2iNHz
-tlxBw01s9BDKIS4A9cnGTr9KQXbJj05BfPfwnlAhMexADwxKc24v3w2tZnALLRLp
-xD1tpfP3JRf2TDFCq1y1pVN0HplxNjWq7AT2bSJUmostjN4SXLVHg40boGJSc6b3
-c4CdvhkTa/PjCCkyNO1tVLTRgpQIUelsPAsgAbRlzH/S34s4GmmkL5oUAO0W2vnf
-0giExMB5QP4byQ+SFIJiaJw5ZrCe7RcxXZt1hFLCJ/0sX3oHDXZQJElF1FpDpt8S
-U/EB6tT8iVQhAgMBAAGjggGsMIIBqDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUE4rmZUoHIwpShp68L3WD9y55Ns4wDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMFoGA1UdEQRTMFGCEWlkcC51bml2LWx5b24xLmZy
-gh1kc2ktYXV0aC1pZHAtMDEudW5pdi1seW9uMS5mcoIdZHNpLWF1dGgtaWRwLTAy
-LnVuaXYtbHlvbjEuZnIwDQYJKoZIhvcNAQEFBQADggEBALIuJEuGICDAEKB10oVx
-GgSCfY2N00sOT860fZaylYXy96htcUDVvRoRZSo7OuRVk96f+U4HZRSEkvD3bhsX
-/oZUquuVhRbhPcSCe73Qz4sF+2B1wOg6CL5BE858+1eJOPAwK20JfnDmccQzvHoX
-3xa4LljRG+Z4OkdEuDNzYmAgXHMkA2IORjN8uvySFMP03wweZsyL5fBgA0IT8Qke
-VqZtCnPLGw0lpJMz0tCH9WZRMyNTtYJzW0GThz2c3fyHHDNY0vwKTq8nB7Pjfrx3
-EIUd53kRJ1997x3KgQj/cLYxglqpnTSxvDbGXuXUEIZHPxwbk9mlLnyXNhPHQc/w
-sE4=
+ MIIE3zCCA8egAwIBAgIJAIz0IVyFIDO8MA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD
+VQQGEwJGUjEPMA0GA1UECBMGRlJBTkNFMRUwEwYDVQQHEwxWSUxMRVVSQkFOTkUx
+KTAnBgNVBAoTIFVOSVZFUlNJVEUgQ0xBVURFIEJFUk5BUkQgTFlPTiAxMRowGAYD
+VQQDExFpZHAudW5pdi1seW9uMS5mcjEnMCUGCSqGSIb3DQEJARYYc2hpYmJvbGV0
+aEB1bml2LWx5b24xLmZyMB4XDTE1MDkyMjExNTIzMFoXDTI1MDkxOTExNTIzMFow
+gaUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGUkFOQ0UxFTATBgNVBAcTDFZJTExF
+VVJCQU5ORTEpMCcGA1UEChMgVU5JVkVSU0lURSBDTEFVREUgQkVSTkFSRCBMWU9O
+IDExGjAYBgNVBAMTEWlkcC51bml2LWx5b24xLmZyMScwJQYJKoZIhvcNAQkBFhhz
+aGliYm9sZXRoQHVuaXYtbHlvbjEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC58VIw+tigGlowMge/475AvTFgSNUsA4jM4zZwBU/hxGTrf7MQovEW
+XyMZcPNcE0+LK53IcgAipHEJ5/dj2ZRT9EtjlabTca6d7xyil5c155fExkb//Vq6
+XsBojJ7O26BLhHx0/Pl8HSYq6sqZA2J+QgzYQ2SDZRS6EowSJokKI7ATDX3gmyKp
+s82p9paStfM0xQD8XaZIirbdue9eY0fAEavTGNA0D5jYgfgQ99D/0wMUgUumh86g
+n7ux+fc8kjUIwYG4cXM4laNS+4nbUQLTuXxlpuLNmkSkCmBl9q0fKJM+a013Dhe7
+Atk+E51GJGmz3Q5EKBkOoTsq//4qrUojAgMBAAGjggEOMIIBCjAdBgNVHQ4EFgQU
+4tUM0e5oVHam+Ui4mw7eyrJlWrMwgdoGA1UdIwSB0jCBz4AU4tUM0e5oVHam+Ui4
+mw7eyrJlWrOhgaukgagwgaUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGUkFOQ0Ux
+FTATBgNVBAcTDFZJTExFVVJCQU5ORTEpMCcGA1UEChMgVU5JVkVSU0lURSBDTEFV
+REUgQkVSTkFSRCBMWU9OIDExGjAYBgNVBAMTEWlkcC51bml2LWx5b24xLmZyMScw
+JQYJKoZIhvcNAQkBFhhzaGliYm9sZXRoQHVuaXYtbHlvbjEuZnKCCQCM9CFchSAz
+vDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCXQyUIW7tNLd3vKNg6
+1JF7KwTHe+f1FO7J21cozLf/OuiSCuz1naKPB4VqLfYoBK03yEme8CHOaxCPjkSB
+ixV1vqA0Uovka6VrzuM7OhtLEReF3VajJD4+MExwLeCKJnjpFJEDQdDracNFfi1n
+6HpsX95vX11466ig8O4JTyXJ77LaIHItTBhrQozrY3woFr6kt6cs2IYMxqDj9M2K
+c9cUTNP0EeRAYh7jQtNMJirphI8U43QDGdeOSytypmpQpe002c44CczDa9tkx+sT
+TFbUmmvfu3TPJmE3CXuFrt8C9wh19uNNm9uAhqU3jHjRa5n/OqQJVddhgZ8WkCsd
+dYpv
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/vpp.midlands3cities.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vpp.midlands3cities.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..a438cb44
--- /dev/null
+++ b/swamid-interfederations-2.0/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://vpp.midlands3cities.ac.uk/shibboleth">
+ <!--
+ This is a "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-17T10:01:33Z">
+ <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://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://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">M3C VPP</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Virtual Postgraduate Platform</mdui:Description>
+ <mdui:Logo height="64" width="143">https://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>
+ MIIDQDCCAiigAwIBAgIJAOAjIQJx+4c/MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+ BAMTGXZwcC5taWRsYW5kczNjaXRpZXMuYWMudWswHhcNMTUwOTE1MTEyMjQxWhcN
+ MjUwOTEyMTEyMjQxWjAkMSIwIAYDVQQDExl2cHAubWlkbGFuZHMzY2l0aWVzLmFj
+ LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyGltDWl57D+/WfKV
+ QSoHkEpwh9Hp8aflx1uF9NDg+3kLcucXCz5/x9+Vbb6c4Eh22wQSQZxRoMDR3eQd
+ HbSect7xZWiEZVpftJdWbDWPNbayQdfUNOeLCQohBt9DAXYxcRwsO5RZdMkrTm72
+ MhW5j0CtFmB2SjLZ16D/mRJCPAVsLtaQ1mThTUU75xtDL3FYEZQDYreyMDxjRqeU
+ W4JnSUGyPjAdaA8v3mWMptyQCkzHJtYbeAXre639aunbl7brZR/H4ysDydEI65q3
+ ruyFUA/hzatm2/tW0vmTbkYBdMLt4AG7v6oQuuoT4XCJmgP58uDo8MGEN2ds/i8r
+ Dw65RQIDAQABo3UwczBSBgNVHREESzBJghl2cHAubWlkbGFuZHMzY2l0aWVzLmFj
+ LnVrhixodHRwczovL3ZwcC5taWRsYW5kczNjaXRpZXMuYWMudWsvc2hpYmJvbGV0
+ aDAdBgNVHQ4EFgQUBAJDQt2jWrbNLitgyQu4PotWNwAwDQYJKoZIhvcNAQEFBQAD
+ ggEBAJxgwVcNBRoOVCPVBxj+a37OSoD3DZmQl07k1k8cijVr/0MOTboZiYkDBzqe
+ zmrytY6CM/ej5IHJR7ByltSi/Nj67BQWFafhThULzZ1b+1ARWtvMQRaU9LuEVp3S
+ ebpzHFa4KrtNUFYp1UJs0YMPF63pA+uR0SomYpeB20BDULQ0lLR55dxcWH8lELM+
+ 9PEY7Z5v6asho2lBZ+PjdR1zBs11ffv4Y2G+3VLLndMm7MOs7m7Bo6m8PDl9p+f9
+ hCljjUhEyX/lIWuZjv5jZI8bCsviOM+ZLBwhoVpj1NMicj7PCeVP7k7RjnHM4qN+
+ cevd/sPqVI0kteZSRYR9CQgLkco=
+ </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://vpp.midlands3cities.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://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://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://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">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/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 0d02e5cb..70d04536 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -89,7 +89,6 @@
<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.loebclassics.com-oa-metadata.xml b/swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.xml
new file mode 100644
index 00000000..35fbf6e7
--- /dev/null
+++ b/swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.loebclassics.com/oa/metadata">
+ <!--
+ This is a "Digital Loeb Classical Library" SP for the President and Fellows of Harvard College (Acting on behalf of Harvard University Press).
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-21T11:37:12Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDADCCAeigAwIBAgIEVHOa+TANBgkqhkiG9w0BAQUFADBCMSEwHwYDVQQKExhI
+ YXJ2YXJkIFVuaXZlcnNpdHkgUHJlc3MxHTAbBgNVBAMTFHd3dy5sb2ViY2xhc3Np
+ Y3MuY29tMB4XDTE0MTEyNDIwNTQxN1oXDTI0MTEyMTIwNTQxN1owQjEhMB8GA1UE
+ ChMYSGFydmFyZCBVbml2ZXJzaXR5IFByZXNzMR0wGwYDVQQDExR3d3cubG9lYmNs
+ YXNzaWNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCSs78r
+ MYDwZ41vMYrj8E+mBNKjj31NNKZbnsGHZJnD+yqnY3JZKYsjR8kfVOuLmjfT9VPJ
+ gJ2j2zamyzDpUL6UfRhX95hFF2ZEwYe58VUG4YInSyYbCRtY22GYylyogEzCARQp
+ H3TyzQ2wIsH1iRB53TKHz4RytnaJFhrU5s10u3BRO1m4LmjhKr3wqfciOr+p04ko
+ OO9LYjkNh37C0UrlZtP23X29F36SvaO4Ue2Iyw9Rnip9Z47/qLiT/HZCV3vmSiKI
+ 8VdjBUhEROaqTbouEesTx9zxvdWIwDdM986sPtwrNp/+/BO9w3VS0vLWe3gBUDRt
+ PE5lNPbj55NASpUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAkFhzy8nt7qNGhJjZ
+ +FAIX/jg/n/tymR2E31t+RfDtA4AMAZPiZYs4Rkt02HWmmC+Rr8aDUEzKZPbwt3R
+ ays+kiiHnvj4L9Nc/wyVebQLDNNW2dHpfMYrdhaVW0bcGzo3okpB1mCPKHbUkOmD
+ M9euhDsUAQRH0n5Ojh3v6lwQUvItUOoJFFpXYvzTkicGogp6rKuG01LCO0D4ByQh
+ vN71cIueV6Uq8k1l5ihnk2X06Dex8wuY3lPc413Gt98O3aklw9FD3XQyAp0RODd9
+ KF/o29n+RjmGx0qq/O4JOrXY0Q0CwLqMm5iE7byW0+nW3hlg1AajC3SJRlWw9ldU
+ Jm6s2g==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDADCCAeigAwIBAgIEVHOa+TANBgkqhkiG9w0BAQUFADBCMSEwHwYDVQQKExhI
+ YXJ2YXJkIFVuaXZlcnNpdHkgUHJlc3MxHTAbBgNVBAMTFHd3dy5sb2ViY2xhc3Np
+ Y3MuY29tMB4XDTE0MTEyNDIwNTQxN1oXDTI0MTEyMTIwNTQxN1owQjEhMB8GA1UE
+ ChMYSGFydmFyZCBVbml2ZXJzaXR5IFByZXNzMR0wGwYDVQQDExR3d3cubG9lYmNs
+ YXNzaWNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCSs78r
+ MYDwZ41vMYrj8E+mBNKjj31NNKZbnsGHZJnD+yqnY3JZKYsjR8kfVOuLmjfT9VPJ
+ gJ2j2zamyzDpUL6UfRhX95hFF2ZEwYe58VUG4YInSyYbCRtY22GYylyogEzCARQp
+ H3TyzQ2wIsH1iRB53TKHz4RytnaJFhrU5s10u3BRO1m4LmjhKr3wqfciOr+p04ko
+ OO9LYjkNh37C0UrlZtP23X29F36SvaO4Ue2Iyw9Rnip9Z47/qLiT/HZCV3vmSiKI
+ 8VdjBUhEROaqTbouEesTx9zxvdWIwDdM986sPtwrNp/+/BO9w3VS0vLWe3gBUDRt
+ PE5lNPbj55NASpUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAkFhzy8nt7qNGhJjZ
+ +FAIX/jg/n/tymR2E31t+RfDtA4AMAZPiZYs4Rkt02HWmmC+Rr8aDUEzKZPbwt3R
+ ays+kiiHnvj4L9Nc/wyVebQLDNNW2dHpfMYrdhaVW0bcGzo3okpB1mCPKHbUkOmD
+ M9euhDsUAQRH0n5Ojh3v6lwQUvItUOoJFFpXYvzTkicGogp6rKuG01LCO0D4ByQh
+ vN71cIueV6Uq8k1l5ihnk2X06Dex8wuY3lPc413Gt98O3aklw9FD3XQyAp0RODd9
+ KF/o29n+RjmGx0qq/O4JOrXY0Q0CwLqMm5iE7byW0+nW3hlg1AajC3SJRlWw9ldU
+ Jm6s2g==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.loebclassics.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.loebclassics.com/oa/auth/rcv/shib/art" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.loebclassics.com/oa/auth/rcv/saml2/post" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.loebclassics.com/oa/auth/rcv/saml2/art" index="4"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">President and Fellows of Harvard College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Digital Loeb Classical Library</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.hup.harvard.edu/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Norman</GivenName>
+ <SurName>Roye</SurName>
+ <EmailAddress>mailto:norman_roye@harvard.edu</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Norman</GivenName>
+ <SurName>Roye</SurName>
+ <EmailAddress>mailto:norman_roye@harvard.edu</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml b/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml
index f1051f30..89620594 100644
--- a/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml
@@ -33,32 +33,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDODCCAiCgAwIBAgIJAN8rvfQxRosjMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF3d3dy53b3JsZHNjaWVudGlmaWMuY29tMB4XDTEyMDkyMTE4MDY1MloXDTE1
- MDkyMTE4MDY1MlowIjEgMB4GA1UEAxMXd3d3Lndvcmxkc2NpZW50aWZpYy5jb20w
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMBlFtBSLSMwwtYOqU6Upi
- TYajGEjgmMEr7b7UjV0vWrjGNKspZVXfFGZa27XfhrdZ1ekRPQQ5s5BoxukXuk18
- SObgG+2PgIYNU888sgimadjowXMMNASBd+mSMYuFz2roY7T3lgYqEB9IApNQzYsV
- 3k/Lj1SC0s/vfkxUxV0RP0qWQi+57f/pS2Z7S0tOyJQ7mxwJ3/DIiJ1yzo1BeRFA
- MLbwPF1tkI5s/QOjZZdLPkZtCzc9wXFj4GQ82/3eOXpoXO0nNRFyh/DTMwT6djVJ
- Snc6kWVRct0ZAtKRR6tWuKOvOSijR7ls0g30z5hkGMxhd9OUI+Y51+6zDGAXdsz3
- AgMBAAGjcTBvME4GA1UdEQRHMEWCF3d3dy53b3JsZHNjaWVudGlmaWMuY29thipo
- dHRwczovL3d3dy53b3JsZHNjaWVudGlmaWMuY29tL3NoaWJib2xldGgwHQYDVR0O
- BBYEFCdkPpMBahBeOaQ9iAd+kq7dJXxiMA0GCSqGSIb3DQEBBQUAA4IBAQCM39BN
- gmVXOVt2zbqKJ5QCKpvs4z5CdOsPiomT71FSGT+mUOVLAjgzvEMxMWinp7f9Bq2a
- BRVpGFtbUEatr9cF7FzmD0zfXJsrMLRmhvh9QmF4v+AQb4VTlzHNXywyTx9m9rsk
- LvVmbteXmVHQVOUd5WXjGPzj0e4LpyPbPfXS7wBvugbOUr4wSr5pSVvJq4wBTeKS
- O9dz5WxRkasHt0ygZSkAdcjHRqgGhJQTPxPCGkGanuRq3AvK4APyBbVmkXTHDTTU
- VXgvYj3Ojap/CpCctwreorQx6ur/ZMUj0+8TOtPpPeFVv/XCcJ6Yvlb+oBfYMb98
- mIu7OuMzvnTSQKHo
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.worldscientific.com/action/samlACS" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.worldscientific.com/action/saml2post" index="2"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.worldscientific.com/action/saml2artifact" index="3"/>