summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2012-04-17 10:38:47 +0200
committerLeif Johansson <leifj@sunet.se>2012-04-17 10:38:47 +0200
commitc9ba365737ef73be8cff0e8d271bfc4bba1cd5af (patch)
treeb923b11351c6900f9bd5e51cb8cf1ca67cab4f55 /swamid-interfederations-2.0
parent1d1fca8894a888c78d5d2fe55d39f5f414ea1e15 (diff)
http://mds.edugain.org into swamid-interfederations-2.0
Diffstat (limited to 'swamid-interfederations-2.0')
-rw-r--r--swamid-interfederations-2.0/.xml57
-rw-r--r--swamid-interfederations-2.0/aai-logon.switch.ch.xml17
-rw-r--r--swamid-interfederations-2.0/aai-viewer.switch.ch.xml16
-rw-r--r--swamid-interfederations-2.0/aai.sztaki.hu.xml6
-rw-r--r--swamid-interfederations-2.0/applications.eu-decide.eu.xml6
-rw-r--r--swamid-interfederations-2.0/applications.eumedgrid.eu.xml6
-rw-r--r--swamid-interfederations-2.0/doit.swisdom.org.xml133
-rw-r--r--swamid-interfederations-2.0/fed-lab.org.xml85
-rw-r--r--swamid-interfederations-2.0/fire.rettorato.unito.it.xml102
-rw-r--r--swamid-interfederations-2.0/foodl.org.xml91
-rw-r--r--swamid-interfederations-2.0/forge.switch.ch.xml10
-rw-r--r--swamid-interfederations-2.0/gidp.geant.net.xml14
-rw-r--r--swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml6
-rw-r--r--swamid-interfederations-2.0/idp.admin.grnet.gr.xml123
-rw-r--r--swamid-interfederations-2.0/idp.dfn.de.xml25
-rw-r--r--swamid-interfederations-2.0/idp.dir.garr.it.xml60
-rw-r--r--swamid-interfederations-2.0/idp.niif.hu.xml6
-rw-r--r--swamid-interfederations-2.0/idp.ppke.hu.xml6
-rw-r--r--swamid-interfederations-2.0/idp.uniparthenope.it.xml129
-rw-r--r--swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml6
-rw-r--r--swamid-interfederations-2.0/login.ntua.gr.xml11
-rw-r--r--swamid-interfederations-2.0/monitor.eduroam.org.xml48
-rw-r--r--swamid-interfederations-2.0/openwiki.uninett.no.xml69
-rw-r--r--swamid-interfederations-2.0/ricevi.ct.infn.it.xml6
-rw-r--r--swamid-interfederations-2.0/rr.funet.fi.xml265
-rw-r--r--swamid-interfederations-2.0/rt.niif.hu.xml6
-rw-r--r--swamid-interfederations-2.0/sandbox.aai.niif.hu.xml6
-rw-r--r--swamid-interfederations-2.0/sp2.cesnet.cz.xml5
-rw-r--r--swamid-interfederations-2.0/terena.org.xml63
-rw-r--r--swamid-interfederations-2.0/vvc.niif.hu.xml61
-rw-r--r--swamid-interfederations-2.0/whoami.cesnet.cz.xml5
31 files changed, 1140 insertions, 309 deletions
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index 5357798b..97ddb782 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,13 +1,48 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:com.itslearning.test" validUntil="2012-04-21T08:14:02Z" cacheDuration="PT345600S">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.itslearning.com/elogin/logout.aspx"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.itslearning.com/elogin/default.aspx" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">itslearning</md:ServiceName>
- <md:ServiceDescription xml:lang="en">itslearning is a virtual learning environment specifically designed for schools and universities.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">itslearning er et virtuelt læringsmiljø, spesielt utformet for skoler og universiteter.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:geant:edugain:component:be:aaieduhr:aaiedu.hr">
+<md:Extensions>
+<mdrpi:RegistrationInfo registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+</md:Extensions>
+<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:Extensions>
+<mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">AAI@EduHr Single Sign-On Service</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="hr">Središnji AAI@EduHr autentifikacijski servis</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Central Login Service for the AAI@EduHr Federation with implemented Single Sign-On Feature</mdui:Description>
+ <mdui:Description xml:lang="hr">Središnji autentifikacijski servis AAI@EduHr federacije s implementiranim sustavom jedinstvene autentifikacije (Single Sign-On Service)</mdui:Description>
+ </mdui:UIInfo>
+</md:Extensions>
+<md:KeyDescriptor use="signing">
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>MIIEbDCCA1SgAwIBAgICAVYwDQYJKoZIhvcNAQEFBQAwQTETMBEGCgmSJomT8ixkARkTA25ldDEVMBMGCgmSJomT8ixkARkTBWdlYW50MRMwEQYDVQQDEwplZHVHQUlOU0NBMB4XDTEwMDYxMDA3NTk1NloXDTE4MDExNDA3NTk1NlowWTETMBEGCgmSJomT8ixkARkWA25ldDEVMBMGCgmSJomT8ixkARkWBWdlYW50MREwDwYDVQQKEwhBQUlFZHVIcjEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxSGZkVlXr7xZYvilQxqXfxinRUuKPJMVrrOXo33P5Y7PXZiNRiMldtAyD3gQpcPWY68HrTZWspypX6oLRKRIlRC7Nj4/E6Bwn+pD/TqnN8UwL5SuDm+kp7z/zHXYGfmalIzibOHpPlmV39PcObdPE02wtrxV3WtmZjakzD8vZwnRjwcS3jbcHgwmEnzcAcMrrXtJ4A5G5OlgE7A3U5cCttxd3Y8w3u9meZWAxsb9AzrWGwYUsH1bbStVQqXFZHH5U9VIs8iyQSfHCdV2jEN46nZkwbNVPnIMzQ3eaZrZ4JRth1BUdpNnbvv2mZH7YPbdLz2vWSrBpFfubwuxJHrrEQIDAQABo4IBVDCCAVAwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU3UDcH284PfxY0A2gvZ7CGfclywIwHwYDVR0jBBgwFoAUiw+PJ4DSk9dGXZGEuy6YYq4E8dIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB9BgNVHREEdjB0gg9sb2dpbi5hYWllZHUuaHKGYWh0dHBzOi8vcmVnaXN0cnkuZWR1Z2Fpbi5vcmcvcmVzb2x2ZXI/dXJuPXVybjpnZWFudDplZHVnYWluOmNvbXBvbmVudDpiZTphYWllZHVocjpsb2dpbi5hYWllZHUuaHIwNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL3NjYS5lZHVnYWluLm9yZy9jcmwvY2FjcmwuZGVyMBsGA1UdIAQUMBIwEAYOKwYBBAGB1H4BDAIAAAQwDQYJKoZIhvcNAQEFBQADggEBAHvccCTPvtBVhBUJA8TZEAhOhctLbafP9vE2BDEuPy7cQLujli9mnocpIthwZ4JmRp2xZeTki+vetpikyc192o4d6iUrYVorY//uow3YUifsSDIN2VNfZvjs0lDAzfdTfXMvDugg8hEoEhOhr/yP6FGalM1nhvxauD4jwv6rgTuKPcNWDvFV6LVCxO0m3Mfk5pSlndFE9SXrQFC1dyXRcU1KqvMjjbZ0idKEpe7wMwIgWNGadqKCtBzF1GLkZQSsgiQUIVD3YG6OYBHzi6+/Shl3oueoMGWa8NQdycPHiz0qBS3CuCVwpJAoGymxJqoyWVkyKcrsYpwFgNq0PoAhN78=</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>MIIEbDCCA1SgAwIBAgICAVYwDQYJKoZIhvcNAQEFBQAwQTETMBEGCgmSJomT8ixkARkTA25ldDEVMBMGCgmSJomT8ixkARkTBWdlYW50MRMwEQYDVQQDEwplZHVHQUlOU0NBMB4XDTEwMDYxMDA3NTk1NloXDTE4MDExNDA3NTk1NlowWTETMBEGCgmSJomT8ixkARkWA25ldDEVMBMGCgmSJomT8ixkARkWBWdlYW50MREwDwYDVQQKEwhBQUlFZHVIcjEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxSGZkVlXr7xZYvilQxqXfxinRUuKPJMVrrOXo33P5Y7PXZiNRiMldtAyD3gQpcPWY68HrTZWspypX6oLRKRIlRC7Nj4/E6Bwn+pD/TqnN8UwL5SuDm+kp7z/zHXYGfmalIzibOHpPlmV39PcObdPE02wtrxV3WtmZjakzD8vZwnRjwcS3jbcHgwmEnzcAcMrrXtJ4A5G5OlgE7A3U5cCttxd3Y8w3u9meZWAxsb9AzrWGwYUsH1bbStVQqXFZHH5U9VIs8iyQSfHCdV2jEN46nZkwbNVPnIMzQ3eaZrZ4JRth1BUdpNnbvv2mZH7YPbdLz2vWSrBpFfubwuxJHrrEQIDAQABo4IBVDCCAVAwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU3UDcH284PfxY0A2gvZ7CGfclywIwHwYDVR0jBBgwFoAUiw+PJ4DSk9dGXZGEuy6YYq4E8dIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB9BgNVHREEdjB0gg9sb2dpbi5hYWllZHUuaHKGYWh0dHBzOi8vcmVnaXN0cnkuZWR1Z2Fpbi5vcmcvcmVzb2x2ZXI/dXJuPXVybjpnZWFudDplZHVnYWluOmNvbXBvbmVudDpiZTphYWllZHVocjpsb2dpbi5hYWllZHUuaHIwNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL3NjYS5lZHVnYWluLm9yZy9jcmwvY2FjcmwuZGVyMBsGA1UdIAQUMBIwEAYOKwYBBAGB1H4BDAIAAAQwDQYJKoZIhvcNAQEFBQADggEBAHvccCTPvtBVhBUJA8TZEAhOhctLbafP9vE2BDEuPy7cQLujli9mnocpIthwZ4JmRp2xZeTki+vetpikyc192o4d6iUrYVorY//uow3YUifsSDIN2VNfZvjs0lDAzfdTfXMvDugg8hEoEhOhr/yP6FGalM1nhvxauD4jwv6rgTuKPcNWDvFV6LVCxO0m3Mfk5pSlndFE9SXrQFC1dyXRcU1KqvMjjbZ0idKEpe7wMwIgWNGadqKCtBzF1GLkZQSsgiQUIVD3YG6OYBHzi6+/Shl3oueoMGWa8NQdycPHiz0qBS3CuCVwpJAoGymxJqoyWVkyKcrsYpwFgNq0PoAhN78=</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/sso/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://login.aaiedu.hr/sso/saml2/idp/SSOService.php"/>
+</md:IDPSSODescriptor>
+<md:Organization>
+<md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
+<md:OrganizationName xml:lang="hr">AAI@EduHr</md:OrganizationName>
+<md:OrganizationDisplayName xml:lang="en">AAI@EduHr - Croatian Research and Education Federation</md:OrganizationDisplayName>
+<md:OrganizationDisplayName xml:lang="hr">AAI@EduHr - Autentifikacijska i autorizacijska infrastruktura sustava znanosti i obrazovanja u Republici Hrvatskoj</md:OrganizationDisplayName>
+<md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
+<md:OrganizationURL xml:lang="hr">http://www.aaiedu.hr</md:OrganizationURL>
+</md:Organization>
+<md:ContactPerson contactType="technical">
+<md:GivenName>Dubravko</md:GivenName>
+<md:SurName>Voncina</md:SurName>
+<md:EmailAddress>team@aaiedu.hr</md:EmailAddress>
+</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch.xml b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
index 217563ca..5c8110a1 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
@@ -1,19 +1,26 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.switch.ch/idp/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-01-26T07:24:46Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-03-29T06:59:25Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <IDPSSODescriptor errorURL="http://www.switch.ch/aai/contact/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">SWITCH</mdui:DisplayName>
- <mdui:Description xml:lang="en">The SWITCH Identity Provider is used by SWITCH staff members.</mdui:Description>
- <mdui:Keywords xml:lang="en">others</mdui:Keywords>
+ <mdui:Description xml:lang="en">SWITCH operates the education and research network for the Swiss Higher Education organisations.</mdui:Description>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAgFJREFUeJxi+P//P8PHXd1nfj484w1ik4rBxNsVeR+f1Kr+/7ira/Pfr++USTbg3aqCj4/LJP8/Lpf6/6LP8ce38+tb/v/7y0W8AWtKnj8qFvn/pFrp/+NKOTB+syD+0a/HF0KJMuD324eS79eVzwd64+/jCpn/T2qABgHpp/Ua/z9sadz759NLbbwGwPDP+ydNXs+NPPK4UhbsiifVimBvPe+2+f3l1LL+f39+8eM1AIz//mH8em5N5Is+p0cgzU+BhjytAhpWIf3/zeywF7/uH08EqmPEbQAU//v2nuvnockNj1uMv96r1vh/r0bz/70K5f/367T/P1pVc/zr2+cmeA348+8/49KtZ8Nt/ItvGzklvzd2SX2vZ5/0Xtc24X1xWevVp48e+uI04PCZW0YeKb2HWLWT/7PopIExg2rif1WP6p/z1x/v/P7rLy9WL9x59EoivW7hXF6jzL/Mmkn/ufTT/jMBaRHz3P9VfWt2vH73WR1rIL7/+JW9a862Mhn7oo+MGolgjSDb2XVT/gflTLl3/trDALzRmN+69DKDcux/Dt3U/xx6qf9BhhgF1H9bu+tM3b9//zkJJqSEyjkfGdUT/jMBNUpYF/xvnbF57ftP3+SJTsoJFXM+MgM1x5TOunbj3nNXkjNTet2Cx/PWHCoGsllJ0QzCAAAAAP//AwC4nrtuPmwfNwAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAiDSURBVHic7Fh7bFPXGT9x4vgR29fva1/HsRM78StODE0CCTQoJiEPh7wgNoFAgkt4jpF2/aNTira0/2za2qGC1IcoUwlTaaF0XRJRaLRB2QCxTtAHrxUWNfQBnWAPprFNNN5377UTO7GzKop2dKQc6ed7z3dev/O73znnO0aRSATNY/bAToB0YCdAOrATIB3YCZAO7ARIB3YCpAM7AdKBnQDpwE6AdGAnQDqwEyAd2AmQDuwESAd2AqQDOwHSgZ0A6cBOgHRgJ0A6sBMgHdgJkA7sBEgHdgKkg/9hk1jlkJvKX1LmN/9B62y/oXe03YTnNWV+06CMWbQBxSWpqWKv0tZwRiBjsnlLWqwoU5pTdUJhrdmPxBRnyFYj40AbdbqvSvyDWKUMAf/sKBbuOhpSXgiXiCr4AimSWfw/zzJXvslmTSZaMDh0HF4azirtjROgbIHJdwBC/rNjtz5ndj/9dDxNeZZh4ePKvLphtXP1ZXY+eseqm1oAZVkO3E01PPX0iQbpipx0hS0wLNF5f4pSJ4HcunwPlVf7m0kBhTKruqDlnrE4/GfaFTqhdwWPAF7Xu0Lv0O6Oy0zxY+OqvLonYj1IDAvLmaLwA2Ve/YF49TjWpvLHmeJND7OYRT42v69B8coXu4x3t5aJLJO1uCbG013qu3/aYXzfbxcIefkppHevOatxrPqIE5DRCYaG30Uor31E7w6NAJ8R2rP2gql4U4T2rPuQzbNAqGnk1q0vmN27owJKNLS2oPUq44N67rW/h7kMAQ7zcwoeNRZt/BjGuYfkZiaeu1DtRFA2qjRV/HIGAdNBo2Gjp/OrCQFlzOKfMb6e/8jMj1qTNBCq7I1XjEXhy0jtEMeMKlvgFaZoYwQK3TFRokqmaR2rryBn50ethXTZ2E46sr9JsYMtEAnSkCj6wXcszuy/08tE9tYrOE8QcSMpkM4VOqspaOUEzMqSokCgkX0DcRVcO5G+uIzxdkUyjaXNvOi8vaurC5WUlHDvytyalxjf5og8p7I6Vh6fJMYSZIL5yC3+XfH2DHUBCNg9Sn0LAWlXx+0JAZW5K44bvN03EJWbtIVYW/gdjX3lC0J1wQQbgdrhhsH+qbY1Hp6omMavTQFlLUL5XQ/fWOO/fX0b+sRKIyk3chovNOSs58Pav13ZQg/bDSgjap0m4MTE4ievL65kvN0RsaFkVcwmEsbVhQ8E7c/pXMFLKSUQyhHt7RrS2JsGEsaJCvhtPBBWZpyAeXUjBu/GsXSlfVrtNEFGooHL875G5a7YB0t5XKwrijYEe1pUD0PtW4fXBR7+uBpxHpYJE4t5X79feuDuE8w3/VXSIjYvjg2RQsD4lEzAqUnnaLuoLWg5g6ZsL/FJZCqvFuuLl8TbZi0g7FsvmxZsHqdya5bM0BClTWy4UV4yo9ZQuOEvQPjZaZWz9Ez9I4+8qpfxWUFsKkrEXOrR37/YQx9L6ItNcyUgtIc98H2UVMApJsGk+3ICemEJM2VHUvXNdkC7gr9KEBA23VwgPQLqfw0F52nXml9DpZOwmb+htjfuhz2lP1NdYOKbpyf0BifuNtisx7KMJcqEcqnZ2bV00YFCOkouyvvFgOL5r3tNo99bIub6E8Z3N2ceCAI6UgmYOvECdo3CATWmcQUHNa7Q8WlwBgdBp6/AC28nhjHpEiShfWaFeVm50lpdq7LVh9S2+i2a/OaXjd4N9+D0+xgpLFmTw0W5STQIBvxA71n7KhIpJwvpunNHOxvG99ShcMzoyUaqT7cb7ox0atsS+oil/4MHCoXCafVjtpiAEOqchgijHUK1oNJWPwUN7aDHB+BkUwSMS6KpeXphH1McjsjNSxckFES9TcaUP2ny9UQU5kreSylrLcrvHn9nfe39G9vRlzoN4hbyay1U/+1dzM2e0kyOcSwenJzJHAroaP1tqnKfz4dWrgxwKC0tnbDHLeFjqdoifgkPJSzhgYFD5oFDvzAfPHgQ+f3++Lr8Q25uNng6I5S12p+0ywypSe/uGKcL178JMaUATuzryNl9fWeFfcWdXt03L9TLnlqahyy3djJ/PRZU7U5JbY4E1DraLgHOpyrv7e1FQ8PvoWFAX1/f5DRme4g8tuX7Fzdtf3Y0HN6MnI786U0UlqCxcH2EsvgfnVYW9UIIrl+EgDuidrQ+B8HouCK3toMtPbFOc+raNvqzobXKPWM7jeONbuThWEz1PjbNkYBsGAOB8rVkZTKZNPq2fC9CNSPsm1zOn3SzFhChiiOoIPxvhEosyVrIc5a9DuI8kBrLbDN0bNA5V0eyF2yJGLwbbsC1iDM2eTJ8n3/XOH7/SVPkYKtieIb2cyYgRBN72S0ly1Q+/YNDytC62b3uJNy+EpZqhmqWgTQs0WVaV/ABeM5nsHfs09oCz+hsDc9o7YGfgCin4MbxUFPQ8hoSqZKfatEAWqwv2gM3FnapRyfHeafg7ZD65NWt9D9Kc5CLs6Y6G0Uq7iqnjV7lkiWJ3ldp8m6MiI1lKQVEYo0BlvB1mM/fIcQ6pLU1/JCbj62hHw6X50G839GFnf8S633L45sJNS4Ece2oMvt/COgODRs8675MPEQk6jJ59tIBuKKdUzlWf6JyBq+oHKsuQf6EPHvJU0iskvBipSftNY0XUSGzNZ5KV/COHFumWxcLyw6FpIOcbQZm7A2B/TNBlrMsZRwmVNoWULl1Z2CytcmJREcQynQwn32qgpYLKteaPwI+VTnbr6rymz+kLFXvIsrCRQLxF4UMyiqg8uqHJFrPj2ZgKZDnVD1H5dW+N/931lz9nTWPeQHnBSQV2AmQDuwESAd2AqQDOwHSgZ0A6cBOgHRgJ0A6sBMgHdgJkA7sBEgHdgKkAzsB0oGdAOnAToB0YCdAOrATIB3YCZAO7ARIB3YCpOO/AAAA//8DAB7/hgVtBuDqAAAAAElFTkSuQmCC</mdui:Logo>
</mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>130.59.0.0/16</mdui:IPHint>
+ <mdui:IPHint>2001:620::/48</mdui:IPHint>
+ <mdui:DomainHint>switch.ch</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:47.37333,8.53111</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -129,7 +136,7 @@ yLC08u3bwWI=
<ContactPerson contactType="technical">
<GivenName>SWITCHaai</GivenName>
<SurName>Team</SurName>
- <EmailAddress>aai@switch.ch</EmailAddress>
+ <EmailAddress>mailto:aai@switch.ch</EmailAddress>
<TelephoneNumber>+41 44 268 1505</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-viewer.switch.ch.xml b/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
index f4f11079..2cf5db39 100644
--- a/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
+++ b/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
@@ -1,17 +1,19 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-viewer.switch.ch/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-01-12T13:28:11Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-03-29T09:06:47Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor errorURL="http://www.switch.ch/aai/support/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="de">Attributes Viewer</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">AAI Attributes Viewer</mdui:DisplayName>
- <mdui:Description xml:lang="de">Der AAI Attribute Viewer ist ein Dienst, der alle verfügbaren Attribute eines Benutzers anzeigt. Attribute werden 10 Tage in einer Logdatei aufbewahrt.</mdui:Description>
- <mdui:Description xml:lang="en">The AAI Attribute Viewer is a service that displays all available attributes of a user. This is useful for development and debugging. Attributes are stored 10 days in a log file.</mdui:Description>
+ <mdui:Description xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</mdui:Description>
+ <mdui:Description xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</mdui:Description>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
@@ -95,8 +97,8 @@ d1JnLxNKVaHsK7hbON4ohIuPa/mSkFHYOChI6vM3iO7mPo5N5H6R8DuH/v+oPV2o
<AttributeConsumingService index="1">
<ServiceName xml:lang="de">Attributes Viewer</ServiceName>
<ServiceName xml:lang="en">AAI Attributes Viewer</ServiceName>
- <ServiceDescription xml:lang="de">Der AAI Attribute Viewer ist ein Dienst, der alle verfügbaren Attribute eines Benutzers anzeigt. Attribute werden 10 Tage in einer Logdatei aufbewahrt.</ServiceDescription>
- <ServiceDescription xml:lang="en">The AAI Attribute Viewer is a service that displays all available attributes of a user. This is useful for development and debugging. Attributes are stored 10 days in a log file.</ServiceDescription>
+ <ServiceDescription xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</ServiceDescription>
+ <ServiceDescription xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</ServiceDescription>
<RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -162,7 +164,7 @@ d1JnLxNKVaHsK7hbON4ohIuPa/mSkFHYOChI6vM3iO7mPo5N5H6R8DuH/v+oPV2o
<ContactPerson contactType="technical">
<GivenName>SWITCHaai</GivenName>
<SurName>Team</SurName>
- <EmailAddress>aai@switch.ch</EmailAddress>
+ <EmailAddress>mailto:aai@switch.ch</EmailAddress>
<TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.sztaki.hu.xml b/swamid-interfederations-2.0/aai.sztaki.hu.xml
index b5567b30..67091985 100644
--- a/swamid-interfederations-2.0/aai.sztaki.hu.xml
+++ b/swamid-interfederations-2.0/aai.sztaki.hu.xml
@@ -41,14 +41,14 @@
</Organization>
<ContactPerson contactType="technical">
<SurName>AAI Administrator Team</SurName>
- <EmailAddress>aai@sztaki.hu</EmailAddress>
+ <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<SurName>AAI Administrator Team</SurName>
- <EmailAddress>aai@sztaki.hu</EmailAddress>
+ <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="administrative">
<SurName>AAI Administrator Team</SurName>
- <EmailAddress>aai@sztaki.hu</EmailAddress>
+ <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eu-decide.eu.xml b/swamid-interfederations-2.0/applications.eu-decide.eu.xml
index 72745ff3..4b39cbac 100644
--- a/swamid-interfederations-2.0/applications.eu-decide.eu.xml
+++ b/swamid-interfederations-2.0/applications.eu-decide.eu.xml
@@ -103,15 +103,15 @@
<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
-
+
</md:SPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
<md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="it">COMETA</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">DECIDE Science Gateway provided by COMETA</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="it">DECIDE Science Gateway erogato da COMETA</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
<md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/applications.eumedgrid.eu.xml b/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
index 05f4c052..1fd368ed 100644
--- a/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
+++ b/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
@@ -101,15 +101,15 @@
<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
-
+
</md:SPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
<md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="it">COMETA</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">EUMEDGRID Science Gateway provided by COMETA</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="it">EUMEDGRID Science Gateway erogato da COMETA</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
<md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/doit.swisdom.org.xml b/swamid-interfederations-2.0/doit.swisdom.org.xml
new file mode 100644
index 00000000..0f2c8df9
--- /dev/null
+++ b/swamid-interfederations-2.0/doit.swisdom.org.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://doit.swisdom.org/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-03-12T08:46:17Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">DOIT - Dermatology eLearning</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Dermatology Online with Interactive Technology</mdui:Description>
+ <mdui:Keywords xml:lang="de">elearning dermatologie</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">elearning dermatology</mdui:Keywords>
+ <mdui:Keywords xml:lang="fr">dermatologie elearning</mdui:Keywords>
+ <mdui:Keywords xml:lang="it">elearning dermatologie</mdui:Keywords>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>doit.swisdom.org</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFGjCCBAKgAwIBAgIUH6a66qr+t+IWYDox5Q4z6Z/jwRIwDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTExMDgyMjA5Mjc0MVoXDTE0MDgyMjA5Mjc0MVow
+azELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJp
+Y2gxHTAbBgNVBAoTFFVuaXZlcnNpdGFldCBadWVyaWNoMRkwFwYDVQQDExBkb2l0
+LnN3aXNkb20ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1l3V
+hk4B1KbWNgNTpZ+cpM46T60jD2djhERx1mjhUIPVCSoSWBFnDcuaWVHw3hiiHRQ3
+Ak1SuXPGqT+oE4ATggPvgQmeD1BVv69dIwRf8k8ykJNlHYmaNFOjTAPmfPCUUZMB
++U0WY5+L//HVrgEzESDJgNzLV/qipXtpj9ysXTLJqJ3kwiZ+bT7KyxVXP4YEocgl
+NDVib5r6IdsvUw9Bm5ot08ZbGjKsO+uD592LV3pNib71Q6sSYcoX/a2seCnvSLBk
+v/pQple2/uSY+U+eWfRcvyOSdaByYsTNGW54XEbG2CPph7WJyyhjKJkIelnXM/NR
+bjj3oIV93uF27WXgtwIDAQABo4IBtDCCAbAwdAYIKwYBBQUHAQEEaDBmMCoGCCsG
+AQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wOAYIKwYBBQUH
+MAKGLGh0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3J0
+MDkGA1UdEQQyMDCCEGRvaXQuc3dpc2RvbS5vcmeBHHZhaGlkLmRqYW1laUBhY2Nl
+c3MudW5pemguY2gwUQYDVR0gBEowSDBGBgwrBgEEAb5YAAJkAQEwNjA0BggrBgEF
+BQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVwb3NpdG9yeTAO
+BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8G
+A1UdIwQYMBaAFDJNoU/q8K6Ztu6bByyECBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyG
+Kmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNybDAdBgNV
+HQ4EFgQUUFbI+ZNiU0fJ5tEkSatBhp6bJMAwDQYJKoZIhvcNAQEFBQADggEBAFgw
+pn5FmKkSXJS6UG3iYc5P6kDot0Ge5KB3o+Te4BaxG8IpLn/NRR1AU0WPgm/hqPA0
+RhRvxLEVLEU4zhShGURP2oTiaBkT3ArudACCw1yHFrY9+lQyMqlZeS0sgtS3RMRB
+PZFK09Z58q6U3oYHwjdjbDZgwz7e9vOYtN7uq7Yq1i1KMXiyUcGxH0xMXNXTpkl5
+7OfkKu3EolCAS7PA9pfU7rqeUC220Yaep7wZzml1kRa7Lcd61K3RHzXzY1ZynJSV
+oVuVfr2B07T4UxQr8qSyAc7CQ6OQII8R2ICM3efjlrDBI3kcvUAoxP2s2ynIERbc
+MwW3NDMLS+8yP8MK9rI=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.cyberderm.net/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://doit.mironet.ch/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://doit.swisdom.org/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.cyberderm.net/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.mironet.ch/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.swisdom.org/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.cyberderm.net/Shibboleth.sso/SLO/Artifact"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.mironet.ch/Shibboleth.sso/SLO/Artifact"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.swisdom.org/Shibboleth.sso/SLO/Artifact"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.cyberderm.net/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://doit.mironet.ch/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://doit.swisdom.org/Shibboleth.sso/SLO/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.cyberderm.net/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://doit.mironet.ch/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://doit.swisdom.org/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.cyberderm.net/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.mironet.ch/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.swisdom.org/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.cyberderm.net/Shibboleth.sso/NIM/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.mironet.ch/Shibboleth.sso/NIM/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.swisdom.org/Shibboleth.sso/NIM/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.cyberderm.net/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://doit.mironet.ch/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://doit.swisdom.org/Shibboleth.sso/NIM/SOAP"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/POST" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/POST" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/Artifact" index="7"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/Artifact" index="8"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/Artifact" index="9"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/ECP" index="10"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/ECP" index="12"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/POST" index="13"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/POST" index="14"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/POST" index="15"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/Artifact" index="16"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/Artifact" index="17"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/Artifact" index="18"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">DOIT - Dermatology eLearning</ServiceName>
+ <ServiceDescription xml:lang="en">Dermatology Online with Interactive Technology</ServiceDescription>
+ <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+
+
+ <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+
+
+
+
+ <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">switch.ch</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>DOIT</GivenName>
+ <SurName>Support</SurName>
+ <EmailAddress>mailto:support@doit.org</EmailAddress>
+
+ </ContactPerson>
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed-lab.org.xml b/swamid-interfederations-2.0/fed-lab.org.xml
new file mode 100644
index 00000000..3f2e0afc
--- /dev/null
+++ b/swamid-interfederations-2.0/fed-lab.org.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fed-lab.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-03-08T11:10:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">
+ https://www.aai.dfn.de/en/join/
+ </mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">
+ https://www.aai.dfn.de/teilnahme/
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">ID Federation Lab</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">ID Federation Lab</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity Federation Lab</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Federation Lab</mdui:Description>
+ <mdui:Logo height="32" width="32">https://fed-lab.org/wp-content/themes/carrington-blog/img/lab.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>fed-lab.org</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=fed-lab.org,OU=Geschaeftsstelle,O=DFN-Verein,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFTjCCBDagAwIBAgIHE3f/Vc7d6jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMjAzMDgw
+OTU0MTNaFw0xNzAzMDcwOTU0MTNaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpE
+Rk4tVmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRQwEgYDVQQDEwtm
+ZWQtbGFiLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKM5G9l7
+Q3NMbPZlwx+xqH1ELTyhC9yYTP2LDaDGyS1XDQ29QMAvLB0SzmG+aBNSiO7aFVXO
+nKUDBSlOUCUA7S88hMDNquVSqbujAZ5/CuguW5rjoJN1IS3i7ZaD7/Q1mRBhIV9i
+qmv2w24oKhhqw/ijLkK4XFnSCyom33MBPlFz/TkH1W7AaTAoMZTNQEFP4Ms9IUf6
+ePU14Mw7C2RBjC+eUyM2/xU0EZt9RppXDpQ1PK172HoEaWYHhyAD0SLyamJBtqVn
+W7uhgFuh7jHgDaN4xi+zow91wNIHJFYp4k26sSWARb9zxnnXmsPdOZcL//vBis1U
+Sf3YWsWy3IsosckCAwEAAaOCAhowggIWMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXg
+MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUhL6wfirs
+VHh3Ridf8Ct0ZpdXLfEwHwYDVR0jBBgwFoAUeaJiL87xBjlS53ZtYsfem2p1S0kw
+JwYDVR0RBCAwHoILZmVkLWxhYi5vcmeCD3d3dy5mZWQtbGFiLm9yZzCBkQYDVR0f
+BIGJMIGGMEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4t
+Z3MtY2EvcHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNh
+LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8G
+CCsGAQUFBwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu
+LmRlL09DU1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBj
+YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWlu
+LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
+AQCAKgHUcNID3v4Q2tqoQ4rX0eExJWPAJpDiixNi72GMoBeVWEXXeTK0i6pXNiAi
+Zk/GeeRPpOFdWEv7fxUv3igtzUdsWcxdID0+d4Jr2r4qThzlr0qroAKW/k5EA5Xr
+XHzLAh7lzGbipKbPLFFhMOgo8qbaPCjIKSKZGJzbXKPfxy5Efrbjpp3RJvvcCtS8
+AjsYaiukBZxdxU13wW4jLz20DJYECREQg14xJ7yYfHkY089k5LyCHEdLfSIQGG25
+zCWG/MOfIF4ytgyS74d3xzMRlVZ9Xa55k/MngKBWbBFvaTUiQppSC+xKNFm+bFAX
+rQ9xVr27yKkLqzzoz8LiTMmk
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed-lab.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed-lab.org/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://fed-lab.org/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://fed-lab.org/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://fed-lab.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="de">ID Federation Lab</OrganizationName>
+ <OrganizationName xml:lang="en">ID Federation Lab</OrganizationName>
+ <OrganizationDisplayName xml:lang="de">ID Federation Lab</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">ID Federation Lab</OrganizationDisplayName>
+ <OrganizationURL xml:lang="de">https://fed-lab.org/</OrganizationURL>
+ <OrganizationURL xml:lang="en">https://fed-lab.org/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Andreas</GivenName>
+ <SurName>Åkre Solberg</SurName>
+ <EmailAddress>andreas.solberg@uninett.no</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Torsten</GivenName>
+ <SurName>Kersting</SurName>
+ <EmailAddress>kersting@dfn.de</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml b/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
new file mode 100644
index 00000000..10da5e06
--- /dev/null
+++ b/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fire.rettorato.unito.it/shibboleth">
+
+ <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-01-27T18:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">YouBlog</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">YouBlog</mdui:DisplayName>
+ <mdui:Description xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</mdui:Description>
+ <mdui:Description xml:lang="it">Questo servizio permette previa autenticazione, di creare uno o più blog, inserire articoli e commenti, inviare messaggi privati agli autori dei blog. E' uno spazio di interazione, un modo per stare (virtualmente) insieme agli altri e per esprimere liberamente la propria creatività, la propria opinione sui più svariati argomenti e un ambiente di interazione che può diventare strumento di collaborazione nell’ambito delle attività istituzionali.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://www.serviziweb.unito.it/youblog</mdui:InformationURL>
+ </mdui:UIInfo>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>serviziweb.unito.it</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=serviziweb.unito.it,O=Universit\C3\A0 degli Studi di Torino,C=IT</ds:X509SubjectName>
+ <ds:X509Certificate>MIIEgDCCA2igAwIBAgIRAI23y9ITrv6V83fVgnk6IS0wDQYJKoZIhvcNAQEFBQAw
+ NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+ IFNTTCBDQTAeFw0xMDA5MjAwMDAwMDBaFw0xMzA5MTkyMzU5NTlaMFcxCzAJBgNV
+ BAYTAklUMSowKAYDVQQKDCFVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBUb3Jp
+ bm8xHDAaBgNVBAMTE3NlcnZpeml3ZWIudW5pdG8uaXQwggEiMA0GCSqGSIb3DQEB
+ AQUAA4IBDwAwggEKAoIBAQDYkhN1NRqrtcwJFbOnfXDkQ2jt2W6RKLlu92y32YOa
+ 6tpdTt/79tKgwu/LBKsxfkDqpgSUCvDF6nMZtRXT+slDvLSTDNDlmR5qZNfvX2NJ
+ EKyoUmkx/dwUiBdQStRI6xyRqFYOYUBMzazcNwmDBsHP95ehvPNm7Elizy+1q+NB
+ c81vhwn0d3pDjTss3XwTKupzMvIvFD+IumMPLNXwGM6xoIpQDcs5xgZixepu5c0w
+ CxcDraqezCn8Wf+ZcIGnEPAW95lRvZzRmEAKzvbay/5kLdq0ZhCqFMNaKtU0nNjF
+ 2RnoYeRA2Xpl4hj8vKzfN8cCjZP7ZA8so0y0nzZjtL8hAgMBAAGjggFmMIIBYjAf
+ BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU8PHbME7x
+ lHVkY1LYPThdV2ejntAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+ VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+ MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+ Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+ dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+ BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITc2Vy
+ dml6aXdlYi51bml0by5pdDANBgkqhkiG9w0BAQUFAAOCAQEAhWmFJToQzrYj/Uwl
+ qs/clWgOURj7pNLtlJiL21XLjwBSAoO6Ox4V5T6xwTpOnueYctmNFdK7I8j1u/1y
+ DQwWk81sztxj9F8NKpY1OdVq8hRQ0H4LFfJ7hhc4xVkWobFZfIfyyJtfrk9DTaV4
+ Xq/lyNvgH9Ged1GPDmLaqzvEZW30ZPqL9mULnEDDIoLmnD5WfsumO2UlN6Q+lMWC
+ lHN+wFATPaPZvPYt12ps5OumiSpZ42FgdQMPEOeFkYNt0/87ez/c9wyI+pD1NFQw
+ +cdP6e+25hKx4NUoRUr+Q8SaOLJ2xYDrs4nWjZFn5TLknCwU8ljoVGjzbyg+KaLh
+ HU+UDg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/SOAP"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/POST" index="7"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/Artifact" index="8"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/ECP" index="9"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST" index="10"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+
+ <md:AttributeConsumingService index="1">
+
+ <md:ServiceName xml:lang="en">YouBlog</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</md:ServiceDescription>
+
+ <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+
+ </md:AttributeConsumingService>
+
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Università degli Studi di Torino</md:OrganizationName>
+ <md:OrganizationName xml:lang="it">Università degli Studi di Torino</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">YouBlog provided by Università degli Studi di Torino</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="it">YouBlog erogato da Università degli Studi di Torino</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.unito.it/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="it">http://www.unito.it</md:OrganizationURL>
+ </md:Organization>
+
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>sewi-id@unito.it</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:EmailAddress>sewi-id@unito.it</md:EmailAddress>
+ </md:ContactPerson>
+ </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/foodl.org.xml b/swamid-interfederations-2.0/foodl.org.xml
index d437d9c4..a0447d7f 100644
--- a/swamid-interfederations-2.0/foodl.org.xml
+++ b/swamid-interfederations-2.0/foodl.org.xml
@@ -1,34 +1,61 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIICLzCCAZgCCQDWeshLcjcICTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wHhcNMDkwMTMwMTIyMzI4WhcNMzYwNjE2MTIyMzI4WjBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMLZMDXYErToL/IAb8WcTYN4bGZtwnwc8RmsuFSo2Bu3q+27fQIjn5uF/OfC9D2Bs5nqy8PjHSfp4gTG2gL/+Vi8J1rLnTLgTCBl/DacPU1MhkKiw8+dqzsPm96ELoDRJH4+O0vML3rUizkpZidEN5CgWNcg72CyKE83vN7zijevAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAmw2o4gbWppGxd5Xleyyd+s2kJMVnuXlwjsLiXz8uzeqOifAG1RVTZQDCxIAw8lAse1nLKKGZYj5PyCVwAhVjaVYuATErfeJqyTft9xtbH6Qk5mV99u1GujO2Lx54uaZFOCiCahwQGPfAm+qlrCteDoE8gqo0RJWno/HQxXE6/ac=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIICLzCCAZgCCQDWeshLcjcICTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wHhcNMDkwMTMwMTIyMzI4WhcNMzYwNjE2MTIyMzI4WjBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMLZMDXYErToL/IAb8WcTYN4bGZtwnwc8RmsuFSo2Bu3q+27fQIjn5uF/OfC9D2Bs5nqy8PjHSfp4gTG2gL/+Vi8J1rLnTLgTCBl/DacPU1MhkKiw8+dqzsPm96ELoDRJH4+O0vML3rUizkpZidEN5CgWNcg72CyKE83vN7zijevAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAmw2o4gbWppGxd5Xleyyd+s2kJMVnuXlwjsLiXz8uzeqOifAG1RVTZQDCxIAw8lAse1nLKKGZYj5PyCVwAhVjaVYuATErfeJqyTft9xtbH6Qk5mV99u1GujO2Lx54uaZFOCiCahwQGPfAm+qlrCteDoE8gqo0RJWno/HQxXE6/ac=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">Foodle</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+<md:Extensions>
+<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+</md:Extensions>
+<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:Extensions>
+<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Foodle</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
+ <mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
+ <mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
+ </mdui:UIInfo>
+</md:Extensions>
+<md:KeyDescriptor>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:X509Data>
+<ds:X509Certificate>MIICLzCCAZgCCQDWeshLcjcICTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wHhcNMDkwMTMwMTIyMzI4WhcNMzYwNjE2MTIyMzI4WjBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMLZMDXYErToL/IAb8WcTYN4bGZtwnwc8RmsuFSo2Bu3q+27fQIjn5uF/OfC9D2Bs5nqy8PjHSfp4gTG2gL/+Vi8J1rLnTLgTCBl/DacPU1MhkKiw8+dqzsPm96ELoDRJH4+O0vML3rUizkpZidEN5CgWNcg72CyKE83vN7zijevAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAmw2o4gbWppGxd5Xleyyd+s2kJMVnuXlwjsLiXz8uzeqOifAG1RVTZQDCxIAw8lAse1nLKKGZYj5PyCVwAhVjaVYuATErfeJqyTft9xtbH6Qk5mV99u1GujO2Lx54uaZFOCiCahwQGPfAm+qlrCteDoE8gqo0RJWno/HQxXE6/ac=</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
+<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
+<md:AttributeConsumingService index="0">
+<md:ServiceName xml:lang="en">Foodle</md:ServiceName>
+<md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
+<md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
+<md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
+<md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+</md:AttributeConsumingService>
+</md:SPSSODescriptor>
+<md:Organization>
+<md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+<md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+<md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+<md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+</md:Organization>
+<md:ContactPerson contactType="administrative">
+<md:GivenName>Andreas Åkre</md:GivenName>
+<md:SurName>Solberg</md:SurName>
+<md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+</md:ContactPerson>
+<md:ContactPerson contactType="technical">
+<md:GivenName>Andreas Åkre</md:GivenName>
+<md:SurName>Solberg</md:SurName>
+<md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+</md:ContactPerson>
+<md:ContactPerson contactType="support">
+<md:GivenName>Andreas Åkre</md:GivenName>
+<md:SurName>Solberg</md:SurName>
+<md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/forge.switch.ch.xml b/swamid-interfederations-2.0/forge.switch.ch.xml
index 6731bda2..79b2cbf9 100644
--- a/swamid-interfederations-2.0/forge.switch.ch.xml
+++ b/swamid-interfederations-2.0/forge.switch.ch.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://forge.switch.ch/shibboleth">
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2011-10-07T15:27:56Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-03-29T09:08:50Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
@@ -9,7 +9,9 @@
<Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Forge: Project Hosting Platform</mdui:DisplayName>
- <mdui:Description xml:lang="en">Public issue tracking and project development platform for SWITCH projects</mdui:Description>
+ <mdui:Description xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</mdui:Description>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
@@ -83,7 +85,7 @@ Zxx0VRzLBqR5oNC6j2Dbgzq7Vlcz6+aM4QYcce/MvMSDJesIpL3N9h/95Ez6HsWA
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/Artifact" index="18"/>
<AttributeConsumingService index="1">
<ServiceName xml:lang="en">Forge: Project Hosting Platform</ServiceName>
- <ServiceDescription xml:lang="en">Public issue tracking and project development platform for SWITCH projects</ServiceDescription>
+ <ServiceDescription xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</ServiceDescription>
<RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -99,7 +101,7 @@ Zxx0VRzLBqR5oNC6j2Dbgzq7Vlcz6+aM4QYcce/MvMSDJesIpL3N9h/95Ez6HsWA
<ContactPerson contactType="technical">
<GivenName>Lukas</GivenName>
<SurName>Hämmerle</SurName>
- <EmailAddress>lukas.haemmerle@switch.ch</EmailAddress>
+ <EmailAddress>mailto:lukas.haemmerle@switch.ch</EmailAddress>
<TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gidp.geant.net.xml b/swamid-interfederations-2.0/gidp.geant.net.xml
index cdc57f27..afa87290 100644
--- a/swamid-interfederations-2.0/gidp.geant.net.xml
+++ b/swamid-interfederations-2.0/gidp.geant.net.xml
@@ -25,6 +25,17 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gidp.geant.net/sp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gidp.geant.net/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gidp.geant.net/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">GEANT SP Proxy</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </md:AttributeConsumingService>
</md:SPSSODescriptor>
@@ -34,7 +45,6 @@
<md:OrganizationURL xml:lang="en">http://www.geant.net</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>Administrator</md:GivenName>
- <md:EmailAddress>mgw@umk.pl</md:EmailAddress>
+ <md:EmailAddress>edugain-ot@geant.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml b/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
index a397199a..89852e4d 100644
--- a/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
+++ b/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
@@ -101,15 +101,15 @@
<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
-
+
</md:SPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
<md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="it">INFN Catania</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">GISELA Science Gateway provided by INFN Catania</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="it">GISELA Science Gateway erogato da INFN Catania</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
<md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
new file mode 100644
index 00000000..7ad4ddbf
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.admin.grnet.gr/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grnet-hq.admin.grnet.gr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Greek Research and Technology Network</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.grnet.gr/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="el">http://www.grnet.gr/</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>admin.grnet.gr</mdui:DomainHint>
+ <mdui:DomainHint>noc.grnet.gr</mdui:DomainHint>
+ <mdui:IPHint>195.251.28.0/23</mdui:IPHint>
+ <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
+ <mdui:IPHint>83.212.9.0/24</mdui:IPHint>
+ <mdui:IPHint>2001:648:2340::/48</mdui:IPHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEpDCCA4ygAwIBAgIRAKGPd452mGFc3b3N6ZmgGQYwDQYJKoZIhvcNAQEFBQAw
+ NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+ IFNTTCBDQTAeFw0xMjAyMDkwMDAwMDBaFw0xNTAyMDgyMzU5NTlaMHwxCzAJBgNV
+ BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
+ ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEbMBkGA1UE
+ AxMSaWRwLmFkbWluLmdybmV0LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAsWs2s179mep3fvpBmZBSPEQddRjZHqOYoeoh4uGIb2y91ZPCfko/dot+
+ OLk23F1cgil/rZgVda8eVFhClOFXtM2TSOyETpK/q+EzndCRemLy8pCOJDPMe9J5
+ FPM4IQNaVenL5EHHlBoQlEM6I2BSHGx/KGJaAbYqDXLG5BcyEVtMnUy7jZG9feb1
+ ij1V54qt4P4/uNtqS1hv1IvrpSrTRFSzIo80f3bY4hKDFhgElrp6Q+eShGW6HWMM
+ z+UfDi46/eOcmAZAubCDbBpQ+jG/lCcnU36ERzveMgjNlzWCBH8A500xcpuD+WcT
+ xUykI27QoUx9QE2Fg8GiXPQfiF6d+wIDAQABo4IBZTCCAWEwHwYDVR0jBBgwFoAU
+ DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNqijEdD34nYXWT6a9gXKvPi
+ pfSPMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+ AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
+ HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+ Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+ Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+ Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5hZG1pbi5ncm5l
+ dC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAAtkgWgP0BN0+d964wIaL+P9428fcrfXo
+ L95csqyi1G32STgdEp1iv8tNCCTKuMAO/6N0lVqqKw88PlRjAmTmmVUULj2WLQ+X
+ XZ9OPB4OeL0Iu8VA7Habvf9mRiLjEWsxtZ0OYTB54kVwBvPy2JeBQkkZxYL2e4EV
+ gZWYYUvA7CBafflULEIQlY//oE17RfFtfnS+XFmHy3/c2++vuSCZzpC6PIkxly1o
+ chrXCBK9CuZKRCOQ/Muw/1EBhsapcuj6+S/7ddc+ALajq2XpjLewFRIjEsDGy1Xh
+ ROGYFhnOGXLGpmAVBl+mRonKWzzm26wJfRpxE7pXT9zJw9MNExNUkA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.admin.grnet.gr/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grnet-hq.admin.grnet.gr</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEpDCCA4ygAwIBAgIRAKGPd452mGFc3b3N6ZmgGQYwDQYJKoZIhvcNAQEFBQAw
+ NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+ IFNTTCBDQTAeFw0xMjAyMDkwMDAwMDBaFw0xNTAyMDgyMzU5NTlaMHwxCzAJBgNV
+ BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
+ ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEbMBkGA1UE
+ AxMSaWRwLmFkbWluLmdybmV0LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAsWs2s179mep3fvpBmZBSPEQddRjZHqOYoeoh4uGIb2y91ZPCfko/dot+
+ OLk23F1cgil/rZgVda8eVFhClOFXtM2TSOyETpK/q+EzndCRemLy8pCOJDPMe9J5
+ FPM4IQNaVenL5EHHlBoQlEM6I2BSHGx/KGJaAbYqDXLG5BcyEVtMnUy7jZG9feb1
+ ij1V54qt4P4/uNtqS1hv1IvrpSrTRFSzIo80f3bY4hKDFhgElrp6Q+eShGW6HWMM
+ z+UfDi46/eOcmAZAubCDbBpQ+jG/lCcnU36ERzveMgjNlzWCBH8A500xcpuD+WcT
+ xUykI27QoUx9QE2Fg8GiXPQfiF6d+wIDAQABo4IBZTCCAWEwHwYDVR0jBBgwFoAU
+ DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNqijEdD34nYXWT6a9gXKvPi
+ pfSPMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+ AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
+ HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+ Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+ Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+ Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5hZG1pbi5ncm5l
+ dC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAAtkgWgP0BN0+d964wIaL+P9428fcrfXo
+ L95csqyi1G32STgdEp1iv8tNCCTKuMAO/6N0lVqqKw88PlRjAmTmmVUULj2WLQ+X
+ XZ9OPB4OeL0Iu8VA7Habvf9mRiLjEWsxtZ0OYTB54kVwBvPy2JeBQkkZxYL2e4EV
+ gZWYYUvA7CBafflULEIQlY//oE17RfFtfnS+XFmHy3/c2++vuSCZzpC6PIkxly1o
+ chrXCBK9CuZKRCOQ/Muw/1EBhsapcuj6+S/7ddc+ALajq2XpjLewFRIjEsDGy1Xh
+ ROGYFhnOGXLGpmAVBl+mRonKWzzm26wJfRpxE7pXT9zJw9MNExNUkA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Greek Research and Technology Network</OrganizationName>
+ <OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.grnet.gr/</OrganizationURL>
+ <OrganizationURL xml:lang="el">http://www.grnet.gr/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>Greek Research and Technology Network</Company>
+ <EmailAddress>helpdesk@grnet.gr</EmailAddress>
+ <TelephoneNumber>800-11-47638</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <Company>Greek Research and Technology Network</Company>
+ <EmailAddress>helpdesk@grnet.gr</EmailAddress>
+ <TelephoneNumber>800-11-47638</TelephoneNumber>
+ </ContactPerson>
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn.de.xml b/swamid-interfederations-2.0/idp.dfn.de.xml
index 14fcb48c..aef8cbe1 100644
--- a/swamid-interfederations-2.0/idp.dfn.de.xml
+++ b/swamid-interfederations-2.0/idp.dfn.de.xml
@@ -1,8 +1,25 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn.de/idp/shibboleth">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T18:20:36Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">
+ https://www.aai.dfn.de/en/join/
+ </mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">
+ https://www.aai.dfn.de/teilnahme/
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">DFN</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">DFN</mdui:DisplayName>
+ <mdui:Description xml:lang="de">DFN Identity Provider für DFN-MitarbeiterInnen</mdui:Description>
+ <mdui:Description xml:lang="en">The DFN Identity Provider is used by DFN staff members.</mdui:Description>
+ <mdui:Logo height="81" width="180">https://www.aai.dfn.de/fileadmin/templates/main/images/logo.jpg</mdui:Logo>
+ </mdui:UIInfo>
</Extensions>
<KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -170,8 +187,11 @@ wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationName>
+ <OrganizationName xml:lang="en">German National Research and Education Network, DFN</OrganizationName>
<OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</OrganizationDisplayName>
<OrganizationURL xml:lang="de">http://www.dfn.de</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.dfn.de/en/</OrganizationURL>
</Organization>
<ContactPerson contactType="administrative">
<GivenName>Ulrich</GivenName>
@@ -183,4 +203,9 @@ wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
<SurName>Borenius</SurName>
<EmailAddress>hotline@aai.dfn.de</EmailAddress>
</ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Wolfgang</GivenName>
+ <SurName>Pempe</SurName>
+ <EmailAddress>hotline@aai.dfn.de</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dir.garr.it.xml b/swamid-interfederations-2.0/idp.dir.garr.it.xml
index 682fe232..9a77660a 100644
--- a/swamid-interfederations-2.0/idp.dir.garr.it.xml
+++ b/swamid-interfederations-2.0/idp.dir.garr.it.xml
@@ -3,8 +3,7 @@
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-07-29T12:00:00Z">
- <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
- </mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -13,21 +12,13 @@
<shibmd:Scope regexp="false">garr.it</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">GARR IdP
- </mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for
- GARR staff
- </mdui:Description>
- <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html
- </mdui:InformationURL>
+ <mdui:DisplayName xml:lang="en">GARR IdP</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for GARR staff</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
- <mdui:DisplayName xml:lang="it">GARR IdP
- </mdui:DisplayName>
- <mdui:Description xml:lang="it">Identity Provider per
- il personale GARR
- </mdui:Description>
- <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html
- </mdui:InformationURL>
+ <mdui:DisplayName xml:lang="it">GARR IdP</mdui:DisplayName>
+ <mdui:Description xml:lang="it">Identity Provider per il personale GARR</mdui:Description>
+ <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
</mdui:UIInfo>
</Extensions>
@@ -65,8 +56,8 @@
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
- </NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dir.garr.it/idp/profile/Shibboleth/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -79,17 +70,11 @@
<shibmd:Scope regexp="false">garr.it</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">GARR AA
- </mdui:DisplayName>
- <mdui:Description xml:lang="en">Attribute Authority for
- GARR staff
- </mdui:Description>
+ <mdui:DisplayName xml:lang="en">GARR AA</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Attribute Authority for GARR staff</mdui:Description>
- <mdui:DisplayName xml:lang="it">GARR AA
- </mdui:DisplayName>
- <mdui:Description xml:lang="it">Attribute Authority per
- il personale GARR
- </mdui:Description>
+ <mdui:DisplayName xml:lang="it">GARR AA</mdui:DisplayName>
+ <mdui:Description xml:lang="it">Attribute Authority per il personale GARR</mdui:Description>
</mdui:UIInfo>
@@ -129,27 +114,20 @@
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
- </NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">GARR</OrganizationName>
<OrganizationName xml:lang="it">GARR</OrganizationName>
- <OrganizationDisplayName xml:lang="en">GARR
- </OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="it">GARR
- </OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.garr.it/b/eng
- </OrganizationURL>
- <OrganizationURL xml:lang="it">http://www.garr.it
- </OrganizationURL>
+ <OrganizationDisplayName xml:lang="en">GARR</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="it">GARR</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
+ <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
- <EmailAddress>
- system.support@garr.it
- </EmailAddress>
+ <EmailAddress>system.support@garr.it</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.niif.hu.xml b/swamid-interfederations-2.0/idp.niif.hu.xml
index 884b10d9..2eb16696 100644
--- a/swamid-interfederations-2.0/idp.niif.hu.xml
+++ b/swamid-interfederations-2.0/idp.niif.hu.xml
@@ -45,14 +45,14 @@
</Organization>
<ContactPerson contactType="technical">
<SurName>NIIF AAI</SurName>
- <EmailAddress>aai@niif.hu</EmailAddress>
+ <EmailAddress>mailto:aai@niif.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<SurName>NIIF AAI</SurName>
- <EmailAddress>aai@niif.hu</EmailAddress>
+ <EmailAddress>mailto:aai@niif.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="administrative">
<SurName>NIIF AAI</SurName>
- <EmailAddress>aai@niif.hu</EmailAddress>
+ <EmailAddress>mailto:aai@niif.hu</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ppke.hu.xml b/swamid-interfederations-2.0/idp.ppke.hu.xml
index bdee2582..b195ebd6 100644
--- a/swamid-interfederations-2.0/idp.ppke.hu.xml
+++ b/swamid-interfederations-2.0/idp.ppke.hu.xml
@@ -46,14 +46,14 @@
</Organization>
<ContactPerson contactType="technical">
<SurName>Csillag Tamás</SurName>
- <EmailAddress>cstamas@digitus.itk.ppke.hu</EmailAddress>
+ <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<SurName>Csillag Tamás</SurName>
- <EmailAddress>cstamas@digitus.itk.ppke.hu</EmailAddress>
+ <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="administrative">
<SurName>Csillag Tamás</SurName>
- <EmailAddress>cstamas@digitus.itk.ppke.hu</EmailAddress>
+ <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniparthenope.it.xml b/swamid-interfederations-2.0/idp.uniparthenope.it.xml
new file mode 100644
index 00000000..553ad794
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uniparthenope.it.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.uniparthenope.it/idp/shibboleth">
+
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-02-15T12:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <Extensions>
+ <shibmd:Scope regexp="false">uniparthenope.it</shibmd:Scope>
+
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UniPARTHENOPE IdP</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">UniPARTHENOPE IdP</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for PARTHENOPE University member</mdui:Description>
+ <mdui:Description xml:lang="it">Identity Provider per gli afferenti alla Universita' PARTHENOPE</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
+ BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
+ OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
+ ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
+ teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
+ Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
+ +JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
+ kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
+ lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
+ n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
+ K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
+ VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
+ 4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
+ K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
+ Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
+ c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
+ NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
+ cReeVaTfudJyy/pCjfbP
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniparthenope.it/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniparthenope.it/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <Extensions>
+ <shibmd:Scope regexp="false">uniparthenope.it</shibmd:Scope>
+
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UniPARTHENOPE AA</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">UniPARTHENOPE AA</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Attribute Autority for PARTHENOPE University member</mdui:Description>
+ <mdui:Description xml:lang="it">Attribute Autority per gli afferenti alla Universita' PARTHENOPE</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
+ BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
+ OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
+ ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
+ teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
+ Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
+ +JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
+ kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
+ lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
+ n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
+ K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
+ VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
+ 4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
+ K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
+ Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
+ c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
+ NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
+ cReeVaTfudJyy/pCjfbP
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="it">Università di Napoli Parthenope</OrganizationName>
+ <OrganizationName xml:lang="en">Università di Napoli Parthenope</OrganizationName>
+ <OrganizationDisplayName xml:lang="it">Università di Napoli Parthenope</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Università di Napoli Parthenope</OrganizationDisplayName>
+ <OrganizationURL xml:lang="it">http://www.uniparthenope.it</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.uniparthenope.it</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>N.Napolitano-A.Cioffi</SurName>
+ <EmailAddress>idem@uniparthenope.it</EmailAddress>
+ </ContactPerson>
+
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
index 1bf1ad7f..29f113f7 100644
--- a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
+++ b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
@@ -107,14 +107,14 @@
<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
-
+
</md:SPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
<md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="it">COMETA</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">INDICATE e-Culture Science Gateway provided by COMETA</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="it">INDICATE e-Culture Science Gateway erogato da COMETA</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
<md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/login.ntua.gr.xml b/swamid-interfederations-2.0/login.ntua.gr.xml
index d5c546ee..4c64fad2 100644
--- a/swamid-interfederations-2.0/login.ntua.gr.xml
+++ b/swamid-interfederations-2.0/login.ntua.gr.xml
@@ -60,17 +60,6 @@
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntua.gr</shibmd:Scope>
- <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:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>ntua.gr</mdui:DomainHint>
- <mdui:IPHint>147.102.0.0/16</mdui:IPHint>
- <mdui:IPHint>2001:648:2000::/48</mdui:IPHint>
- </mdui:DiscoHints>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/monitor.eduroam.org.xml b/swamid-interfederations-2.0/monitor.eduroam.org.xml
new file mode 100644
index 00000000..cbdaecc9
--- /dev/null
+++ b/swamid-interfederations-2.0/monitor.eduroam.org.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitor.eduroam.org/sp/module.php/saml/sp/metadata.php/default-sp">
+<md:Extensions>
+<mdrpi:RegistrationInfo registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+</md:Extensions>
+<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:KeyDescriptor use="signing">
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>MIIEfDCCA2SgAwIBAgIQTdxQXYGAzoPdJJ3pR03JNjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTExMDgyMzAwMDAwMFoXDTE0MDgyMjIzNTk1OVowVDELMAkGA1UEBhMCTkwxFTATBgNVBAoTDFNVUkZuZXQgQi5WLjEQMA4GA1UECxMHZWR1cm9hbTEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNtb25pdG9yLmVkdXJvYW0ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBEgy308qogrKuvyrPvpFOE7M1twTnJ+cxxkhnezYwDxQpwOOKzyEFazD93r8AYdUieFUqwkz8xtiPzXoQE3jwEajFZoqhIU+LXnXICqX9ZkHExlIwKqbq8bf0T2S8C60jRT52T+i3fcjDTAPi4nGQd/az21IUpHfgAl95D1Geg8LN2kijNkGVuH10dk6wUk0JStmMSrbkI+PC8uE+0ig1HvZ5E0pgo1JFfdo4s+daElwa5FpBYQ+z9uXC+DsdZd4ycRLV/yQJZSzIi69aeive5oIDwlijBDcAohZRfUU+Efv0ltr3/iYFUXnXmEXW8oruKFYLiaQ6Hd+ZqlgFdVIJQ</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>MIIEfDCCA2SgAwIBAgIQTdxQXYGAzoPdJJ3pR03JNjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTExMDgyMzAwMDAwMFoXDTE0MDgyMjIzNTk1OVowVDELMAkGA1UEBhMCTkwxFTATBgNVBAoTDFNVUkZuZXQgQi5WLjEQMA4GA1UECxMHZWR1cm9hbTEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNtb25pdG9yLmVkdXJvYW0ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBEgy308qogrKuvyrPvpFOE7M1twTnJ+cxxkhnezYwDxQpwOOKzyEFazD93r8AYdUieFUqwkz8xtiPzXoQE3jwEajFZoqhIU+LXnXICqX9ZkHExlIwKqbq8bf0T2S8C60jRT52T+i3fcjDTAPi4nGQd/az21IUpHfgAl95D1Geg8LN2kijNkGVuH10dk6wUk0JStmMSrbkI+PC8uE+0ig1HvZ5E0pgo1JFfdo4s+daElwa5FpBYQ+z9uXC+DsdZd4ycRLV/yQJZSzIi69aeive5oIDwlijBDcAohZRfUU+Efv0ltr3/iYFUXnXmEXW8oruKFYLiaQ6Hd+ZqlgFdVIJQ</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+<md:AttributeConsumingService index="0">
+<md:ServiceName xml:lang="en">monitor.eduroam.org</md:ServiceName>
+<md:ServiceDescription xml:lang="en">Web portal for eduroam monitoring services</md:ServiceDescription>
+<md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+</md:AttributeConsumingService>
+</md:SPSSODescriptor>
+<md:Organization>
+<md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
+<md:OrganizationName xml:lang="hr">AAI@EduHr</md:OrganizationName>
+<md:OrganizationDisplayName xml:lang="en">AAI@EduHr - Croatian Research and Education Federation</md:OrganizationDisplayName>
+<md:OrganizationDisplayName xml:lang="hr">AAI@EduHr - Autentifikacijska i autorizacijska infrastruktura sustava znanosti i obrazovanja u Republici Hrvatskoj</md:OrganizationDisplayName>
+<md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
+<md:OrganizationURL xml:lang="hr">http://www.aaiedu.hr</md:OrganizationURL>
+</md:Organization>
+<md:ContactPerson contactType="technical">
+<md:GivenName>Dubravko</md:GivenName>
+<md:SurName>Voncina</md:SurName>
+<md:EmailAddress>team@aaiedu.hr</md:EmailAddress>
+</md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no.xml b/swamid-interfederations-2.0/openwiki.uninett.no.xml
index 4b18a635..0e95fb23 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no.xml
@@ -1,21 +1,52 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
- <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a wikifarm where Feide users can create their own wiki.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikifarm hvor Feidebrukere kan lage egne wikier.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="nn">UNINETT OpenWiki er ein wikifarm der Feidebrukarar kan lage eigne wikiar.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/saml">
+<md:Extensions>
+<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+</md:Extensions>
+<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:Extensions>
+<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UNINETT OpenWiki</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
+ <mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</mdui:Description>
+ </mdui:UIInfo>
+</md:Extensions>
+<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
+<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
+<md:AttributeConsumingService index="0">
+<md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
+<md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
+<md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</md:ServiceDescription>
+<md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+<md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+</md:AttributeConsumingService>
+</md:SPSSODescriptor>
+<md:Organization>
+<md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+<md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+<md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+<md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+</md:Organization>
+<md:ContactPerson contactType="administrative">
+<md:GivenName>Andreas Åkre</md:GivenName>
+<md:SurName>Solberg</md:SurName>
+<md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+</md:ContactPerson>
+<md:ContactPerson contactType="technical">
+<md:GivenName>Andreas Åkre</md:GivenName>
+<md:SurName>Solberg</md:SurName>
+<md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+</md:ContactPerson>
+<md:ContactPerson contactType="support">
+<md:GivenName>Andreas Åkre</md:GivenName>
+<md:SurName>Solberg</md:SurName>
+<md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ricevi.ct.infn.it.xml b/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
index bf9f45bb..51990792 100644
--- a/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
+++ b/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
@@ -90,15 +90,15 @@
<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
-
+
</md:SPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
<md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="it">INFN Catania</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">RICeVI portal provided by INFN Catania</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="it">RICeVI portal erogato da INFN Catania</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
<md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/rr.funet.fi.xml b/swamid-interfederations-2.0/rr.funet.fi.xml
index 049a120a..a9eb3f61 100644
--- a/swamid-interfederations-2.0/rr.funet.fi.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi.xml
@@ -1,24 +1,27 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
- <mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rr.funet.fi/attribute-test">
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:mrpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
<mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
<mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
+ <mdui:Keywords xml:lang="en">attribute test</mdui:Keywords>
<mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</mdui:PrivacyStatementURL>
</mdui:UIInfo>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
- </saml:Attribute>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIE0DCCA7igAwIBAgIQS7m3h0H1sIaNEZszcAGJkTANBgkqhkiG9w0BAQUFADA2
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIE0DCCA7igAwIBAgIQS7m3h0H1sIaNEZszcAGJkTANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTExMTAzMTAwMDAwMFoXDTEzMTAzMDIzNTk1OVowgYkxCzAJBgNV
BAYTAkZJMRAwDgYDVQQIEwdVdXNpbWFhMQ4wDAYDVQQHEwVFc3BvbzEpMCcGA1UE
@@ -44,103 +47,135 @@ MA0GCSqGSIb3DQEBBQUAA4IBAQATrw/SpQYSrxZZsfoyBGhaKWvbEHoqRbSdWCRm
uFFSRNc83yNaoeaqI389Avavx/H3Cc8OSC96/AAYaJd5bXOM72ACqzdTirt5HoSm
Nl0PQ0q9HnDPw6xOoaWA7qyNcJld8sMzWS59calxZuuKZM/muNKouZKfojwFO6W8
mfbiKI1b+WpW/0//AVv1YuXNZESLBni/DFemenogJ8UGd6Tz</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
- <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
- <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
- <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
- <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Timo</md:GivenName>
- <md:SurName>Mustonen</md:SurName>
- <md:EmailAddress>haka@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Timo</md:GivenName>
- <md:SurName>Mustonen</md:SurName>
- <md:EmailAddress>haka@csc.fi</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEzDCCA7SgAwIBAgIRANkuMGk/HlexnQRYLfLoQaEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjAyMjgwMDAwMDBaFw0xNDAyMjcyMzU5NTlaMIGqMQswCQYD
+VQQGEwJGSTEOMAwGA1UEERMFMDIxMDExEDAOBgNVBAgTB1V1c2ltYWExDjAMBgNV
+BAcTBUVzcG9vMRYwFAYDVQQJEw1LZWlsYXJhbnRhIDE0MSkwJwYDVQQKEyBDU0Mg
+LSBJVCBDZW50ZXIgZm9yIFNjaWVuY2UgTHRkLjEQMA4GA1UECxMHVW5rbm93bjEU
+MBIGA1UEAxMLcnIuZnVuZXQuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDM5bZnIo6ilf+77pDys40qwpu1U6ym22WZvnxCmAoZ+dDOuBcVdoVagVTp
+MqJ0jc/c/7+grSHG+II+2MftSD78sa0fTWWLCqxdH8GKSfai5FeGbP/YoI14W7OL
+/Bxy7mAKluwkxtx+X5226Q7UeKHaBaF2i+An5i269HYzTO3XIt/eNHMKynsRQgje
+6pNj8PyDnIWm3DENXJi2yVK8AmVvWpEyx0RptMIazFCJa+MvypCYS4Y4D4wKEs5m
+3LWcsqM95zDsyiytv/fAYeRAVpWdTvhOPLW+3Q13/ek6/9Te03YAkzuAaLYvFxwu
+Vd2BLs7FAiyR3HDk0Ykl5TyimkaBAgMBAAGjggFeMIIBWjAfBgNVHSMEGDAWgBQM
+vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUOaXmVjDtx1G/7svHBNhFLrT5
+5rowDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILcnIuZnVuZXQuZmkwDQYJ
+KoZIhvcNAQEFBQADggEBADH55FfR7I+1zt41DTwz2Ig9w6S6l0pFL889eFl772qV
+/vepbU245oc+FuHxwp1Be1EeEo5Pb1Op+imx/tnXdJZyQ8T19cttw6k0faIIOPk0
+4LDPpPHeNd5UIiegJxuXLwGrs3s8OHrICSzD6UUTGuKQ2ch7Isl65oumZ5BYtmXc
+BipmtjTfM/pv+j2iTDMRfjzTjKSlDdDOaRbCQeLDtIgJkXvwSb/OTPOWHzbLLiPE
+rpMTlKYf36DnHsyERNItnzU02J686VAecWTuNgUwHHI3LzZCWVncQm+I6veK43Ct
+PahX4Y7zrHlQEDDBvQM0uwFM4Dgy07Qk3EwVXCs+46U=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</ServiceName>
+ <ServiceName xml:lang="en">Haka Attribute Test Service</ServiceName>
+ <ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</ServiceDescription>
+ <ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</ServiceDescription>
+ <RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="CountryOfResidence" Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduCourseMember" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduCourseOffering" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonCreditUnits" Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonECTS" Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonEPPNTimeStamp" Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonHomeCity" Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonProgram" Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonSpecialisation" Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudentCategory" Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudentStatus" Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudentUnion" Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonStudyToEnd" Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="funetEduPersonTargetDegree" Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="Nickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacCountryOfCitizenship" Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacGender" Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacPersonalUniqueCode" Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="schacPlaceOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="userPresenceID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="userStatus" Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+ <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+ <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+ <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Timo</GivenName>
+ <SurName>Mustonen</SurName>
+ <EmailAddress>haka@csc.fi</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Timo</GivenName>
+ <SurName>Mustonen</SurName>
+ <EmailAddress>haka@csc.fi</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rt.niif.hu.xml b/swamid-interfederations-2.0/rt.niif.hu.xml
index 2a01fe55..d7e066a4 100644
--- a/swamid-interfederations-2.0/rt.niif.hu.xml
+++ b/swamid-interfederations-2.0/rt.niif.hu.xml
@@ -42,14 +42,14 @@
</Organization>
<ContactPerson contactType="technical">
<SurName>NIIF AAI</SurName>
- <EmailAddress>aai@niif.hu</EmailAddress>
+ <EmailAddress>mailto:aai@niif.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<SurName>NIIF AAI</SurName>
- <EmailAddress>aai@niif.hu</EmailAddress>
+ <EmailAddress>mailto:aai@niif.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="administrative">
<SurName>NIIF AAI</SurName>
- <EmailAddress>aai@niif.hu</EmailAddress>
+ <EmailAddress>mailto:aai@niif.hu</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml b/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml
index 8ecadad8..d777e2c9 100644
--- a/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml
+++ b/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml
@@ -47,14 +47,14 @@
</Organization>
<ContactPerson contactType="technical">
<SurName>NIIF AAI</SurName>
- <EmailAddress>aai@niif.hu</EmailAddress>
+ <EmailAddress>mailto:aai@niif.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<SurName>NIIF AAI</SurName>
- <EmailAddress>aai@niif.hu</EmailAddress>
+ <EmailAddress>mailto:aai@niif.hu</EmailAddress>
</ContactPerson>
<ContactPerson contactType="administrative">
<SurName>NIIF AAI</SurName>
- <EmailAddress>aai@niif.hu</EmailAddress>
+ <EmailAddress>mailto:aai@niif.hu</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp2.cesnet.cz.xml b/swamid-interfederations-2.0/sp2.cesnet.cz.xml
index ade2dc82..5d62aa5d 100644
--- a/swamid-interfederations-2.0/sp2.cesnet.cz.xml
+++ b/swamid-interfederations-2.0/sp2.cesnet.cz.xml
@@ -121,8 +121,11 @@ OdbkmjrpK8okfqGw+9V2Sgk08Q==
<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
<OrganizationName xml:lang="en">cesnet.cz</OrganizationName>
+ <OrganizationName xml:lang="cs">cesnet.cz</OrganizationName>
<OrganizationDisplayName xml:lang="en">CESNET</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.cesnet.cz/</OrganizationURL>
+ <OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ces.net/</OrganizationURL>
+ <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
</Organization>
<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org.xml
index 415b4e60..fdc07ce4 100644
--- a/swamid-interfederations-2.0/terena.org.xml
+++ b/swamid-interfederations-2.0/terena.org.xml
@@ -1,31 +1,34 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
- <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
- <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
- <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>TERENA</md:GivenName>
+ <md:SurName>AAI team</md:SurName>
+ <md:EmailAddress>aai@terena.org</md:EmailAddress>
+ </md:ContactPerson>
+ </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vvc.niif.hu.xml b/swamid-interfederations-2.0/vvc.niif.hu.xml
new file mode 100644
index 00000000..b1b832f3
--- /dev/null
+++ b/swamid-interfederations-2.0/vvc.niif.hu.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vvc.niif.hu/shibboleth">
+ <Extensions>
+ <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
+ <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+ <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <mdui:InformationURL xml:lang="hu">http://vvc.niif.hu/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="hu">http://vvc.niif.hu/</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>vvc.niif.hu</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDpjCCAo6gAwIBAgIJAMjwevTdUaFoMA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNVBAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxFDASBgNVBAMTC3Z2Yy5uaWlmLmh1MB4XDTEwMDIwMzExMTA0NVoXDTM3MDYyMTExMTA0NVowQDELMAkGA1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEUMBIGA1UEAxMLdnZjLm5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoona+rrWD+FiNj++BK8vn/dQyMCteRKU4wa8ZTNycUjoP26eEOkBw6oqrnw1qyw3oKKUVfCEiIIlfXg9nJ5qMo7NTYKe/IlanYC+uGMTmT8DjgTH9fpA/8CoNjssuyAOhh0oEGdWoPcCd89K+II8uF7Fjz1EhP3WRhWfDTO+mfytMj4qwzV2oLUOfePt7LYMXNNoPkWAPa5bar/z0Nl244NjChWvSsM73r23yh1LTCmSH9Lhpotx/k+wvQybhraDhOE57NddmEL/5ylhX91Trsi32ukNO2XG4Ndbm5voonxeVRfB6j1rMa51SwEvTZkmDSThx7rvvzZ/f6x/9WdjDAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFLwrQAopwhLyqnRtc3BcA1NQJZaBMHAGA1UdIwRpMGeAFLwrQAopwhLyqnRtc3BcA1NQJZaBoUSkQjBAMQswCQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRQwEgYDVQQDEwt2dmMubmlpZi5odYIJAMjwevTdUaFoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHx0XxnnnmJztT/UEOrQ0nvR3NTGYJijfG68/bovwtrXJB+9plWTYyWyIeysddciTSgmaaVnGFw9jj8HtpuAvf3N5mKr6bELP8z7lhGa/WxKgjjv/ETTflNOCf8tkhxFJeSJC/Y03MOq+Xqb+6ZzriJIVNYhKDOxR+6inftRQSJ2NWmbgwurPYE/CpvqtDTrXeRnweZ1qAjWzKBswU5Un5mnPxcBPOoBuXtf3hhZU8/u4oXEBBQrsX0BsAFmY6VsJKO/UNB+AtAajgMZbngFXKBUCKDhSwmFUNjLda2MtF6WmuCUuMgQsdV6d/pp47VnVpkLLCVTNunYA/WvlS+G5kU=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AttributeConsumingService index="1" isDefault="true">
+ <ServiceName xml:lang="hu">NIIF kollaborációs portál</ServiceName>
+ <ServiceName xml:lang="en">NIIF Voice Video Collaboration Service</ServiceName>
+ <ServiceDescription xml:lang="hu">Elsősorban kutató-fejlesztő csoportok együttműködését hatékonyan támogató infokommunikációs szolgáltatások gyűjteménye (voip, web-, és videó konferencia).rn </ServiceDescription>
+ <ServiceDescription xml:lang="en">Community and support portal of NIIF collaboration services, which provides tools and information to access NIIF collaboration services like VoIP and Videoconferencing (MCU booking, videoconference recording, streaming, etc.)</ServiceDescription>
+ <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="affiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationName>
+ <OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationName>
+ <OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationDisplayName>
+ <OrganizationURL xml:lang="hu">http://www.niif.hu</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.niif.hu</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <SurName>NIIF AAI</SurName>
+ <EmailAddress>mailto:aai@niif.hu</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <SurName>Video Admin</SurName>
+ <EmailAddress>mailto:video-admin@niif.hu</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <SurName>Video Admin</SurName>
+ <EmailAddress>mailto:video-admin@niif.hu</EmailAddress>
+ </ContactPerson>
+ </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/whoami.cesnet.cz.xml b/swamid-interfederations-2.0/whoami.cesnet.cz.xml
index 3a95a4d8..e7953bca 100644
--- a/swamid-interfederations-2.0/whoami.cesnet.cz.xml
+++ b/swamid-interfederations-2.0/whoami.cesnet.cz.xml
@@ -106,8 +106,11 @@ i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
<Organization>
<OrganizationName xml:lang="en">cesnet.cz</OrganizationName>
+ <OrganizationName xml:lang="cs">cesnet.cz</OrganizationName>
<OrganizationDisplayName xml:lang="en">CESNET</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.cesnet.cz/</OrganizationURL>
+ <OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ces.net/</OrganizationURL>
+ <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 04:40:30 +0000