summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2016-02-14 14:10:24 +0100
committerLeif Johansson <leifj@sunet.se>2016-02-14 14:10:24 +0100
commita3f8618c3df7b461b4788dbc11e7c917f56fa03a (patch)
tree65b3ac6426eae4620db13c857ac09a125f0073ec
parentacf78be9a6260df9737a475da3d63bc334ef6dac (diff)
parent333eb6555dcfeeffbadab702b9d3fadc6b5dd904 (diff)
merge
-rw-r--r--Makefile8
-rw-r--r--swamid-2.0/ac-w01.nordu.net-shibboleth.xml77
-rw-r--r--swamid-2.0/account.hs.se-shibboleth.xml93
-rw-r--r--swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml12
-rw-r--r--swamid-2.0/auth.asiaportal.info.xml2
-rw-r--r--swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml2
-rw-r--r--swamid-2.0/cas.weblogin.uu.se-cas.xml4
-rw-r--r--swamid-2.0/ci.nordu.net-shibboleth.xml8
-rw-r--r--swamid-2.0/confluence.it.su.se-shibboleth.sso.xml12
-rw-r--r--swamid-2.0/connect-beta.sunet.se-shibboleth.xml2
-rw-r--r--swamid-2.0/connect.sunet.se-shibboleth.xml2
-rw-r--r--swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml2
-rw-r--r--swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml30
-rw-r--r--swamid-2.0/e5.onthehub.com.xml4
-rw-r--r--swamid-2.0/emrex.its.umu.se-gui-sp.xml95
-rw-r--r--swamid-2.0/fs.liu.se-adfs-services-trust.xml4
-rw-r--r--swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/hbidp.hb.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/hobel.c3se.chalmers.se.xml87
-rw-r--r--swamid-2.0/identity.mdh.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.bth.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.chalmers.se-adfs-services-trust.xml11
-rw-r--r--swamid-2.0/idp.hig.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/idp.his.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.hkr.se-idp-shibboleth.xml51
-rw-r--r--swamid-2.0/idp.irf.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.it.gu.se-idp-shibboleth.xml17
-rw-r--r--swamid-2.0/idp.it.su.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.kb.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.kkh.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/idp.kmh.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.konstfack.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.kva.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.lnu.se-idp-shibboleth.xml2
-rw-r--r--swamid-2.0/idp.lu.se-idp-shibboleth.xml7
-rw-r--r--swamid-2.0/idp.mah.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.nordu.net-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.rkh.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/idp.sics.se-idp-shibboleth.xml2
-rw-r--r--swamid-2.0/idp.student.bth.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.suni.se-adfs-services-trust.xml2
-rw-r--r--swamid-2.0/idp.ths.se-idp-shibboleth.xml178
-rw-r--r--swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml13
-rw-r--r--swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml7
-rw-r--r--swamid-2.0/idp2.hig.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp2.hv.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp2.kau.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml8
-rw-r--r--swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml81
-rw-r--r--swamid-2.0/kiidp.ki.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml83
-rw-r--r--swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml2
-rw-r--r--swamid-2.0/login.du.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/login.idp.eduid.se-idp.xml.xml17
-rw-r--r--swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml2
-rw-r--r--swamid-2.0/login.ki.se-idp-shibboleth.xml199
-rw-r--r--swamid-2.0/login.liu.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml199
-rw-r--r--swamid-2.0/ludicris.lub.lu.se-shibboleth.xml86
-rw-r--r--swamid-2.0/ludwig.lub.lu.se-sp.xml56
-rw-r--r--swamid-2.0/mp.uu.se-shibboleth.sso.xml5
-rw-r--r--swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml (renamed from swamid-2.0/wisumstage.its.umu.se-shibboleth.xml)97
-rw-r--r--swamid-2.0/play.mah.se-shibboleth.xml58
-rw-r--r--swamid-2.0/play.mah.se.xml48
-rw-r--r--swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml71
-rw-r--r--swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/scalear-saml.herokuapp.com.xml21
-rw-r--r--swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/shibb1.hj.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/signon.hh.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/swamid2.shh.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/ubas.lu.se-shibboleth.xml91
-rw-r--r--swamid-2.0/uraccess.net-shibboleth.xml99
-rw-r--r--swamid-2.0/urn-urkund-shibboleth-sp.xml12
-rw-r--r--swamid-2.0/vartuppdrag.se.xml73
-rw-r--r--swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml101
-rw-r--r--swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/webinar.nordu.net-shibboleth.xml2
-rw-r--r--swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml230
-rw-r--r--swamid-2.0/weblogin.uu.se-idp-shibboleth.xml9
-rw-r--r--swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml117
-rw-r--r--swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml92
-rw-r--r--swamid-2.0/www.egencia.com-auth-v1.xml82
-rw-r--r--swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml2
-rw-r--r--swamid-2.0/www.researchprofessional.com-shibboleth.xml20
-rw-r--r--swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml104
-rw-r--r--swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml102
-rw-r--r--swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml92
-rw-r--r--swamid-edugain-idp-1.0.mxml4
-rw-r--r--swamid-edugain-sp-1.0.mxml1
-rw-r--r--swamid-interfederations-1.0.mxml9
-rw-r--r--swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml58
-rw-r--r--swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml59
-rw-r--r--swamid-interfederations-1.0/clarino.uib.no-.xml93
-rw-r--r--swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml8
-rw-r--r--swamid-interfederations-1.0/idp.feide.no.xml9
-rw-r--r--swamid-interfederations-1.0/idp.lut.fi.xml76
-rw-r--r--swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-1.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml57
-rw-r--r--swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml2
-rw-r--r--swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml56
-rw-r--r--swamid-interfederations-1.0/repo.clarino.uib.no-shibboleth-sp.xml78
-rw-r--r--swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml52
-rw-r--r--swamid-interfederations-1.0/terena.org-sp.xml7
-rw-r--r--swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml47
-rw-r--r--swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml88
-rw-r--r--swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml112
-rw-r--r--swamid-interfederations-1.0/wayf.wayf.dk.xml8
-rw-r--r--swamid-interfederations-1.0/www.nederlab.nl-shibboleth.xml90
-rw-r--r--swamid-interfederations-1.0/www.ordbogen.com.xml1
-rw-r--r--swamid-interfederations-2.0.mxml149
-rw-r--r--swamid-interfederations-2.0/1010SE17FAM-V03.famerp.br-idp-shibboleth.xml102
-rw-r--r--swamid-interfederations-2.0/44uoc-shib.hosted.exlibrisgroup.com-shib.xml92
-rw-r--r--swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml10
-rw-r--r--swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aai-login.hsr.ch-idp-shibboleth.xml7
-rw-r--r--swamid-interfederations-2.0/aai-login.phsg.ch-idp-shibboleth.xml123
-rw-r--r--swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/aai-logon.ethz.ch-idp-shibboleth.xml170
-rw-r--r--swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aai.unil.ch-idp-shibboleth.xml155
-rw-r--r--swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml12
-rw-r--r--swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml88
-rw-r--r--swamid-interfederations-2.0/adfs.amolf.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs.artez.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs.driestar-educatief.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs.fom.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml25
-rw-r--r--swamid-interfederations-2.0/adfs.glu.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs.hsleiden.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/adfs.hsmarnix.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/adfs.ipabo.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs.kb.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/adfs.knmi.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs.maastrichtuniversity.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/adfs.nwo.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs.rijnhuizen.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/adfs.stenden.com-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs.stw.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs.surfmarket.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml12
-rw-r--r--swamid-interfederations-2.0/adfs01.kempel.nl-adfs-services-trust.xml48
-rw-r--r--swamid-interfederations-2.0/adfs1.oba.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs2.cito.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs2.fontys.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfs20.hva.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/adfs3host.proxy.rocmn.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/adfs3prod.aventus.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/adfsv2.inholland.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml2
-rw-r--r--swamid-interfederations-2.0/afire.asnet.am-idp-shibboleth.xml122
-rw-r--r--swamid-interfederations-2.0/agenda.ct.infn.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aiwip.com-shibboleth.xml99
-rw-r--r--swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml10
-rw-r--r--swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml7
-rw-r--r--swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml7
-rw-r--r--swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/ashiok.ufpe.br-idp-shibboleth.xml116
-rw-r--r--swamid-interfederations-2.0/atlas.sciencespo-lille.eu-idp-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml3
-rw-r--r--swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml7
-rw-r--r--swamid-interfederations-2.0/auth.asiaportal.info.xml2
-rw-r--r--swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml42
-rw-r--r--swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml113
-rw-r--r--swamid-interfederations-2.0/b2access.eudat.eu-8443-unitygw-saml-sp-metadata.xml101
-rw-r--r--swamid-interfederations-2.0/bath-test.topdesk.net-tas-public-login-verify.xml89
-rw-r--r--swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.xml89
-rw-r--r--swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml1
-rw-r--r--swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml30
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml58
-rw-r--r--swamid-interfederations-2.0/bismarck.nyme.hu-simplesaml-saml2-idp-metadata.php.xml64
-rw-r--r--swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml2
-rw-r--r--swamid-interfederations-2.0/brain.lab.vvc.niif.hu-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml68
-rw-r--r--swamid-interfederations-2.0/bureau.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml3
-rw-r--r--swamid-interfederations-2.0/cafe.cnen.gov.br-idp-shibboleth.xml114
-rw-r--r--swamid-interfederations-2.0/cafe.cp2.g12.br-idp-shibboleth.xml112
-rw-r--r--swamid-interfederations-2.0/cafe.ibict.br-idp-shibboleth.xml115
-rw-r--r--swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml16
-rw-r--r--swamid-interfederations-2.0/cafe.int.gov.br-idp-shibboleth.xml112
-rw-r--r--swamid-interfederations-2.0/cafe.mcti.gov.br-idp-shibboleth.xml112
-rw-r--r--swamid-interfederations-2.0/cafe.pucgoias.edu.br-idp-shibboleth.xml115
-rw-r--r--swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml80
-rw-r--r--swamid-interfederations-2.0/cafe.usf.edu.br-idp-shibboleth.xml108
-rw-r--r--swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml16
-rw-r--r--swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml88
-rw-r--r--swamid-interfederations-2.0/ccm.copac.jisc.ac.uk-shibboleth.xml96
-rw-r--r--swamid-interfederations-2.0/cgticafe.fiocruz.br-idp-shibboleth.xml113
-rw-r--r--swamid-interfederations-2.0/childcare.uas.ox.ac.uk-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/clarino.uib.no-.xml49
-rw-r--r--swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml33
-rw-r--r--swamid-interfederations-2.0/coco.aai.niif.hu-shibboleth.xml76
-rw-r--r--swamid-interfederations-2.0/conext.authenticatie.ru.nl-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/connect.ct.infn.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/courses.sci-gaia.eu-shibboleth.xml101
-rw-r--r--swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml2
-rw-r--r--swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml7
-rw-r--r--swamid-interfederations-2.0/demeter.wp.swov.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/demo.eduopen.org-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/dev.aiwip.com-shibboleth.xml100
-rw-r--r--swamid-interfederations-2.0/dev.clarin.nl-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/dev.niif.hu-shibboleth.xml67
-rw-r--r--swamid-interfederations-2.0/dev.scotlandonscreen.org.uk-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml217
-rw-r--r--swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml3
-rw-r--r--swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml52
-rw-r--r--swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml78
-rw-r--r--swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml131
-rw-r--r--swamid-interfederations-2.0/drupal-pilot-web-01.it.ox.ac.uk-shibboleth.xml109
-rw-r--r--swamid-interfederations-2.0/drupal-pilot-web-02.it.ox.ac.uk-shibboleth.xml109
-rw-r--r--swamid-interfederations-2.0/e-localcourses.unibo.it.xml2
-rw-r--r--swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/eco2meter.grnet.gr-shibboleth.xml99
-rw-r--r--swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/edited.com.xml96
-rw-r--r--swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/eduspot-n.oca.eu-authsaml2-metadata.xml100
-rw-r--r--swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml136
-rw-r--r--swamid-interfederations-2.0/engine.elixir-czech.org-authentication-sp-metadata.xml99
-rw-r--r--swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml78
-rw-r--r--swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml8
-rw-r--r--swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/federatie.umcn.nl-adfs-services-trust.xml48
-rw-r--r--swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml134
-rw-r--r--swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml141
-rw-r--r--swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml14
-rw-r--r--swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/federation.rijksmuseum.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/federation.springer-sbm.com-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml170
-rw-r--r--swamid-interfederations-2.0/fides.rivm.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml8
-rw-r--r--swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml2
-rw-r--r--swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml2
-rw-r--r--swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml4
-rw-r--r--swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml8
-rw-r--r--swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml6
-rw-r--r--swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml2
-rw-r--r--swamid-interfederations-2.0/gidp.federations.renam.md.xml113
-rw-r--r--swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml7
-rw-r--r--swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml147
-rw-r--r--swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/groupes.renater.fr-sympa.xml119
-rw-r--r--swamid-interfederations-2.0/gteavirtual.org.xml4
-rw-r--r--swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml2
-rw-r--r--swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml74
-rw-r--r--swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml55
-rw-r--r--swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml88
-rw-r--r--swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml17
-rw-r--r--swamid-interfederations-2.0/id.uni.lu-idp.xml21
-rw-r--r--swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml56
-rw-r--r--swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml120
-rw-r--r--swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml99
-rw-r--r--swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml1
-rw-r--r--swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml60
-rw-r--r--swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml61
-rw-r--r--swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml3
-rw-r--r--swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml94
-rw-r--r--swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml53
-rw-r--r--swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml118
-rw-r--r--swamid-interfederations-2.0/idp.aai.um.si-idp.xml100
-rw-r--r--swamid-interfederations-2.0/idp.abcolstudents.ac.uk-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml201
-rw-r--r--swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml20
-rw-r--r--swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml1
-rw-r--r--swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml58
-rw-r--r--swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml126
-rw-r--r--swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml58
-rw-r--r--swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml214
-rw-r--r--swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml9
-rw-r--r--swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml12
-rw-r--r--swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml4
-rw-r--r--swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml221
-rw-r--r--swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml84
-rw-r--r--swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml51
-rw-r--r--swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml215
-rw-r--r--swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml1
-rw-r--r--swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml12
-rw-r--r--swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml215
-rw-r--r--swamid-interfederations-2.0/idp.esufa.edu.co-idp-shibboleth.xml197
-rw-r--r--swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml208
-rw-r--r--swamid-interfederations-2.0/idp.feide.no.xml9
-rw-r--r--swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml218
-rw-r--r--swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml45
-rw-r--r--swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml98
-rw-r--r--swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.inalco.fr-idp.xml7
-rw-r--r--swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml4
-rw-r--r--swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml148
-rw-r--r--swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml10
-rw-r--r--swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml1
-rw-r--r--swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml68
-rw-r--r--swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml58
-rw-r--r--swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml1
-rw-r--r--swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml10
-rw-r--r--swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml2
-rw-r--r--swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml197
-rw-r--r--swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.nhl.nl-.xml2
-rw-r--r--swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml111
-rw-r--r--swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml16
-rw-r--r--swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml103
-rw-r--r--swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml9
-rw-r--r--swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml144
-rw-r--r--swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml94
-rw-r--r--swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml211
-rw-r--r--swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml100
-rw-r--r--swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml12
-rw-r--r--swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml201
-rw-r--r--swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml88
-rw-r--r--swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/idp.surfnet.nl.xml6
-rw-r--r--swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml124
-rw-r--r--swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml129
-rw-r--r--swamid-interfederations-2.0/idp.ths.se-idp-shibboleth.xml186
-rw-r--r--swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml74
-rw-r--r--swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml6
-rw-r--r--swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml65
-rw-r--r--swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml244
-rw-r--r--swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml99
-rw-r--r--swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml128
-rw-r--r--swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml114
-rw-r--r--swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml82
-rw-r--r--swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml117
-rw-r--r--swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml229
-rw-r--r--swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml112
-rw-r--r--swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml113
-rw-r--r--swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml27
-rw-r--r--swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml112
-rw-r--r--swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml1
-rw-r--r--swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml130
-rw-r--r--swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml11
-rw-r--r--swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml88
-rw-r--r--swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml24
-rw-r--r--swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml214
-rw-r--r--swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml60
-rw-r--r--swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml16
-rw-r--r--swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml187
-rw-r--r--swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml131
-rw-r--r--swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml206
-rw-r--r--swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml6
-rw-r--r--swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml47
-rw-r--r--swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml9
-rw-r--r--swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml87
-rw-r--r--swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml6
-rw-r--r--swamid-interfederations-2.0/janus.cnrs.fr-idp.xml59
-rw-r--r--swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/kentsso.simitive.com.xml86
-rw-r--r--swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml8
-rw-r--r--swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml49
-rw-r--r--swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml100
-rw-r--r--swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml1
-rw-r--r--swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml6
-rw-r--r--swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml46
-rw-r--r--swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml8
-rw-r--r--swamid-interfederations-2.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml57
-rw-r--r--swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml10
-rw-r--r--swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/login.justis.com.xml10
-rw-r--r--swamid-interfederations-2.0/login.ki.se-idp-shibboleth.xml212
-rw-r--r--swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml51
-rw-r--r--swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml102
-rw-r--r--swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml8
-rw-r--r--swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml11
-rw-r--r--swamid-interfederations-2.0/login.ou.nl-oam-fed.xml2
-rw-r--r--swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml6
-rw-r--r--swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml93
-rw-r--r--swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml38
-rw-r--r--swamid-interfederations-2.0/manage.federations.renam.md.xml128
-rw-r--r--swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml2
-rw-r--r--swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml70
-rw-r--r--swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml6
-rw-r--r--swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml10
-rw-r--r--swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml15
-rw-r--r--swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml15
-rw-r--r--swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml102
-rw-r--r--swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml107
-rw-r--r--swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml73
-rw-r--r--swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml89
-rw-r--r--swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml121
-rw-r--r--swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml13
-rw-r--r--swamid-interfederations-2.0/perfsonarui.geant.org.xml124
-rw-r--r--swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml12
-rw-r--r--swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml94
-rw-r--r--swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml95
-rw-r--r--swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml7
-rw-r--r--swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml108
-rw-r--r--swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml108
-rw-r--r--swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.xml71
-rw-r--r--swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml16
-rw-r--r--swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml6
-rw-r--r--swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml11
-rw-r--r--swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml4
-rw-r--r--swamid-interfederations-2.0/sarvik.taat.edu.ee-module.php-saml-sp-metadata.php-TAAT.xml6
-rw-r--r--swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml210
-rw-r--r--swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml96
-rw-r--r--swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml125
-rw-r--r--swamid-interfederations-2.0/secure.uva.nl-cas.xml6
-rw-r--r--swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml13
-rw-r--r--swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml1
-rw-r--r--swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml41
-rw-r--r--swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml114
-rw-r--r--swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml125
-rw-r--r--swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml84
-rw-r--r--swamid-interfederations-2.0/shib.reaseheath.ac.uk-idp-shibboleth.xml204
-rw-r--r--swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml41
-rw-r--r--swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml72
-rw-r--r--swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml75
-rw-r--r--swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml94
-rw-r--r--swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml98
-rw-r--r--swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml115
-rw-r--r--swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml116
-rw-r--r--swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml114
-rw-r--r--swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml64
-rw-r--r--swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml61
-rw-r--r--swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml83
-rw-r--r--swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml201
-rw-r--r--swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml213
-rw-r--r--swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml22
-rw-r--r--swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml215
-rw-r--r--swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml7
-rw-r--r--swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml99
-rw-r--r--swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml6
-rw-r--r--swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml206
-rw-r--r--swamid-interfederations-2.0/sp.catalog.clarin.eu.xml2
-rw-r--r--swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml81
-rw-r--r--swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml67
-rw-r--r--swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml43
-rw-r--r--swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml18
-rw-r--r--swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml106
-rw-r--r--swamid-interfederations-2.0/sso.eur.nl-opensso.xml6
-rw-r--r--swamid-interfederations-2.0/sso.han.nl-ssp.xml6
-rw-r--r--swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml7
-rw-r--r--swamid-interfederations-2.0/sso.saxion.nl-opensso.xml2
-rw-r--r--swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/sso.vito.be.xml44
-rw-r--r--swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml119
-rw-r--r--swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml104
-rw-r--r--swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml65
-rw-r--r--swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml91
-rw-r--r--swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml91
-rw-r--r--swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml53
-rw-r--r--swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml104
-rw-r--r--swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml96
-rw-r--r--swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml92
-rw-r--r--swamid-interfederations-2.0/unigepass.unige.it-idp.xml2
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml2
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml59
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml102
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml3
-rw-r--r--swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml6
-rw-r--r--swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml88
-rw-r--r--swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml104
-rw-r--r--swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml21
-rw-r--r--swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml102
-rw-r--r--swamid-interfederations-2.0/utwente.nl-.xml2
-rw-r--r--swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml80
-rw-r--r--swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml6
-rw-r--r--swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml16
-rw-r--r--swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/wayf.wayf.dk.xml8
-rw-r--r--swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml90
-rw-r--r--swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml8
-rw-r--r--swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml9
-rw-r--r--swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml120
-rw-r--r--swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml175
-rw-r--r--swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml116
-rw-r--r--swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml7
-rw-r--r--swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml8
-rw-r--r--swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml40
-rw-r--r--swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml48
-rw-r--r--swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml2
-rw-r--r--swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml8
-rw-r--r--swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml118
-rw-r--r--swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml80
-rw-r--r--swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml58
-rw-r--r--swamid-interfederations-2.0/www.ordbogen.com.xml1
-rw-r--r--swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml50
-rw-r--r--swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml66
-rw-r--r--swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml37
-rw-r--r--swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml1
-rw-r--r--swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml97
-rw-r--r--swamid-interfederations-2.0/www.sympa.org-shibboleth.xml113
-rw-r--r--swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml12
-rw-r--r--swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml12
-rw-r--r--swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml12
-rw-r--r--swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml63
-rw-r--r--swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml2
-rw-r--r--swamid-sp-2.0.mxml21
-rw-r--r--swamid-testing-idp-1.0.mxml2
-rw-r--r--xslt/normalize.xsl17
661 files changed, 24536 insertions, 3348 deletions
diff --git a/Makefile b/Makefile
index 021cd996..dc2de595 100644
--- a/Makefile
+++ b/Makefile
@@ -7,13 +7,14 @@ SRCDIRS=swamid-2.0
DAYS:=15
DATE=$(shell perl scripts/expiration_date.pl $(DAYS))
+NOW=$(shell perl scripts/now_date.pl)
RPI=false
CONTACTS=false
TOU=true
ORG=true
TRANSFORM=xslt/normalize.xsl
ID=$(shell perl scripts/unique_id.pl)
-XSLTDEFS := --stringparam org $(ORG) --stringparam ID $(ID) --stringparam tou $(TOU) --stringparam rpi $(RPI) --stringparam defaultContact $(CONTACTS) --stringparam date $(DATE)
+XSLTDEFS := --stringparam org $(ORG) --stringparam ID $(ID) --stringparam tou $(TOU) --stringparam rpi $(RPI) --stringparam defaultContact $(CONTACTS) --stringparam date $(DATE) --stringparam now $(NOW)
SIGNER := xmlsec1 --sign --privkey-pem $(KEY),$(CERT) --pwd $(PASS) --id-attr:ID urn:oasis:names:tc:SAML:2.0:metadata:EntitiesDescriptor
-include local.mk
@@ -25,12 +26,9 @@ MXML=$(shell echo *.mxml)
sign: swamid upstream projects
%.sig: %.mxml
- # normalization
- xsltproc $(XSLTDEFS) --xinclude $(TRANSFORM) $< > $*.n
- # signing
+ xsltproc $(XSLTDEFS) --stringparam target "http://md.swamid.se/md/$*.xml" --xinclude $(TRANSFORM) $< > $*.n
xsltproc $(XSLTDEFS) --xinclude xslt/sign.xsl $*.n > $*.tbs
$(SIGNER) --output $@ $*.tbs
- # verification
xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $@
#rm -f $*.tbs $*.n
diff --git a/swamid-2.0/ac-w01.nordu.net-shibboleth.xml b/swamid-2.0/ac-w01.nordu.net-shibboleth.xml
new file mode 100644
index 00000000..e687493a
--- /dev/null
+++ b/swamid-2.0/ac-w01.nordu.net-shibboleth.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ac-w01.nordu.net/shibboleth">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net" index="1"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/ds.sunet.se"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="3"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/kalmar2"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/kalmar2" index="4"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/Login/feide"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/DS/haka.funet.fi"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/haka.funet.fi" index="5"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ac-w01.nordu.net/Shibboleth.sso/Login/idp.funet.fi"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>ac-w01.nordu.net</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ac-w01.nordu.net</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAK6IEFZqeYNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFjLXcwMS5ub3JkdS5uZXQwHhcNMTUxMTI1MTQzMTMxWhcNMjUxMTIyMTQz
+MTMxWjAbMRkwFwYDVQQDExBhYy13MDEubm9yZHUubmV0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAm5n/c1jQxsE6ZLDCaLkxAzMkYAveKeF0uMosuZAm
+LbKK88nSMRvrM4XZWUxw4Y7Hhuy4CaI2ief6DEIeCvp1zL1akcRARLKR2dcZwhaI
+Xk5ZmSk0nZFmfCx/Q1/1QkWRtlTWZN5QWjKYhMf8v6NWQUkPkzcnTn5JsFRC53XB
+ZGm4PDxbsj4iHoR+fL78gqcZ/lNlWkico8dF1Gb5ECT7RoFLwYg3j9mJegEueZCd
+zI9xK4J8D1gCv98JhMFDnUuzOsUetKI+ztzgk2kvA4UUXSg5jNQmw4CXXvR4On9F
+zuyrlB7fxfHIUW4+msGDlSIcG4D9fkpgJVggYYfogslzTQIDAQABoz4wPDAbBgNV
+HREEFDASghBhYy13MDEubm9yZHUubmV0MB0GA1UdDgQWBBTSzNfSHtoiM3DkR1ki
+UjaoX4s3KzANBgkqhkiG9w0BAQUFAAOCAQEAkKma/1Q8c9Bfhya5ZjZeVoTD/q0m
+rM+K4C7a88+bEHyIAVi5iKXrGRqcYRxiOFJ90Bqrif5Lu1kXk//WfAoijVVO7LHR
+DstraFrFHnAk+Tqz4hgN7ttzgM63hR9uEe9M5euw00UQ1MTDX2EjUtB22T9m1IPn
+A9ToIGUpGX3izWzTLU+7h2do56ZxbVwH5c+NtQAGEIqDCEbtLvAaWu4XVor8Shj7
+pdi0ryFf9fQWwe8aUhmC8BNl5KNnDMgo3ka39txGyo9bxjJHEHJDwiZNasMgHoCa
+o53aOf7QIMq0SMHnBJXRznGwibXlXP0Wtbl2hpcO5QxiZHziD434b0eYqQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ac-w01.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ac-w01.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/account.hs.se-shibboleth.xml b/swamid-2.0/account.hs.se-shibboleth.xml
new file mode 100644
index 00000000..7fb612a9
--- /dev/null
+++ b/swamid-2.0/account.hs.se-shibboleth.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://account.hh.se/Shibboleth">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://account.hh.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Halmstad University, account activation and password reset</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad, kontoaktivering och lösenordsåterställning</mdui:DisplayName>
+ <mdui:Description xml:lang="en">As a new user you can use this service to activate your university computer account or reset your password.</mdui:Description>
+ <mdui:Description xml:lang="sv">Med denna tjänst kan du aktivera ditt datorkonto vid högskolan eller återställa ditt glömda lösenord.</mdui:Description>
+ <mdui:Logo xml:lang="sv" height="116" width="350">https://account.hh.se/images/hh-logo-sv-350x116.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="116" width="350">https://account.hh.se/images/hh-logo-en-350x116.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">https://account.hh.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">https://account.hh.se</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>account.hh.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=account.hh.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJANrRd35k7LpWMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMTDWFjY291bnQuaGguc2UwHhcNMTUxMjA3MDkxODEzWhcNMjUxMjA0MDkxODEz
+WjAYMRYwFAYDVQQDEw1hY2NvdW50LmhoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA2HB+aZke+IC6XxLw2ZzHyJLBQhw/rgIUvdGOcTuU5ypQbKAO
+V1BQwBf/rt+BXg4pmms0zyGXZdwmmWTtdSmyVAWTIBHLigzbC15kjHBWNa7anCtU
+Dvs4ufdcc9H9dzaJ3l3rMnNUTtMWB4ejl8I2iJ/KGJxLr/WjG/Bqdd9vHC1vy6qk
+4EhsGdlEG9wGKex8zbd/ZfEW2BURpu6QzhVDOSxN9tmEjCqZgBdGeCS0eIYiSWou
+sLGHmsHuFkbj3N/X/C/liPNsrkZlRZTo7771P5ZXpCGPiUhy55c9w8DVJH3v/Eck
+MPn09RTv/07q4c+/KT44KTjPSbE/ViMO7z8mmwIDAQABozswOTAYBgNVHREEETAP
+gg1hY2NvdW50LmhoLnNlMB0GA1UdDgQWBBQNLv4rShYW33jjJr4ktO8USse3NjAN
+BgkqhkiG9w0BAQUFAAOCAQEAUbSIeQhGhRVh4WiAUQHC5YXG5bM2za7Ypwr01OtS
+10rGvweXYu0i5lTsuXDvkoZG3f16guXytmRnq0TT5maRJvfrWvVFbzaPCMOpXwFb
+Jiy+4HsIFEdqFrwUbCu5Q3KKXkTl+VZQb0GooFiZSdKGdA7Ij/uNU6U8ZnLKDJqq
+1rhu4mDXbyGP/9Mxhw62QMn9SDXFv/8t0XdM8nHu+Ai65BdSLmVwIo8V+Dcuf9cZ
+vw4SWII7yvqumgRvNcDvdMSYHvI3sxwtGMFz2FV4MKl9k6R46tt6kgnynyUThn4t
+bK0IFZ5apkn9N3YME8KiyAf5bSY31fBoQVszf+Gm2wN+qw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.hh.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.hh.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.hh.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.hh.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.hh.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.hh.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.hh.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.hh.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.hh.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.hh.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.hh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.hh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
index 7a90b5db..0b72f4c0 100644
--- a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
@@ -24,21 +24,21 @@
<KeyDescriptor use="encryption">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIC3DCCAcSgAwIBAgIQFZiyu9vx3bVBXRoeCQUILTANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgwN1oXDTE1MTIyMzIxNDgwN1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2+ePiq76UBNnhcXAGacPiTg6kLX5OAmUM0ehzmMYLEywp/eH65OjzD6Gz0mYxXL9xCw9U/m61LGhVLzZt7ZmYPs8SlxMHzsjawrGp5gsFXdo99nwbxGElbCYlJiS7Y+GMkXUtAIW3N4MoktO9j7Q7Iu4f6bnOkRLgdGXkvv2RTiD5CaOodAnzdwncVmFORk3ued1ZeS0S4AyFJFC4RqYmDrvU3eLyCdHQZoZ3SO1RkSicpTHibOaYZ1pP8keEHJ2aP63iw1WFF49cIucVcyeJ+1SBkorXPKBKhw5BJP17USD290ZWzPmTXLLieHyYKINxK3xe1xCESVLxJJgnca78CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZDl80K94WjYpIjpa2q6FZ7ZaLTGA7ffW5gdQfPcbJbCkuWCmCsCmOwDmFFZ5Gb+4tKJxHF2Z+Tzt8yIY/OCg0Y61lerXdoNC1bYahnUDDfU11m441vsCAyymftBZsOewupXdcyh3NPiduOlJd8iXybZ6BZaUoVUjfkFAmjkii+pJB+H+gXo2CBNksAXhUAbk4es/1FSSNdXGrDG8qj91uX+l69oQK1ERIpux2ALEv/j/zBNYNQgYiYPyP+/b06/MUTxNbFC4LGb3XcIk0OqOauhoZcoEcTLcmPycOYs8hJl80lWSEGhl9+qXhoxNpkh4ucYxvDArCsCgYQZd/HhN6w==</X509Certificate>
+ <X509Certificate>MIIC3DCCAcSgAwIBAgIQO7k5W9bEBJdDpzGopgV4OzANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTE1MTIwNDAwMTgxN1oXDTE2MTIwMzAwMTgxN1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALfykzr9WnvSwX4yhG6rLbTwvvAXcvMWyUcbV5usDITt2FpdPyD7eMOJVoefIimvQGQ3JKlnoKwsTBMNZGJIaKXNRX06rYjOr2Isip0f7BLxiHXAJcif80MLqeuXRGELa0Z5en3irAscOGOWtpxYebslAAhZZqjOUbU4BlvutwCPa/FIqPhLhWoWkfXy8/Bs1VYnSCWCAO5UTRFzRi3K8glKy/1NFiP90LapP+/V1U+Zr3/rGg+2usWFjADPEFjFj7bnFC2pmxuEQf0F0XFC6s8mbXOOcsHGqvKrsQdgeqfBJMHofhh0hkTA9Gsl8TP4yRT5NQ80EA8ry6Zko6TmcC8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEANAq63e5sekNfz1PnSG1dLGa9xpMCz3Nk5IyPb5ED7hrPXHXZG2FXRJDXHm2ux0yIOhS0uLkoApAupXiE87pga/6aPod2fSGbBgihRIBNRuAr7g7HjL5w5N0gZPEzby3fYqFR0L4qRxALWbnYfFAjPbY+KfRs86TVgSBFoSY6N5+MYGtcoAL7wl0TRO3aua8uHsTZp8pZ4/CxSmLL1tC1abVuoqD7EcwWJq0tRdrI7UM1vjAWiLMvsp3XS+7LHvZXVXnYnp/rVpSnkA8C7ApthhV7s4ms2ecUYUO1t8AHBgYRQ/kme0Twd7SddHyAwN/PZVGwu3bPIPbUgg374YP69g==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIC1jCCAb6gAwIBAgIQKEGE7N1PhqND4Izv6Nl9tzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MDExMjE5MjYwMloXDTE1MDExMjE5MjYwMlowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgssWOg27ZeOAIofyLaYIxZxFPVyWVMoX8uaAeM0mYEj+ENT1pM4+G7sGNwKEIyOST6Lu7L7BMMku8jFF6Rt2GgV7dWDgWa2nNQ3H3XDQIH4ggZTmibrfBoyEpgNwuPhCqW+n4sr19jmO5aYs3elwSc4ogiaEPQy+CDpBKq9wO4hD4YOuD6jBtmkySvkG/rE7BSkC/fxg6qeNFdC4xVhkJZuU+tJRbBIHznqAD6kErdgHlM82sKoTN6q1dZk9AkE8ZwmI9T1s2g2eY1cB77Px7rqXCvbA2+Tjt2I3f8m99JxY5gHedR7UJfKLBPlo3V0rMJZlFfGOGKR8z9AphA/G0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAtbBphHKTw16aTAZ1ihlZQNnT3UgVC2JwlnZD16iczLa+96NiBNwu6il9K7UwjA/JD6t7dNWoVXEJTREGJUs9IzN1XP7PwqU8zlIiug8p7q8Efit8JppO1vmgpofom+OVxZ1A8vc5wmsuvwLoEQGu0Y/3JawPsaDvA7wdF+Bnqo+DTVCIe3wOGAY6D2C4XIvYZirz3cFoTd4BrGLx/dfRkmBmIeDJ39G1DcRfAZF59b1c7n4OeEhq2dg7yKP1ql0e1bKOKKqW0wXStNHamceJWU/hbCNid87rKpvTMvH8ClkC2pf3R2/bR27VuhWyAbPTp1+hhIJKmCWTkEtt/JOg4w==</X509Certificate>
+ <X509Certificate>MIIC1jCCAb6gAwIBAgIQYSuOi8k52qFDiHIcmLzhUzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgxMVoXDTE1MTIyMzIxNDgxMVowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeZpLVFfRtz3BFIEKaCOcf0w3041Vna4JAhxKT9hkhMW5TSh2S7hcgBiRm6Q2olmBtc+KMN9ReJT1ZJzQUa27qaGRepO/M+isJk4QqL9zOX/BpYFEWTRYMLlqqukZBhtwdtluIMCJlAClccRSikCx+bGN+fcPwfrv3T2y+C+MMp8GIN/QWJf97GEP5XR9VooItR8+nkUm1FOkvKMr5xFwZfilXQTzDer3Z42yMYRpr8rw7QdMJP11A7v7NIZTYRQIU+Qi0uPsvRI5FI7IG3NWyepslS1vwjU/dpKeBUYLQwwRxvV09YX+ULSKpClm2oZ7LuE/vt7Bok6vnPa3TG+i0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAktHUw5HNOOH/ETVIeAgdi5FXq5e8maX8Qe5vFsWRWPTP9MygRwNajY07XpXQmw2CKbAzY6ZD2RoA7g9swBpCcNYuJmAnA3LtyFiRrog/+XzWeRt7tbqDjiYZiBdVD84JbfVMD3q0Pi4iLn+KPAmYajYAzftf1vKr/fvwFt2D2eR+sXefEmcwNPSFFma0umEgSajxiN4gdTA3ZMTNV1J5tv1cwb9TYx0mDHP+FCwsEE2bHsDk5CDBWpgFVvEiQwfra1amz+BIPWG5Nln9bedfE0BjdGH5OK424DBwBTygzBV8OM9jB7dOcaA+0K0/UduM+ka42XxP7WFrq3VKmGfCbg==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIC1jCCAb6gAwIBAgIQYSuOi8k52qFDiHIcmLzhUzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgxMVoXDTE1MTIyMzIxNDgxMVowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeZpLVFfRtz3BFIEKaCOcf0w3041Vna4JAhxKT9hkhMW5TSh2S7hcgBiRm6Q2olmBtc+KMN9ReJT1ZJzQUa27qaGRepO/M+isJk4QqL9zOX/BpYFEWTRYMLlqqukZBhtwdtluIMCJlAClccRSikCx+bGN+fcPwfrv3T2y+C+MMp8GIN/QWJf97GEP5XR9VooItR8+nkUm1FOkvKMr5xFwZfilXQTzDer3Z42yMYRpr8rw7QdMJP11A7v7NIZTYRQIU+Qi0uPsvRI5FI7IG3NWyepslS1vwjU/dpKeBUYLQwwRxvV09YX+ULSKpClm2oZ7LuE/vt7Bok6vnPa3TG+i0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAktHUw5HNOOH/ETVIeAgdi5FXq5e8maX8Qe5vFsWRWPTP9MygRwNajY07XpXQmw2CKbAzY6ZD2RoA7g9swBpCcNYuJmAnA3LtyFiRrog/+XzWeRt7tbqDjiYZiBdVD84JbfVMD3q0Pi4iLn+KPAmYajYAzftf1vKr/fvwFt2D2eR+sXefEmcwNPSFFma0umEgSajxiN4gdTA3ZMTNV1J5tv1cwb9TYx0mDHP+FCwsEE2bHsDk5CDBWpgFVvEiQwfra1amz+BIPWG5Nln9bedfE0BjdGH5OK424DBwBTygzBV8OM9jB7dOcaA+0K0/UduM+ka42XxP7WFrq3VKmGfCbg==</X509Certificate>
+ <X509Certificate>MIIC1jCCAb6gAwIBAgIQMXP1/ezaSIZIOp/pjOiCgDANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE1MTIwNDAwMTgyMloXDTE2MTIwMzAwMTgyMlowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALdO7kcKNsClDGcJNKysS7MxE6iNlMAYxIkoJju5qvxjazuHxKmOzScYv1x83pw0VhJRg3psmus52tynauQ0Rvsba8F7Ngk6W9e21MbPjpMdF68k2x0zWnNpg+fMDoEWTds5S6QNUzsKp3eaI2tkMny8Ng33ZD2XvjkG/T7BDkIeH1aZvA1COBqNPx0WS7usc9LYtdNghdn24H7ZlcPCokZJbeDnbuUNS7c/mjQLXKKExUFcoEKduEeUF3zeT2D531TSLNwiJ9iQJ9rRFWK7hrgr2oP+sdojvoeI8cwP/TSGWfvDoU1sRZ9qTlSN+b0W/MnSkdKBzRjTCMpRa/ABvWkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAo9sQIrRQ3uEENG/oyrmV65NUb3Ta9fd28VHq1Rk/M5UUeqzsO6Agyt3YBAdaeRgGw8l6NBG+XFyNjLsGY9gND64gQF+65zSrEwdbwqEFciR0ZNVw1E3Bqq7W4MjeH4EtG5eTplvR3A77vfKy/vFXn13draGgZOX7e2mJ/CNK4drUYNvMorf2+ZcP1FjvypV91bY8g168+0lZYHGYrmy4ajVBvFZ82LJuW2OCZ4KPLIY51qpNiMeikePzUNc6/CKJ0zLq4bRRSy2kCyj0Pq2dwV+N0WAVGFJ8uxDRZx7AFG5+JcajSyDYHVVjUIzzqS8UDVV7/XWAQmWcEU4eNid1Hg==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
@@ -83,19 +83,19 @@
<ContactPerson contactType="administrative">
<Company>Swedish Defence University</Company>
<SurName>FHS IT Helpdesk</SurName>
- <EmailAddress>helpdesk@fhs.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
<TelephoneNumber>+46 8 55342545</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Swedish Defence University</Company>
<SurName>FHS IT Helpdesk</SurName>
- <EmailAddress>helpdesk@fhs.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
<TelephoneNumber>+46 8 55342545</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Swedish Defence University</Company>
<SurName>FHS IT Helpdesk</SurName>
- <EmailAddress>helpdesk@fhs.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
<TelephoneNumber>+46 08 55342545</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/auth.asiaportal.info.xml b/swamid-2.0/auth.asiaportal.info.xml
index 3ce1c4b8..b3a09e34 100644
--- a/swamid-2.0/auth.asiaportal.info.xml
+++ b/swamid-2.0/auth.asiaportal.info.xml
@@ -42,6 +42,6 @@
</md:SPSSODescriptor>
<md:ContactPerson contactType="technical">
<md:GivenName>Administrator</md:GivenName>
- <md:EmailAddress>bib@nias.ku.dk</md:EmailAddress>
+ <md:EmailAddress>mailto:bib@nias.ku.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index cb40ab70..564f8a9e 100644
--- a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -59,6 +59,6 @@
<md:ContactPerson contactType="technical">
<md:GivenName>NORDUNet</md:GivenName>
<md:SurName>NOC</md:SurName>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/cas.weblogin.uu.se-cas.xml b/swamid-2.0/cas.weblogin.uu.se-cas.xml
index 870dd6cf..83d7361a 100644
--- a/swamid-2.0/cas.weblogin.uu.se-cas.xml
+++ b/swamid-2.0/cas.weblogin.uu.se-cas.xml
@@ -6,8 +6,8 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">Interna tjänster vid Uppsala universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Internal services at Uppsala University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Uppsala universitets central autentisering service</mdui:Description>
- <mdui:Description xml:lang="en">The central authentication service at Uppsala University</mdui:Description>
+ <mdui:Description xml:lang="sv">Uppsala universitets centrala autentiseringsservice (CAS)</mdui:Description>
+ <mdui:Description xml:lang="en">The Central Authentication Service (CAS) at Uppsala University</mdui:Description>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
diff --git a/swamid-2.0/ci.nordu.net-shibboleth.xml b/swamid-2.0/ci.nordu.net-shibboleth.xml
index 938a34ff..9f9ef3b1 100644
--- a/swamid-2.0/ci.nordu.net-shibboleth.xml
+++ b/swamid-2.0/ci.nordu.net-shibboleth.xml
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ci.nordu.net/shibboleth">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ci.nordu.net/Shibboleth.sso/Login"/>
diff --git a/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
index 1fcd5ab3..bab3135f 100644
--- a/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
@@ -1,9 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://confluence.it.su.se/Shibboleth.sso">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://confluence.it.su.se/Shibboleth.sso/WAYF" index="1"/>
<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://confluence.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Confluence at Stockholm University</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Confluence vid Stockholms universitet</mdui:DisplayName>
+ </mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
index a0822151..2d85d7f0 100644
--- a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
@@ -100,6 +100,6 @@ H/AVOR5U++JOt28OOfoi7mtxOFPxkge3AooWLNFOEOGMSF78BG8NCrT0l59OnAtN
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>NORDUnet NOC</md:Company>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/connect.sunet.se-shibboleth.xml b/swamid-2.0/connect.sunet.se-shibboleth.xml
index f934124e..a771dbce 100644
--- a/swamid-2.0/connect.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect.sunet.se-shibboleth.xml
@@ -103,6 +103,6 @@ bUs=
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>NORDUnet NOC</md:Company>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml b/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
index 9c99a917..025747a6 100644
--- a/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
+++ b/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
@@ -85,6 +85,6 @@ D265cqy6Le/toVg=
<md:ContactPerson contactType="technical">
<md:GivenName>Oleg</md:GivenName>
<md:SurName>Mirzov</md:SurName>
- <md:EmailAddress>oleg.mirzov@nateko.lu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:oleg.mirzov@nateko.lu.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..e09d0951
--- /dev/null
+++ b/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://devsp.sweclarin.se/sp/module.php/saml/sp/metadata.php/default-sp">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIID8TCCAtmgAwIBAgIJAMjuGy2xpLirMA0GCSqGSIb3DQEBCwUAMIGOMQswCQYDVQQGEwJTRTETMBEGA1UEBwwKR290aGVuYnVyZzEmMCQGA1UECgwdU3dlZGlzaCBOYXRpb25hbCBEYXRhIFNlcnZpY2UxDzANBgNVBAsMBlNORCBJVDEOMAwGA1UEAwwFREVWU1AxITAfBgkqhkiG9w0BCQEWEnBhYmxvLm1pbGxldEBndS5zZTAeFw0xNTEwMTkwNjUzNDdaFw0yNTEwMTgwNjUzNDdaMIGOMQswCQYDVQQGEwJTRTETMBEGA1UEBwwKR290aGVuYnVyZzEmMCQGA1UECgwdU3dlZGlzaCBOYXRpb25hbCBEYXRhIFNlcnZpY2UxDzANBgNVBAsMBlNORCBJVDEOMAwGA1UEAwwFREVWU1AxITAfBgkqhkiG9w0BCQEWEnBhYmxvLm1pbGxldEBndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANA1kq7UVTQLnkl1DEQxcfQxrvyw0ZYMmKQahlPo9whZgH6D9gD1oPtDasClDB7e8V6auSWEKvoqu3dlGq7wJL8YX7ga5I38KfRBelwIvEZqnKdSBl9e7npAxGtJvC2eNXCdQ3+PaKAL6dVzy7pA74unCVHckautCI3jTfuMx82l228vM/jzawCIc/N8ZX/IhU3F6v0RElPs9XKNLMua2ET6Ka1d3AeKE9aHVMs8qMG76cA0SzLoRC3iwE1OKiar6WngEWULiPmNiAZwBe6G3Q643cJo8ST+3jJYAHyxyZ/gZqZHJzhCJuCf6ShzigTOwtJiNNSkgs5G8ZPPJoMpXe8CAwEAAaNQME4wHQYDVR0OBBYEFMHrgb147rBxXzVonuVtg3hY/qlSMB8GA1UdIwQYMBaAFMHrgb147rBxXzVonuVtg3hY/qlSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKhPs4AdzzvTMjvIxAxaAFjcuW5PPm+JI9CRuXaeom+4JyEHL+v6GWgTYFKG9yOo/WDvKuknC4f8Oa534mUWS/KKesp2Jbfo3rNAvrkkDNWGID9fMMo/e+z4y0G+vt3QF/yU67LOwpLPzqA4MaSJ5MHB+atfeoMxbGcjYeDVbwhGfEasiJ534hRL3DfwIZ6bG0xC39bwdB2cnTW7kWHd9klMuTH/nrLJhJku7xqNYd6hhMRHYqvc4zy/v+/GjU3MtbhTqyeMy4Mi+haAmJ+HSGzxwpYNZ8XUIL9DjaFsS9UJNjIR7iE20Q+h+RkpSLx+cm8lMVg/G6PukyHEQsCnfRk=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIID8TCCAtmgAwIBAgIJAMjuGy2xpLirMA0GCSqGSIb3DQEBCwUAMIGOMQswCQYDVQQGEwJTRTETMBEGA1UEBwwKR290aGVuYnVyZzEmMCQGA1UECgwdU3dlZGlzaCBOYXRpb25hbCBEYXRhIFNlcnZpY2UxDzANBgNVBAsMBlNORCBJVDEOMAwGA1UEAwwFREVWU1AxITAfBgkqhkiG9w0BCQEWEnBhYmxvLm1pbGxldEBndS5zZTAeFw0xNTEwMTkwNjUzNDdaFw0yNTEwMTgwNjUzNDdaMIGOMQswCQYDVQQGEwJTRTETMBEGA1UEBwwKR290aGVuYnVyZzEmMCQGA1UECgwdU3dlZGlzaCBOYXRpb25hbCBEYXRhIFNlcnZpY2UxDzANBgNVBAsMBlNORCBJVDEOMAwGA1UEAwwFREVWU1AxITAfBgkqhkiG9w0BCQEWEnBhYmxvLm1pbGxldEBndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANA1kq7UVTQLnkl1DEQxcfQxrvyw0ZYMmKQahlPo9whZgH6D9gD1oPtDasClDB7e8V6auSWEKvoqu3dlGq7wJL8YX7ga5I38KfRBelwIvEZqnKdSBl9e7npAxGtJvC2eNXCdQ3+PaKAL6dVzy7pA74unCVHckautCI3jTfuMx82l228vM/jzawCIc/N8ZX/IhU3F6v0RElPs9XKNLMua2ET6Ka1d3AeKE9aHVMs8qMG76cA0SzLoRC3iwE1OKiar6WngEWULiPmNiAZwBe6G3Q643cJo8ST+3jJYAHyxyZ/gZqZHJzhCJuCf6ShzigTOwtJiNNSkgs5G8ZPPJoMpXe8CAwEAAaNQME4wHQYDVR0OBBYEFMHrgb147rBxXzVonuVtg3hY/qlSMB8GA1UdIwQYMBaAFMHrgb147rBxXzVonuVtg3hY/qlSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKhPs4AdzzvTMjvIxAxaAFjcuW5PPm+JI9CRuXaeom+4JyEHL+v6GWgTYFKG9yOo/WDvKuknC4f8Oa534mUWS/KKesp2Jbfo3rNAvrkkDNWGID9fMMo/e+z4y0G+vt3QF/yU67LOwpLPzqA4MaSJ5MHB+atfeoMxbGcjYeDVbwhGfEasiJ534hRL3DfwIZ6bG0xC39bwdB2cnTW7kWHd9klMuTH/nrLJhJku7xqNYd6hhMRHYqvc4zy/v+/GjU3MtbhTqyeMy4Mi+haAmJ+HSGzxwpYNZ8XUIL9DjaFsS9UJNjIR7iE20Q+h+RkpSLx+cm8lMVg/G6PukyHEQsCnfRk=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://devsp.sweclarin.se/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devsp.sweclarin.se/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://devsp.sweclarin.se/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://devsp.sweclarin.se/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://devsp.sweclarin.se/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://devsp.sweclarin.se/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Pablo</md:GivenName>
+ <md:SurName>Millet</md:SurName>
+ <md:EmailAddress>pablo.millet@gu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/e5.onthehub.com.xml b/swamid-2.0/e5.onthehub.com.xml
index 7e8436c6..c1c420e8 100644
--- a/swamid-2.0/e5.onthehub.com.xml
+++ b/swamid-2.0/e5.onthehub.com.xml
@@ -140,10 +140,10 @@ l8qQhkUldJphTqx2PEHORBM=
</md:Organization>
<md:ContactPerson contactType="technical">
<md:GivenName>Shibboleth Technical Team</md:GivenName>
- <md:EmailAddress>Shibboleth@e-academy.com</md:EmailAddress>
+ <md:EmailAddress>mailto:Shibboleth@e-academy.com</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="administrative">
<md:GivenName>Shibboleth Administration Team</md:GivenName>
- <md:EmailAddress>Shibboleth@e-academy.com</md:EmailAddress>
+ <md:EmailAddress>mailto:Shibboleth@e-academy.com</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/emrex.its.umu.se-gui-sp.xml b/swamid-2.0/emrex.its.umu.se-gui-sp.xml
new file mode 100644
index 00000000..678116a5
--- /dev/null
+++ b/swamid-2.0/emrex.its.umu.se-gui-sp.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://emrex.its.umu.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://emrex.its.umu.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://emrex.its.umu.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">EMREX produktionsmiljö</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">EMREX production site</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">EMREX-projektet stödjer EU:s mål för 2020 att 20% av högskolestuderande ska kunna vara mobila under studietiden.</mdui:Description>
+ <mdui:Description xml:lang="en">The EMREX project addresses the EU 2020 target that 20% of higher education students should be mobile during their studies.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>emrex.its.umu.se</ds:KeyName>
+ <ds:KeyName>https://emrex.its.umu.se/gui-sp</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=emrex.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAMIUlWJ7xFZzMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGVtcmV4Lml0cy51bXUuc2UwHhcNMTUxMTA1MTQ1MzU5WhcNMjUxMTAyMTQ1
+MzU5WjAbMRkwFwYDVQQDExBlbXJleC5pdHMudW11LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAu6IPSODdnS66qRsCbLYbc3i8U6tFUmCQ4Z5Ijg/n
+/yYiz0tg/1D7LCxh0ta3p8wF9MxDYh9nhviIU78uMV98NrX75EwF4D+9nW3XXero
+tRHiTlO7hY6CroLIefOsH9ISt0kIKT/mUI1L8ndBvBfCQvyzYEOy9PeOuru2QTg+
+dmDF9OCQPaBcoeoi+3zYLIO6OOAUutip4rnQuznOv8ddveP1HEjrei0XDBrCbIfJ
+0VzCJQdkW0vcIfXT5xwTOJcFYy6b4RPX3JSwENRrClMrunenPte+M5W1YJKCCi4I
+R900EiIufvuv+ZL2Jkklirley+uFnh9knSLIRM98Yy1j5wIDAQABo18wXTA8BgNV
+HREENTAzghBlbXJleC5pdHMudW11LnNlhh9odHRwczovL2VtcmV4Lml0cy51bXUu
+c2UvZ3VpLXNwMB0GA1UdDgQWBBRjTacbXCeuIkCrckKzgf8py2XPYzANBgkqhkiG
+9w0BAQUFAAOCAQEAdYdVEF1mEVnotpfzcrFXkmTsX+UwEXaePE2ZGbxHqSGPQ1mS
+1cWAIupgcxE2/pefCrWKIF+VDWQmVFWcALoQuWQMsya0SC2C5gnxzYQq1L6gkx8R
+HbVhdUuEJ38NPuWCQ3OFrEvdnlAx4NztXp2Gn2ItIeiEl3fLdGB8c/nRh0b09bY4
+1v7OnyOxAouCRGotnyHyd9aTwTVpBhG6LK2LYiA2v90c0fH24+BX4x5hrm54ysG0
+PHSmQco4ELsIfXuqrlyE3kVGajZ1BFwpp0gMGETRZE8nBZzPk0bgwq+hyfNIV2ZL
+uE4uozMTr+nt5X5/0Un+8KCKmppjT10d59uveg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emrex.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index 16a00571..da03a752 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -505,13 +505,13 @@ G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</X509Certificate>
<ContactPerson contactType="technical">
<Company>Linköping University (ADFS)</Company>
<SurName>Johan Peterson</SurName>
- <EmailAddress>johan.peterson@liu.se</EmailAddress>
+ <EmailAddress>mailto:johan.peterson@liu.se</EmailAddress>
<TelephoneNumber>+46 13 28 5730</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Linköping University (ADFS)</Company>
<SurName>LiU-IT:s Kundcenter</SurName>
- <EmailAddress>helpdesk@student.liu.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@student.liu.se</EmailAddress>
<TelephoneNumber>+46 13 28 5898</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
index 5cd31580..32e8c3c7 100644
--- a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
+++ b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
@@ -102,19 +102,19 @@ icptKTpDxrRjfCXibBT1
<ContactPerson contactType="administrative">
<Company>The Swedish School of Sport and Health Sciences</Company>
<SurName>Fredrik Nilsson</SurName>
- <EmailAddress>fredrik.nilsson@gih.se</EmailAddress>
+ <EmailAddress>mailto:fredrik.nilsson@gih.se</EmailAddress>
<TelephoneNumber>+46 8 12053734</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>The Swedish School of Sport and Health Sciences</Company>
<SurName>Michael Thunell</SurName>
- <EmailAddress>michael.thunell@gih.se</EmailAddress>
+ <EmailAddress>mailto:michael.thunell@gih.se</EmailAddress>
<TelephoneNumber>+46 8 12053807</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>The Swedish School of Sport and Health Sciences</Company>
<SurName>Charlie Skog</SurName>
- <EmailAddress>charlie.skog@gih.se</EmailAddress>
+ <EmailAddress>mailto:charlie.skog@gih.se</EmailAddress>
<TelephoneNumber>+46 8 12053792</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
index f2ae5ddd..ed05fb1f 100644
--- a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
@@ -136,19 +136,19 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
<ContactPerson contactType="administrative">
<Company>University of Borås</Company>
<SurName>IT-avdelningen</SurName>
- <EmailAddress>it-avdelningen@hb.se</EmailAddress>
+ <EmailAddress>mailto:it-avdelningen@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University of Borås</Company>
<SurName>Per-Olof Axelsson</SurName>
- <EmailAddress>Per-Olof.Axelsson@hb.se</EmailAddress>
+ <EmailAddress>mailto:Per-Olof.Axelsson@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4697</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University of Borås</Company>
<SurName>IT-avdelningen</SurName>
- <EmailAddress>it-avdelningen@hb.se</EmailAddress>
+ <EmailAddress>mailto:it-avdelningen@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/hobel.c3se.chalmers.se.xml b/swamid-2.0/hobel.c3se.chalmers.se.xml
new file mode 100644
index 00000000..766495fa
--- /dev/null
+++ b/swamid-2.0/hobel.c3se.chalmers.se.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hobel.c3se.chalmers.se">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/DS/ds.swamid.se"/>
+ <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://hobel.c3se.chalmers.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">SUPR testserver Hobel</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SUPR test server Hobel</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Testserver (Hobel) för SNIC User and Project Repository (SUPR).</mdui:Description>
+ <mdui:Description xml:lang="en">Test server (Hobel) for the SNIC User and Project Repository (SUPR).</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>hobel</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=hobel</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIJALfiApQszZJ/MA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
+BAMTBWhvYmVsMB4XDTE1MTAyMjIyMDExN1oXDTI1MTAxOTIyMDExN1owEDEOMAwG
+A1UEAxMFaG9iZWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1PZdJ
+QQ7zmjH9a1Qgbr0ZAhhE+X9kcM3gg0C3yuE0BmQ5tOdZ5YcOCU8lxy2TMQe+x8v6
+gYw3QKLOSDexeQ4/a5Nj3TP8BiNDzoMHPJL3JywuliMxty3GD9IhtP3oQa3MZ2ak
+Rv0AJgduWOKK+qFrkhuFC4NVHIb/VEEcQwQZwm18Rjj5T3u+BAvkHzRl6fPPhaSc
+s2XJ9celJVRr/Ytf0zA0FuDu2hxnECIKVIVLtNaCN0Crt03bA2yrX/OeUkpPhWen
+pfAopiw78JU51D+eB+SsTN8+WXjlGuK7phnqYf/M+2lPde0UfkRIYBTvWiZKBmSs
+KoB89ou8DI53jZ0pAgMBAAGjMzAxMBAGA1UdEQQJMAeCBWhvYmVsMB0GA1UdDgQW
+BBQiHeg1j+9rj9Z8Yl9QvmMbnqyu5TANBgkqhkiG9w0BAQUFAAOCAQEAn+x/S/bh
+UIkhtJu4T1rDTV7k9vLoQeVxj2RV6wUldIFySFYsDyCBbdxB44BeItA8+ZguAgB0
+kjeE21udA8ymkGB+HDW9ge3bDCr28+p8UcLvo77DpErEhT2K3jHYHGaLXYvhJ9WM
+wLIVqOx8qwhmM27X4N22EIGa53J6aHvYq6kkHqKeqvYBWw/jut1iQwJKEwCRPQr0
+mhtbW9lo/gLw2vORv8/2jEX0O0HAoexJY/e0fHjx59kDx6xBcmCYYevk9sUVWiei
+M6Fjc5NRyOLB/NyBlK9jQoAc3kWwx4HIG+8GH8SZtv4b+r5rVLtEns7ULhOIjzov
+ygU2QaW0OcFFXw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/identity.mdh.se-idp-shibboleth.xml b/swamid-2.0/identity.mdh.se-idp-shibboleth.xml
index 14eb3f5d..7a14fceb 100644
--- a/swamid-2.0/identity.mdh.se-idp-shibboleth.xml
+++ b/swamid-2.0/identity.mdh.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
<ContactPerson contactType="administrative">
<Company>Mälardalen University</Company>
<SurName>Peter Falck</SurName>
- <EmailAddress>peter.falck@mdh.se</EmailAddress>
+ <EmailAddress>mailto:peter.falck@mdh.se</EmailAddress>
<TelephoneNumber>+46 21 101499</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Mälardalen University</Company>
<SurName>MDH Drift</SurName>
- <EmailAddress>drift.ita@mdh.se</EmailAddress>
+ <EmailAddress>mailto:drift.ita@mdh.se</EmailAddress>
<TelephoneNumber>+46 21 101499</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Mälardalen University</Company>
<SurName>Helpdesk MDH</SurName>
- <EmailAddress>helpdesk@mdh.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@mdh.se</EmailAddress>
<TelephoneNumber>+46 16 101550</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
index 507f0e70..c58b6ca4 100644
--- a/swamid-2.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
@@ -96,19 +96,19 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
<ContactPerson contactType="administrative">
<Company>Blekinge Institute of Technology- Personnel</Company>
<SurName>IT Helpdesk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Blekinge Institute of Technology- Personnel</Company>
<SurName>IT Helpdesk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Blekinge Institute of Technology- Personnel</Company>
<SurName>IT Helpdesk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 381500</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
index 3e5c1ac6..feeddcd1 100644
--- a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp.chalmers.se/adfs/services/trust">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se">
<KeyDescriptor use="encryption">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -344,10 +351,10 @@
</Organization>
<ContactPerson contactType="technical">
<Company>Chalmers</Company>
- <EmailAddress>nrq@chalmers.se</EmailAddress>
+ <EmailAddress>mailto:nrq@chalmers.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Chalmers</Company>
- <EmailAddress>biorn@chalmers.se</EmailAddress>
+ <EmailAddress>mailto:biorn@chalmers.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.hig.se-idp-shibboleth.xml b/swamid-2.0/idp.hig.se-idp-shibboleth.xml
index ea2380d9..9dca094e 100644
--- a/swamid-2.0/idp.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hig.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hig.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">hig.se</shibmd:Scope>
@@ -102,19 +109,19 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
<ContactPerson contactType="administrative">
<Company>University of Gävle</Company>
<SurName>Network Operations</SurName>
- <EmailAddress>nat@hig.se</EmailAddress>
+ <EmailAddress>mailto:nat@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University of Gävle</Company>
<SurName>Operations</SurName>
- <EmailAddress>nat@hig.se</EmailAddress>
+ <EmailAddress>mailto:nat@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University of Gävle</Company>
<SurName>IT Support</SurName>
- <EmailAddress>itsupport@hig.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml
index f646dac8..ed12731a 100644
--- a/swamid-2.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.his.se-idp-shibboleth.xml
@@ -106,19 +106,19 @@ drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
<ContactPerson contactType="administrative">
<Company>University of Skövde</Company>
<SurName>HiS Netadmin</SurName>
- <EmailAddress>netadmin@his.se</EmailAddress>
+ <EmailAddress>mailto:netadmin@his.se</EmailAddress>
<TelephoneNumber>+46 500 448800</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University of Skövde</Company>
<SurName>HiS Netadmin</SurName>
- <EmailAddress>netadmin@his.se</EmailAddress>
+ <EmailAddress>mailto:netadmin@his.se</EmailAddress>
<TelephoneNumber>+46 500 448800</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University of Skövde</Company>
<SurName>IT Helpdesk Högskolan i Skövde</SurName>
- <EmailAddress>helpdesk@his.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@his.se</EmailAddress>
<TelephoneNumber>+46 500 448800</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
index c13c899b..5c5111a5 100644
--- a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
@@ -1,8 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hkr.se/idp/shibboleth">
+ <Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </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">hkr.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Högskolan Kristianstad</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Kristianstad University Sweden</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Inloggning i webbtjänster för anställda och studenter vid Högskolan Kristianstad.</mdui:Description>
+ <mdui:Description xml:lang="en">The Kristianstad University Login Service is used by employees and students at the university.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.hkr.se/sv/om-hkr/organisation/administration-och-stodverksamhet/it-service/kontoinformation/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.hkr.se/en/study-at-hkr/service-and-support/it-support-for-students/user-name-and-password/</mdui:InformationURL>
+ <mdui:Logo xml:lang="sv" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>hkr.se</mdui:DomainHint>
+ <mdui:IPHint>194.47.24.0/21</mdui:IPHint>
+ <mdui:IPHint>194.47.32.0/21</mdui:IPHint>
+ <mdui:IPHint>194.47.40.0/21</mdui:IPHint>
+ <mdui:GeolocationHint>geo:56.04848,14.14416</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo>
@@ -79,7 +107,26 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
<Organization>
<OrganizationName xml:lang="en">HKR</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">Högskolan Kristianstad</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.hkr.se</OrganizationURL>
+ <OrganizationDisplayName xml:lang="en">Kristianstad University Sweden</OrganizationDisplayName>
+ <OrganizationURL xml:lang="sv">http://www.hkr.se</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.hkr.se/en/english-start-page/</OrganizationURL>
</Organization>
+ <ContactPerson contactType="administrative">
+ <Company>Högskolan Kristianstad</Company>
+ <SurName>Service desk 3030</SurName>
+ <EmailAddress>mailto:3030@hkr.se</EmailAddress>
+ <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <Company>Högskolan Kristianstad</Company>
+ <SurName>Service desk 3030</SurName>
+ <EmailAddress>mailto:3030@hkr.se</EmailAddress>
+ <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <Company>Högskolan Kristianstad</Company>
+ <SurName>Service desk 3030</SurName>
+ <EmailAddress>mailto:3030@hkr.se</EmailAddress>
+ <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
index 33ef79b1..ae28e676 100644
--- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ XCYbfP8E3cs4MB+K
<ContactPerson contactType="administrative">
<Company>Swedish Institute of Space Physics</Company>
<SurName>Mats Luspa</SurName>
- <EmailAddress>datagruppen@irf.se</EmailAddress>
+ <EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
<TelephoneNumber>+4698079000</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Swedish Institute of Space Physics</Company>
<SurName>Mats Luspa</SurName>
- <EmailAddress>matsl@irf.se</EmailAddress>
+ <EmailAddress>mailto:matsl@irf.se</EmailAddress>
<TelephoneNumber>+4698079022</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Swedish Institute of Space Physics</Company>
<SurName>Mats Luspa</SurName>
- <EmailAddress>matsl@irf.se</EmailAddress>
+ <EmailAddress>mailto:matsl@irf.se</EmailAddress>
<TelephoneNumber>+4698079022</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
index f72b6560..92bf6ea7 100644
--- a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.it.gu.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">gu.se</shibmd:Scope>
@@ -13,7 +20,9 @@
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DomainHint>gu.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:57.6986,11.9712</mdui:GeolocationHint>
+ <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
</mdui:DiscoHints>
</Extensions>
<KeyDescriptor>
@@ -95,18 +104,18 @@ MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
<ContactPerson contactType="administrative">
<Company>University of Gothenburg</Company>
<SurName>Lena Ström</SurName>
- <EmailAddress>lena.strom@gu.se</EmailAddress>
+ <EmailAddress>mailto:lena.strom@gu.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University of Gothenburg</Company>
<SurName>Pablo Millet</SurName>
- <EmailAddress>pablo.millet@gu.se</EmailAddress>
+ <EmailAddress>mailto:pablo.millet@gu.se</EmailAddress>
<TelephoneNumber>+46707104070</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University of Gothenburg</Company>
<SurName>GU-Support</SurName>
- <EmailAddress>support@gu.se</EmailAddress>
+ <EmailAddress>mailto:support@gu.se</EmailAddress>
<TelephoneNumber>+46317862020</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
index 539dabea..920b44f6 100644
--- a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
@@ -91,19 +91,19 @@ VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>Stockholm University</Company>
<SurName>Helpdesk</SurName>
- <EmailAddress>helpdesk@su.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
<TelephoneNumber>+46 8 16 1999</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Stockholm University</Company>
<SurName>Helpdesk</SurName>
- <EmailAddress>helpdesk@su.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
<TelephoneNumber>+46 8 16 1999</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Stockholm University</Company>
<SurName>Helpdesk</SurName>
- <EmailAddress>helpdesk@su.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
<TelephoneNumber>+46 8 16 1999</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.kb.se-idp-shibboleth.xml b/swamid-2.0/idp.kb.se-idp-shibboleth.xml
index 0613535b..ee1ba4d1 100644
--- a/swamid-2.0/idp.kb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kb.se-idp-shibboleth.xml
@@ -199,19 +199,19 @@ hJ2GrICmdWsVIb88lmoEw8Hn/ew=
<ContactPerson contactType="administrative">
<Company>National Library of Sweden</Company>
<SurName>Mattias Olsson</SurName>
- <EmailAddress>mattias.olsson@kb.se</EmailAddress>
+ <EmailAddress>mailto:mattias.olsson@kb.se</EmailAddress>
<TelephoneNumber>+46700073534</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>National Library of Sweden</Company>
<SurName>Mattias Olsson</SurName>
- <EmailAddress>swamid@kb.se</EmailAddress>
+ <EmailAddress>mailto:swamid@kb.se</EmailAddress>
<TelephoneNumber>+46700073534</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>National Library of Sweden</Company>
<SurName>swamid@kb.se</SurName>
- <EmailAddress>swamid@kb.se</EmailAddress>
+ <EmailAddress>mailto:swamid@kb.se</EmailAddress>
<TelephoneNumber>+46700073555</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
index 25394713..45b9c139 100644
--- a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.kkh.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">kkh.se</shibmd:Scope>
@@ -99,19 +106,19 @@ qowogArC+4U1+wcq4ctUoM0Lyh5YaTMs4U31GcmYAotsLw+sY97V0WGQKffURz4f
<ContactPerson contactType="administrative">
<Company>Kungl. Konsthögskolan</Company>
<SurName>Fredrik Reuterswärd</SurName>
- <EmailAddress>fredrik.reutersward@kkh.se</EmailAddress>
+ <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
<TelephoneNumber>+4686144064</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Kungl. Konsthögskolan</Company>
<SurName>Fredrik Reuterswärd</SurName>
- <EmailAddress>fredrik.reutersward@kkh.se</EmailAddress>
+ <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
<TelephoneNumber>+4686144064</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Kungl. Konsthögskolan</Company>
<SurName>Fredrik Reuterswärd</SurName>
- <EmailAddress>fredrik.reutersward@kkh.se</EmailAddress>
+ <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
<TelephoneNumber>+4686144064</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
index 7f3ca0ce..b6dc9d91 100644
--- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -99,17 +99,17 @@ SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>Royal College of Music</Company>
<SurName>KMH IT-avdelningen</SurName>
- <EmailAddress>swamid@kmh.se</EmailAddress>
+ <EmailAddress>mailto:swamid@kmh.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Royal College of Music</Company>
<SurName>KMH IT-avdelningen</SurName>
- <EmailAddress>swamid@kmh.se</EmailAddress>
+ <EmailAddress>mailto:swamid@kmh.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Royal College of Music</Company>
<SurName>KMH IT HelpDesk</SurName>
- <EmailAddress>helpdesk@kmh.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@kmh.se</EmailAddress>
<TelephoneNumber>+46 8 161939</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml b/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml
index 0c4283e8..b5c8f962 100644
--- a/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml
@@ -97,19 +97,19 @@ SHHQuQC8v/yTq6ZVFlRvTNkZ+W/vPYOeE6x49Dygeu65WDf/H2NUy6dggcmH+LpS</ds:X509Certifi
<ContactPerson contactType="administrative">
<Company>Konstfack</Company>
<SurName>Håkan Pettersson</SurName>
- <EmailAddress>hakan.pettersson@konstfack.se</EmailAddress>
+ <EmailAddress>mailto:hakan.pettersson@konstfack.se</EmailAddress>
<TelephoneNumber>+46 8 4504396</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Konstfack</Company>
<SurName>Håkan Pettersson</SurName>
- <EmailAddress>hakan.pettersson@konstfack.se</EmailAddress>
+ <EmailAddress>mailto:hakan.pettersson@konstfack.se</EmailAddress>
<TelephoneNumber>+46 8 4504396</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Konstfack</Company>
<SurName>Helpdesk IT Konstfack</SurName>
- <EmailAddress>helpdesk@konstfack.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@konstfack.se</EmailAddress>
<TelephoneNumber>+46 8 450 4399</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
index 8d10830a..1be5aabf 100644
--- a/swamid-2.0/idp.kva.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
@@ -98,17 +98,17 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
</Organization>
<ContactPerson contactType="administrative">
<Company>The Royal Swedish Academy of Sciences</Company>
- <EmailAddress>peter.jacobsson@kva.se</EmailAddress>
+ <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
<TelephoneNumber>+46 70 6739792</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>The Royal Swedish Academy of Sciences</Company>
- <EmailAddress>peter.jacobsson@kva.se</EmailAddress>
+ <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
<TelephoneNumber>+46 70 6739792</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>The Royal Swedish Academy of Sciences</Company>
- <EmailAddress>peter.jacobsson@kva.se</EmailAddress>
+ <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
<TelephoneNumber>+46 70 6739792</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.lnu.se-idp-shibboleth.xml b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
index d619ea04..38b9e0f0 100644
--- a/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
@@ -116,6 +116,6 @@ nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
</Organization>
<ContactPerson contactType="technical">
<Company>Linnæus University</Company>
- <EmailAddress>it.idp@lnu.se</EmailAddress>
+ <EmailAddress>mailto:it.idp@lnu.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.lu.se-idp-shibboleth.xml b/swamid-2.0/idp.lu.se-idp-shibboleth.xml
index 7fc971fa..a02015d2 100644
--- a/swamid-2.0/idp.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.lu.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.lu.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">lu.se</shibmd:Scope>
diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
index 5f1a0abe..958a4841 100644
--- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
<ContactPerson contactType="administrative">
<Company>Malmö University</Company>
<SurName>IT Drift</SurName>
- <EmailAddress>drift@mah.se</EmailAddress>
+ <EmailAddress>mailto:drift@mah.se</EmailAddress>
<TelephoneNumber>+46 709 655480</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Malmö University</Company>
<SurName>Robert Faling</SurName>
- <EmailAddress>robert.faling@mah.se</EmailAddress>
+ <EmailAddress>mailto:robert.faling@mah.se</EmailAddress>
<TelephoneNumber>+46 768 428753</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Malmö University</Company>
<SurName>Servicedesk Malmö högskola</SurName>
- <EmailAddress>support@mah.se</EmailAddress>
+ <EmailAddress>mailto:support@mah.se</EmailAddress>
<TelephoneNumber>+46 40 6657555</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
index 38f73071..8b857da0 100644
--- a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
+++ b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
@@ -95,15 +95,15 @@ JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
<ContactPerson contactType="administrative">
<Company>NORDUnet</Company>
<SurName>noc@nordu.net</SurName>
- <EmailAddress>noc@nordu.net</EmailAddress>
+ <EmailAddress>mailto:noc@nordu.net</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>NORDUnet</Company>
- <EmailAddress>noc@nordu.net</EmailAddress>
+ <EmailAddress>mailto:noc@nordu.net</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<Company>NORDUnet</Company>
<SurName>NUNOC</SurName>
- <EmailAddress>noc@nordu.net</EmailAddress>
+ <EmailAddress>mailto:noc@nordu.net</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
index 2e83de39..6ba93ed9 100644
--- a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.rkh.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">rkh.se</shibmd:Scope>
@@ -91,18 +98,18 @@ MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>Swedish Red Cross University College</Company>
<SurName>IT-support</SurName>
- <EmailAddress>servicedesk@rkh.se</EmailAddress>
+ <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
<TelephoneNumber>+46858751607/+46858751603</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Swedish Red Cross University College</Company>
<SurName>IT-support</SurName>
- <EmailAddress>servicedesk@rkh.se</EmailAddress>
+ <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
<TelephoneNumber>+46858751607</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Swedish Red Cross University College</Company>
<SurName>IT-Support Röda Korsets Högskola</SurName>
- <EmailAddress>servicedesk@rkh.se</EmailAddress>
+ <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
index ddfbf228..6d4f068a 100644
--- a/swamid-2.0/idp.sics.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
@@ -120,6 +120,6 @@ SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
<ContactPerson contactType="technical">
<Company>SICS</Company>
<SurName>CRIT</SurName>
- <EmailAddress>crit@sics.se</EmailAddress>
+ <EmailAddress>mailto:crit@sics.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
index 8ba6db17..d7af3a09 100644
--- a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
@@ -92,19 +92,19 @@ nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
<ContactPerson contactType="administrative">
<Company>Blekinge Institute of Technology - Students</Company>
<SurName>IT Help Desk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Blekinge Institute of Technology - Students</Company>
<SurName>IT Help Desk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Blekinge Institute of Technology - Students</Company>
<SurName>IT Help Desk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.suni.se-adfs-services-trust.xml b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
index 518df523..bbb025b1 100644
--- a/swamid-2.0/idp.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
@@ -67,7 +67,7 @@
<ContactPerson contactType="support">
<GivenName>Tomas</GivenName>
<SurName>Legat</SurName>
- <EmailAddress>server@sh.se</EmailAddress>
+ <EmailAddress>mailto:server@sh.se</EmailAddress>
<TelephoneNumber>+46(0)86084000</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.ths.se-idp-shibboleth.xml b/swamid-2.0/idp.ths.se-idp-shibboleth.xml
new file mode 100644
index 00000000..3d9c8fdd
--- /dev/null
+++ b/swamid-2.0/idp.ths.se-idp-shibboleth.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp.ths.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope regexp="false">ths.se</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Teologiska högskolan Stockholm</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Stockholm School of Theology</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för Teologiska högskolan Stockholm</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Theology</mdui:Description>
+ <mdui:Logo height="100" width="100">https://idp.ths.se/idp/images/ths.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
+MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
+IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
+QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
+VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
+zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
+iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
+HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
+S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
+GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
+wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
+r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
+GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
+MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAs+wFy6Bii4RxuP5xBGLV2ODTADmnAYjWdQ/SAaSF
+GkM1tHf/dH5+9nyIpz23PXSeO4X59arZC4eK71duqU7ajm2+LLKiLBguofbwlaK7
+Ia46ReI9WkIQBSyRnCLC8dDEC/1G1gsh9up4jvSgJO/BwtchvO23iFnoWGa5BwxT
+HrieHSBIqixP8/Zd4v3eVoPTmetyRQVstC7tc8AK6AB47zha1nxd+sRqmsVbsaef
+DW8v5rBm++Dn+m8Im2cF9AAytz8PM7vSQSx6sTixTTHBddD16vBMnaTKHpEdrYb4
+aK8sDS8ku2SXmsEGMmNSXo6CNFR8OZVpO4DHjZO94GwnFQIDAQABo1swWTAdBgNV
+HQ4EFgQUDd8LOI1MHYCc/x2uQ+F6edwmMJswOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQA5lFkOXXGkKwmKuAzA6ETKdvGfp8TloxdKrzQ9/2wwCZdLz/OVLhUe
+f00ILSO9SyDrkxTsnlUUkFqFR7zw/PwD/ZbRCH1zDPqz2fY8yg3uC9LM++r8ookt
+Yx2kwRAnwS6N1fRC3/oiCoWuY7HS+7MYTrTqOHoWlzoLJW/0MXdfN1tFJdMrluWq
+WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
+0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
+58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
+MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtUDQ13J3qxlTQ/bzLet+Y4xcjRkHeIWvQfUXIDDY
+Tl2PAFdvfTE63A77c/EGE/fE3x3Gqd/pLoOXF9xxrYt1CEUWSgLuMP6JYK2q3ByI
+ztL4AQRw6t313KRzsDH+qSnrA8m4o6w2ORx9Q8V6LSUfBXcqiUH8IdSJ2nkK4AEF
+/GDHtvYR0t3vxnARqa5bUtlBXc3lW8i4yet4lMnVVoDtvWQfVJ5i1AE3Uzys+RDK
+goRoKfHlayqiDYyuVmgP1wEB5b3yb5htTIvlrVAv3IBStRlmeDHPqc1ovrldOZFW
+mfhH9PB0qPVf6dsRRBBKO1yJJc7A4gRXjHJdQ8wMcvAYcwIDAQABo1swWTAdBgNV
+HQ4EFgQUeHLwS/y7FmX87CIT3IpanavrYW8wOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQCpSdEgMGI8XdHrUGfAAIqcYACudfOp80/rqpyOGPtO45qkBuYKrp3D
+yTts4EtDi3k5XCowH0TS9ODjgBCe/lOmDg05Ew/1dDc6pyxNUqMp1zRnmZ5DdzP8
+UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
+2SevIVPNCfKl9VGaxbkX9CGRLlB1YK3GBWUp4TvbsGC8+iM/+dXIQQy4Hh25vAzv
+SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
+xAdB19mh1plahNrAaEfu6Ldetyz9iulY
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ths.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ths.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ths.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ths.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ths.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
+MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
+IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
+QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
+VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
+zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
+iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
+HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
+S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
+GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
+wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
+r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
+GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
+MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAs+wFy6Bii4RxuP5xBGLV2ODTADmnAYjWdQ/SAaSF
+GkM1tHf/dH5+9nyIpz23PXSeO4X59arZC4eK71duqU7ajm2+LLKiLBguofbwlaK7
+Ia46ReI9WkIQBSyRnCLC8dDEC/1G1gsh9up4jvSgJO/BwtchvO23iFnoWGa5BwxT
+HrieHSBIqixP8/Zd4v3eVoPTmetyRQVstC7tc8AK6AB47zha1nxd+sRqmsVbsaef
+DW8v5rBm++Dn+m8Im2cF9AAytz8PM7vSQSx6sTixTTHBddD16vBMnaTKHpEdrYb4
+aK8sDS8ku2SXmsEGMmNSXo6CNFR8OZVpO4DHjZO94GwnFQIDAQABo1swWTAdBgNV
+HQ4EFgQUDd8LOI1MHYCc/x2uQ+F6edwmMJswOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQA5lFkOXXGkKwmKuAzA6ETKdvGfp8TloxdKrzQ9/2wwCZdLz/OVLhUe
+f00ILSO9SyDrkxTsnlUUkFqFR7zw/PwD/ZbRCH1zDPqz2fY8yg3uC9LM++r8ookt
+Yx2kwRAnwS6N1fRC3/oiCoWuY7HS+7MYTrTqOHoWlzoLJW/0MXdfN1tFJdMrluWq
+WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
+0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
+58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
+MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtUDQ13J3qxlTQ/bzLet+Y4xcjRkHeIWvQfUXIDDY
+Tl2PAFdvfTE63A77c/EGE/fE3x3Gqd/pLoOXF9xxrYt1CEUWSgLuMP6JYK2q3ByI
+ztL4AQRw6t313KRzsDH+qSnrA8m4o6w2ORx9Q8V6LSUfBXcqiUH8IdSJ2nkK4AEF
+/GDHtvYR0t3vxnARqa5bUtlBXc3lW8i4yet4lMnVVoDtvWQfVJ5i1AE3Uzys+RDK
+goRoKfHlayqiDYyuVmgP1wEB5b3yb5htTIvlrVAv3IBStRlmeDHPqc1ovrldOZFW
+mfhH9PB0qPVf6dsRRBBKO1yJJc7A4gRXjHJdQ8wMcvAYcwIDAQABo1swWTAdBgNV
+HQ4EFgQUeHLwS/y7FmX87CIT3IpanavrYW8wOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQCpSdEgMGI8XdHrUGfAAIqcYACudfOp80/rqpyOGPtO45qkBuYKrp3D
+yTts4EtDi3k5XCowH0TS9ODjgBCe/lOmDg05Ew/1dDc6pyxNUqMp1zRnmZ5DdzP8
+UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
+2SevIVPNCfKl9VGaxbkX9CGRLlB1YK3GBWUp4TvbsGC8+iM/+dXIQQy4Hh25vAzv
+SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
+xAdB19mh1plahNrAaEfu6Ldetyz9iulY
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
index adae6b1a..bb148636 100644
--- a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.umu.se/saml2/idp/metadata.php">
+ <md:Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<shibmd:Scope regexp="false">umu.se</shibmd:Scope>
@@ -51,19 +58,19 @@
<md:ContactPerson contactType="administrative">
<md:Company>Umeå University</md:Company>
<md:SurName>ITS datordrift</md:SurName>
- <md:EmailAddress>datordrift@its.umu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Umeå University</md:Company>
<md:SurName>ITS datordrift</md:SurName>
- <md:EmailAddress>datordrift@its.umu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Umeå University</md:Company>
<md:SurName>Servicedesk Umeå universitet</md:SurName>
- <md:EmailAddress>support@its.umu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:support@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
index d0f8e7a7..4bd23c8f 100644
--- a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp2-1.slu.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">slu.se</shibmd:Scope>
diff --git a/swamid-2.0/idp2.hig.se-idp-shibboleth.xml b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
index 0b39b408..634b3596 100644
--- a/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
@@ -92,19 +92,19 @@ aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
<ContactPerson contactType="administrative">
<Company>University of Gävle (Alumni)</Company>
<SurName>Network Operations</SurName>
- <EmailAddress>nat@hig.se</EmailAddress>
+ <EmailAddress>mailto:nat@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University of Gävle (Alumni)</Company>
<SurName>Network Operations</SurName>
- <EmailAddress>nat@hig.se</EmailAddress>
+ <EmailAddress>mailto:nat@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University of Gävle (Alumni)</Company>
<SurName>IT Support</SurName>
- <EmailAddress>itsupport@hig.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp2.hv.se-idp-shibboleth.xml b/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
index 6993b0fd..0a923a72 100644
--- a/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
@@ -107,19 +107,19 @@ aRQKNbVQdPN5ht6TrINjDQ==
<ContactPerson contactType="administrative">
<Company>University West</Company>
<SurName>Magnus Andersson</SurName>
- <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
+ <EmailAddress>mailto:Magnus.Andersson@hv.se</EmailAddress>
<TelephoneNumber>+46 520 223193</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University West</Company>
<SurName>Christian Jiresjö</SurName>
- <EmailAddress>Christian.Jiresjo@hv.se</EmailAddress>
+ <EmailAddress>mailto:Christian.Jiresjo@hv.se</EmailAddress>
<TelephoneNumber>+46 520 223189</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University West</Company>
<SurName>Servicedesk Högkoslan Väst</SurName>
- <EmailAddress>servicedesk@hv.se</EmailAddress>
+ <EmailAddress>mailto:servicedesk@hv.se</EmailAddress>
<TelephoneNumber>+46 520 223300</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml
index 01187453..911c7c60 100644
--- a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml
@@ -110,19 +110,19 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
<ContactPerson contactType="administrative">
<Company>Karlstad University</Company>
<SurName>IT-avdelningen</SurName>
- <EmailAddress>webbteknik@kau.se</EmailAddress>
+ <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
<TelephoneNumber>+46 54 700 2200</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Karlstad University</Company>
<SurName>Paul Scott</SurName>
- <EmailAddress>paul.scott@kau.se</EmailAddress>
+ <EmailAddress>mailto:paul.scott@kau.se</EmailAddress>
<TelephoneNumber>+46 54 700 2307</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Karlstad University</Company>
<SurName>IT-avdelningen Karlstads universitet</SurName>
- <EmailAddress>datasupport@kau.se</EmailAddress>
+ <EmailAddress>mailto:datasupport@kau.se</EmailAddress>
<TelephoneNumber>+46 54 700 2200</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml b/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
index 66ced1a5..901da821 100644
--- a/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
@@ -51,12 +51,6 @@ wXXiBDXS3PNHXQnnpys=
<md:Company>NORDUnet</md:Company>
<md:GivenName>Leif</md:GivenName>
<md:SurName>Johansson</md:SurName>
- <md:EmailAddress>leifj@nordu.net</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:Company>NORDUnet</md:Company>
- <md:GivenName>Johan</md:GivenName>
- <md:SurName>Berggren</md:SurName>
- <md:EmailAddress>jbn@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:leifj@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml
index 596c395a..77514bc3 100644
--- a/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml
+++ b/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml
@@ -5,7 +5,6 @@
<samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
<samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
<samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
@@ -23,26 +22,26 @@
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>
- MIIDmzCCAoOgAwIBAgIJAKmRdFPTnNe1MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
- BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
- ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
- DTE1MDkwODExMTQwOFoXDTE1MTAwODExMTQwOFowZDELMAkGA1UEBhMCU0UxEjAQ
- BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
- MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
- kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
- XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
- Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
- fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
- kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
- A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
- t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBz
- uy9AUKBxRYIRo/hkp9OlVEnDWUzu2aGLYOKVVL2PUaIiyLT/deJtRvhqz2kxcGFY
- Yiq3Z4vgtPHZbpT4Low3WphgdgtJK7rOQBUVMex+Ydz866roKSQ4/OFdQ26FNfpm
- sUK39i+3pNzhK66Vs5ezCVsF4SidyuCU2Nyta2cYF4n4oTKwEi782OmRpV6T0n40
- yRUDPdrAAONV6l/aLzB356PFJVNrDypOVutvDDGPhPpwfK3dZnVpykXn14aY+yop
- Ns4mS6CJAzBB0aVRbNZ99noV/Qqcog4zNZvQr3ymRfr+JIdTaNisSN1lBjgFoh8d
- 58AtMMXk7/2okGexE3sN
+ MIIDmzCCAoOgAwIBAgIJALMD2UXE6X0+MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+ BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
+ ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
+ DTE1MDkwODExMjIyOFoXDTI2MDgyMTExMjIyOFowZDELMAkGA1UEBhMCU0UxEjAQ
+ BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
+ MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
+ kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
+ XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
+ Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
+ fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
+ kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
+ A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
+ t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA6
+ SRQk0fw4o2f5u0vy3YAu1Zmr1bFCOlG1b4wnWXd6J1j1duHDIE7aWgTdT6bMCU7X
+ AAByaVmYOgzps+38kw27j1EE9CpIvQed6RWD5kDUU5rdpYNfKRvA1+sy62h3qMK4
+ e0Yfo1t7WRG1pz7FWz324PR3mAmXDbhrs47zan0m+Ds7VpI+n4SMKNHzqnMrKDe3
+ HVifjPaoea6SwMrPfuVQPxlwJh1XmtYybkqozmo6RB8Mkt/feN+YUXt9G2Rd5xfr
+ N86EdmlYTjlxDf9XzhXt2xyKO5YsNIv6sgPnGTxZC6/rzx8NYUbfXfFh4HUDEtbY
+ TA50ga7htHv63FhyREun
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -51,26 +50,26 @@
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>
- MIIDmzCCAoOgAwIBAgIJAKmRdFPTnNe1MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
- BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
- ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
- DTE1MDkwODExMTQwOFoXDTE1MTAwODExMTQwOFowZDELMAkGA1UEBhMCU0UxEjAQ
- BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
- MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
- kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
- XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
- Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
- fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
- kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
- A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
- t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBz
- uy9AUKBxRYIRo/hkp9OlVEnDWUzu2aGLYOKVVL2PUaIiyLT/deJtRvhqz2kxcGFY
- Yiq3Z4vgtPHZbpT4Low3WphgdgtJK7rOQBUVMex+Ydz866roKSQ4/OFdQ26FNfpm
- sUK39i+3pNzhK66Vs5ezCVsF4SidyuCU2Nyta2cYF4n4oTKwEi782OmRpV6T0n40
- yRUDPdrAAONV6l/aLzB356PFJVNrDypOVutvDDGPhPpwfK3dZnVpykXn14aY+yop
- Ns4mS6CJAzBB0aVRbNZ99noV/Qqcog4zNZvQr3ymRfr+JIdTaNisSN1lBjgFoh8d
- 58AtMMXk7/2okGexE3sN
+ MIIDmzCCAoOgAwIBAgIJALMD2UXE6X0+MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+ BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
+ ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
+ DTE1MDkwODExMjIyOFoXDTI2MDgyMTExMjIyOFowZDELMAkGA1UEBhMCU0UxEjAQ
+ BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
+ MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
+ kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
+ XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
+ Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
+ fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
+ kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
+ A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
+ t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA6
+ SRQk0fw4o2f5u0vy3YAu1Zmr1bFCOlG1b4wnWXd6J1j1duHDIE7aWgTdT6bMCU7X
+ AAByaVmYOgzps+38kw27j1EE9CpIvQed6RWD5kDUU5rdpYNfKRvA1+sy62h3qMK4
+ e0Yfo1t7WRG1pz7FWz324PR3mAmXDbhrs47zan0m+Ds7VpI+n4SMKNHzqnMrKDe3
+ HVifjPaoea6SwMrPfuVQPxlwJh1XmtYybkqozmo6RB8Mkt/feN+YUXt9G2Rd5xfr
+ N86EdmlYTjlxDf9XzhXt2xyKO5YsNIv6sgPnGTxZC6/rzx8NYUbfXfFh4HUDEtbY
+ TA50ga7htHv63FhyREun
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml
index d394505d..cfe173af 100644
--- a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml
+++ b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml
@@ -110,19 +110,19 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
<md:ContactPerson contactType="administrative">
<md:Company>Karolinska Institutet</md:Company>
<md:SurName>Malin Westerberg</md:SurName>
- <md:EmailAddress>malin.westerberg@ki.se</md:EmailAddress>
+ <md:EmailAddress>mailto:malin.westerberg@ki.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 524 86693</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Karolinska Institutet</md:Company>
<md:SurName>Eric Johansson</md:SurName>
- <md:EmailAddress>eric.johansson@ki.se</md:EmailAddress>
+ <md:EmailAddress>mailto:eric.johansson@ki.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Karolinska Institutet</md:Company>
<md:SurName>IT-support</md:SurName>
- <md:EmailAddress>it-support@ki.se</md:EmailAddress>
+ <md:EmailAddress>mailto:it-support@ki.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml b/swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml
new file mode 100644
index 00000000..913e8e5f
--- /dev/null
+++ b/swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kitstaccount01.tst.ki.se/shibboleth">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://account.tst.ki.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Kontoaktivering Karolinska Institutet (test)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Account activation Karolinska Institutet (test)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Kontoaktiveringstjänst för Karolinska Institutet</mdui:Description>
+ <mdui:Description xml:lang="en">Account activation service for Karolinska Institutet</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>kitstaccount01</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=kitstaccount01</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAMotUlCm5wEsMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmtpdHN0YWNjb3VudDAxMB4XDTE1MDYxNzE0NDExM1oXDTI1MDYxNDE0NDEx
+M1owGTEXMBUGA1UEAxMOa2l0c3RhY2NvdW50MDEwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDULV+rqqGOAkO4OzuLHAie9mAXpDM3uMceCDsyJuHBBv3M
+LwN/kFR4hFOMuDl5ZlDMgKyoldfJgrzr9wNxX+yQowzG/I3sOfdKHHWuMYsDnfkQ
+w/BM7FMSPydi//iWRJp18Miv8qJGMMDyX4bBlVPvwsvA4hg9w/Lz7IztpZnF4T9l
+oqEpc+9/wCOZw4YWiye078cg1jz7qgTYNiTNcYrq5IrcjXGHaqgBw1eXWeXNthFh
+HD9uTlpJ8oatCZWxo5iwgbyny0hOTTJw3qWcA6XhpDfP4aZQ9xu+AMz7hsaGxHs/
+3aJXLU2eHPzn24PYUXb+B8GUjvwBS65hsFdiylbzAgMBAAGjPDA6MBkGA1UdEQQS
+MBCCDmtpdHN0YWNjb3VudDAxMB0GA1UdDgQWBBQ5Kcc5QnyPLh/4Klhj7sXcuDvw
+OzANBgkqhkiG9w0BAQUFAAOCAQEAf3vDJ+yv6U6zRagOgoFGs0B6uuffoVbiZw0H
++Vey5DJw6/hbVPZAKPf8FP/Ug/6V693IYCHOFGqSbJyroaggEJoih+eFdFwj1Kcg
+qv0u+jn59/5lwXMZAKEX3lVLZFpN4wqj5LoLPG9eEa+zCBZ0a6Uv32II8LaxWLim
+RPykkeSsNbO1KM0NFZc3S4PXyXAgC4peUykyHZiCekyJO1/3f82kZLUcoGQ3R6Gx
+sxAP68C4FVn1JXlyWwwF0JAhLUWkHo4bzMp8vXTI6C8Vn8TmSgcPTVZKcVUyljj7
+8yH9mWWt0u8sBHe2xo+WAhVOa9SUyyLGHeH+BNjPuT8fZO6p/w==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.tst.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.tst.ki.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.tst.ki.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.tst.ki.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.tst.ki.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.tst.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.tst.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.tst.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account.tst.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account.tst.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml b/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
index 754d3c51..c266ef1c 100644
--- a/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
+++ b/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
@@ -84,6 +84,6 @@ E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
</Organization>
<ContactPerson contactType="technical">
<Company>Swedish Reasearch Council</Company>
- <EmailAddress>kontors-it@vr.se</EmailAddress>
+ <EmailAddress>mailto:kontors-it@vr.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/login.du.se-idp-shibboleth.xml b/swamid-2.0/login.du.se-idp-shibboleth.xml
index bb4e4820..2871d85d 100644
--- a/swamid-2.0/login.du.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.du.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://login.du.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">du.se</shibmd:Scope>
@@ -99,19 +106,19 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
<ContactPerson contactType="administrative">
<Company>Dalarna University</Company>
<SurName>IT-avdelningen</SurName>
- <EmailAddress>shib-admin@du.se</EmailAddress>
+ <EmailAddress>mailto:shib-admin@du.se</EmailAddress>
<TelephoneNumber>+46 23 778891</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Dalarna University</Company>
<SurName>IT-avdelningen</SurName>
- <EmailAddress>shib-admin@du.se</EmailAddress>
+ <EmailAddress>mailto:shib-admin@du.se</EmailAddress>
<TelephoneNumber>+46 23 778891</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Dalarna University</Company>
<SurName>Högskolan Dalarna Support</SurName>
- <EmailAddress>support@du.se</EmailAddress>
+ <EmailAddress>mailto:support@du.se</EmailAddress>
<TelephoneNumber>+46 23 778888</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
index 6ee867bf..e840385b 100644
--- a/swamid-2.0/login.idp.eduid.se-idp.xml.xml
+++ b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.idp.eduid.se/idp.xml">
+ <ns0:Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </ns0:Extensions>
<ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<ns0:Extensions>
<ns1:Scope regexp="false">eduid.se</ns1:Scope>
@@ -10,8 +17,8 @@
<mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
<mdui:InformationURL xml:lang="sv">https://www.eduid.se</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">https://www.eduid.se</mdui:InformationURL>
- <mdui:Logo xml:lang="sv" height="146" width="144">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
- <mdui:Logo xml:lang="en" height="146" width="144">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
+ <mdui:Logo xml:lang="sv" height="120" width="320">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="120" width="320">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
<mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
<mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
@@ -86,17 +93,17 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
<ns0:ContactPerson contactType="administrative">
<ns0:Company>eduID</ns0:Company>
<ns0:SurName>Valter Nordh</ns0:SurName>
- <ns0:EmailAddress>valter@sunet.se</ns0:EmailAddress>
+ <ns0:EmailAddress>mailto:valter@sunet.se</ns0:EmailAddress>
<ns0:TelephoneNumber>+46707884742</ns0:TelephoneNumber>
</ns0:ContactPerson>
<ns0:ContactPerson contactType="technical">
<ns0:Company>eduID</ns0:Company>
<ns0:SurName>SUNET eduID team</ns0:SurName>
- <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
+ <ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
</ns0:ContactPerson>
<ns0:ContactPerson contactType="support">
<ns0:Company>eduID</ns0:Company>
<ns0:SurName>eduID Support</ns0:SurName>
- <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
+ <ns0:EmailAddress>mailto:support@eduid.se</ns0:EmailAddress>
</ns0:ContactPerson>
</ns0:EntityDescriptor>
diff --git a/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml b/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
index dd3d8662..b45eba7c 100644
--- a/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
@@ -90,6 +90,6 @@ UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certifi
</Organization>
<ContactPerson contactType="technical">
<Company>Handelshögskolan i Stockholm</Company>
- <EmailAddress>itsupport@hhs.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@hhs.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/login.ki.se-idp-shibboleth.xml b/swamid-2.0/login.ki.se-idp-shibboleth.xml
new file mode 100644
index 00000000..e1d90264
--- /dev/null
+++ b/swamid-2.0/login.ki.se-idp-shibboleth.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://login.ki.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Karolinska Institutet (endast nya Ladok)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Karolinska Institutet (only new Ladok)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description>
+ <mdui:Logo height="146" width="292">https://login.ki.se/images/ki_logo_292x146.png</mdui:Logo>
+ <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:DomainHint>ki.se</mdui:DomainHint>
+ <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
+ <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
+ <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
+ <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
+ <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
+ <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
+ <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
+ <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
+ <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
+ <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
+ <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUSr91KhOWgx1LLaoQAw69hE2zxN8wDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ+xNQGjVs6rbJym13yai5iPGLhcXcDFhs2dcckk
+9SnhS0oEhHEPdwn9iwtkXbDaQCdlPzKw1lAQ4PFeqeynh3bM/GNz5RLQp3Fiac1b
+n2MiUEK6Xj2T+5XZklJHwsXnAP5FrPfsXLJ8kbDU7cS7aQ9b+8xqs+YNjIzZzEAx
+OGQp7/zwHTFejWc0GfxrARc+L5xwlXyQGRFjGQAs8Ka+WlV5MhyZFnHV81+/O4Xu
+gztzKuC2i0QKt46S1hep2Za8KxmWfN1pzWG8hnJHFWYOtRuKmTs4tF6ln03c72zF
+0wZ0zv5VKsplRd7ZGozJ275i0gntt233X9RoBM9rGYVBkaMCAwEAAaNdMFswHQYD
+VR0OBBYEFBqgkKxTUPlSShbr1NxOyLvrWkljMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQAB7enC9iTTTfKZXUFtdXPEEJte/x3VembkSftwr+sK1EtDezIB
+R8LUsMqovpC771JmJbhkEVNtErfG9cwyKC3g0oWRY5U02jGxuxcq7yEh6/bTIZ0R
+nx88SX0+V9jMDfQKBFhljKCuozq70dGtApXm8bmuvBPe5gQ9+NaSKWkniOPv+zOS
+wOUUvi/8r6AE7PtCXn6uydqUcEo/oh8OMZOVx0siApLrG6NwZpGUz6l8mqH00zd5
+Lslkb6jUsVBP2o/ORnwRlgY0I4491wMALYaplSMa1LUZPyB7Iv5IuHkybBEYy+mY
+GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUQnJmXS4G/tbR42ca8QG480l3MMEwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJA5FGj3sWcneuNuMoqgT9nQ07FAXKdSnDtfASMq
+0ZyaxyLJbOlKyRRzy8okbWTAhuI98JvuvGsSjg2dXCvRFKI/fF5pXn70enux0Svk
+NUvZdnr38noCyEVpTUpSMjDrHF9V1FDAloJ65zbRepdHU4Sv9di5Vy9ppAo4VrLw
+iR2AXS7EFQ39aIm37xPIQz2M0HXBERVCQHOg51LrwNnMCVE1I70s28qYzI3wo/0p
+HfD9qWqnqIz8Fr1UHCDGArJN1YhQJZbWlN2KBndl3Ike4obeDxQFnS707l8B1Hnh
+ceV8ohgtK82bASKSVCJ1Z7w+CAGAhABqc8DCJ599mTDzm78CAwEAAaNdMFswHQYD
+VR0OBBYEFDrrD9A+XOKI8btkdBaO8hvc/vyMMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQBhpdosfvuPTuvAoK0jokVl7gqDW53KrRTD+BrJRoOGPBQ2DXVF
+TvQdmS/zymbrFghQr0XOzYLRa+fP6lfoNusBWKfL0Fyto8skicSNswYDG1zgF6HI
+03eHqhB5ma6u4rh3gAMwVcpyYCcrrJ2hbTI8BWXzZFaxXM9JaK7u2J8k5tGAccK1
+247NSR8LEai46HkZpovuKPjD9zwunV6mQeOXQeo3WtoPW0twB9h01sfqV0iMvaXg
+Tu4iUPkcwpIeauNAjJ4KXpl5OxehsBnz9rrb6smtz2bfWBBNiPHaHhT6XIqon5X1
+kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUEEr81svYHmizs6DjzN0FCQ1IlLkwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMIJsWHFr/fc/26Dfv0WOBhspXfyRVGSHMu5IeRs
+reQGRKbrdW4KOOrKQkqZnyQVe8eZt/GZKSzy+9VnAJo3ypaUt2y0LsTqibcg7oNO
+RcC2yDKlEN8CCSX3OQrQ1kWRxHpMSaHx1TeWAPI9kB0CykeG6FmVYXG9arY9u9pn
+ZvdPCXg7SkFbTCa1zJdbxBCumq/nAKGiEct6GQHMeYOb9YBI+WYYByfseLdf5dNC
+i1fXuRYbxK9dcFIVlGuZRea99TklSZZR3BxFLHgcECjp1ZtoT0Byl2yxmm0nGJE2
+HKh+LsxAUz3ouG3qItUJPYzBS1RHQVWYz8N4T8z+w+1jEY0CAwEAAaNdMFswHQYD
+VR0OBBYEFKf0zzGixtPS531/l3z2Vc04g1seMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQA4PPWZd96F0l40muNxqPzVNzTq/D+ndRhEcPOxk8SraEXaFlkm
+xqELKuLnuj7MAx+y/SJssIs9acDm8CBxp60z9hSTkokVjVAfyWiTU+KuTGvwWWnP
+T25PheKwMPl+W45PhXfbK0F1nDXvNf2L59gxuBIJEcqojx6BHlLfz1tbQUCsezV4
+fv98gre6OoWeN5TSiWgtl7Gsb1cjFRcfiYNwDo9pWqNnLOioncMs4SOyEKrTxrU7
+rmABcIrDyPLSecdGrJBUBiYy1tTm72SEGK9npcZ8QPuXkkSf7zskTenf4tFszUnq
+BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ki.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ki.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ki.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUSr91KhOWgx1LLaoQAw69hE2zxN8wDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ+xNQGjVs6rbJym13yai5iPGLhcXcDFhs2dcckk
+9SnhS0oEhHEPdwn9iwtkXbDaQCdlPzKw1lAQ4PFeqeynh3bM/GNz5RLQp3Fiac1b
+n2MiUEK6Xj2T+5XZklJHwsXnAP5FrPfsXLJ8kbDU7cS7aQ9b+8xqs+YNjIzZzEAx
+OGQp7/zwHTFejWc0GfxrARc+L5xwlXyQGRFjGQAs8Ka+WlV5MhyZFnHV81+/O4Xu
+gztzKuC2i0QKt46S1hep2Za8KxmWfN1pzWG8hnJHFWYOtRuKmTs4tF6ln03c72zF
+0wZ0zv5VKsplRd7ZGozJ275i0gntt233X9RoBM9rGYVBkaMCAwEAAaNdMFswHQYD
+VR0OBBYEFBqgkKxTUPlSShbr1NxOyLvrWkljMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQAB7enC9iTTTfKZXUFtdXPEEJte/x3VembkSftwr+sK1EtDezIB
+R8LUsMqovpC771JmJbhkEVNtErfG9cwyKC3g0oWRY5U02jGxuxcq7yEh6/bTIZ0R
+nx88SX0+V9jMDfQKBFhljKCuozq70dGtApXm8bmuvBPe5gQ9+NaSKWkniOPv+zOS
+wOUUvi/8r6AE7PtCXn6uydqUcEo/oh8OMZOVx0siApLrG6NwZpGUz6l8mqH00zd5
+Lslkb6jUsVBP2o/ORnwRlgY0I4491wMALYaplSMa1LUZPyB7Iv5IuHkybBEYy+mY
+GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUQnJmXS4G/tbR42ca8QG480l3MMEwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJA5FGj3sWcneuNuMoqgT9nQ07FAXKdSnDtfASMq
+0ZyaxyLJbOlKyRRzy8okbWTAhuI98JvuvGsSjg2dXCvRFKI/fF5pXn70enux0Svk
+NUvZdnr38noCyEVpTUpSMjDrHF9V1FDAloJ65zbRepdHU4Sv9di5Vy9ppAo4VrLw
+iR2AXS7EFQ39aIm37xPIQz2M0HXBERVCQHOg51LrwNnMCVE1I70s28qYzI3wo/0p
+HfD9qWqnqIz8Fr1UHCDGArJN1YhQJZbWlN2KBndl3Ike4obeDxQFnS707l8B1Hnh
+ceV8ohgtK82bASKSVCJ1Z7w+CAGAhABqc8DCJ599mTDzm78CAwEAAaNdMFswHQYD
+VR0OBBYEFDrrD9A+XOKI8btkdBaO8hvc/vyMMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQBhpdosfvuPTuvAoK0jokVl7gqDW53KrRTD+BrJRoOGPBQ2DXVF
+TvQdmS/zymbrFghQr0XOzYLRa+fP6lfoNusBWKfL0Fyto8skicSNswYDG1zgF6HI
+03eHqhB5ma6u4rh3gAMwVcpyYCcrrJ2hbTI8BWXzZFaxXM9JaK7u2J8k5tGAccK1
+247NSR8LEai46HkZpovuKPjD9zwunV6mQeOXQeo3WtoPW0twB9h01sfqV0iMvaXg
+Tu4iUPkcwpIeauNAjJ4KXpl5OxehsBnz9rrb6smtz2bfWBBNiPHaHhT6XIqon5X1
+kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUEEr81svYHmizs6DjzN0FCQ1IlLkwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMIJsWHFr/fc/26Dfv0WOBhspXfyRVGSHMu5IeRs
+reQGRKbrdW4KOOrKQkqZnyQVe8eZt/GZKSzy+9VnAJo3ypaUt2y0LsTqibcg7oNO
+RcC2yDKlEN8CCSX3OQrQ1kWRxHpMSaHx1TeWAPI9kB0CykeG6FmVYXG9arY9u9pn
+ZvdPCXg7SkFbTCa1zJdbxBCumq/nAKGiEct6GQHMeYOb9YBI+WYYByfseLdf5dNC
+i1fXuRYbxK9dcFIVlGuZRea99TklSZZR3BxFLHgcECjp1ZtoT0Byl2yxmm0nGJE2
+HKh+LsxAUz3ouG3qItUJPYzBS1RHQVWYz8N4T8z+w+1jEY0CAwEAAaNdMFswHQYD
+VR0OBBYEFKf0zzGixtPS531/l3z2Vc04g1seMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQA4PPWZd96F0l40muNxqPzVNzTq/D+ndRhEcPOxk8SraEXaFlkm
+xqELKuLnuj7MAx+y/SJssIs9acDm8CBxp60z9hSTkokVjVAfyWiTU+KuTGvwWWnP
+T25PheKwMPl+W45PhXfbK0F1nDXvNf2L59gxuBIJEcqojx6BHlLfz1tbQUCsezV4
+fv98gre6OoWeN5TSiWgtl7Gsb1cjFRcfiYNwDo9pWqNnLOioncMs4SOyEKrTxrU7
+rmABcIrDyPLSecdGrJBUBiYy1tTm72SEGK9npcZ8QPuXkkSf7zskTenf4tFszUnq
+BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0/login.liu.se-idp-shibboleth.xml b/swamid-2.0/login.liu.se-idp-shibboleth.xml
index a331e59a..b1e913ea 100644
--- a/swamid-2.0/login.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.liu.se-idp-shibboleth.xml
@@ -104,17 +104,17 @@ dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
<ContactPerson contactType="administrative">
<Company>Linköping University</Company>
<SurName>LiU-IT SAML admins</SurName>
- <EmailAddress>saml-admins@it.liu.se</EmailAddress>
+ <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Linköping University</Company>
<SurName>LiU-IT SAML admins</SurName>
- <EmailAddress>saml-admins@it.liu.se</EmailAddress>
+ <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Linköping University</Company>
<SurName>LiU-IT Helpdesk</SurName>
- <EmailAddress>helpdesk@liu.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@liu.se</EmailAddress>
<TelephoneNumber>+46 13 282828</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml b/swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml
new file mode 100644
index 00000000..cd86091b
--- /dev/null
+++ b/swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://login.tst.ki.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Karolinska Institutet (test Shibboleth 3)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Karolinska Institutet (test Shibboleth 3)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Test Identity Provider för Karolinska Institutet.</mdui:Description>
+ <mdui:Description xml:lang="en">Test Identity Provider for Karolinska Institutet.</mdui:Description>
+ <mdui:Logo height="146" width="292">https://login.tst.ki.se/images/ki_logo_292x146.png</mdui:Logo>
+ <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:DomainHint>ki.se</mdui:DomainHint>
+ <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
+ <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
+ <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
+ <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
+ <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
+ <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
+ <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
+ <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
+ <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
+ <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
+ <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDRa
+Fw0zNTExMDQxNDI4MDRaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsH/cWaST4Ua0YvM2A1IpfWnWS4
+V8gzg8MFWL9vwAyTmg9prTkOzHxVSXpvrXz+Sr9OvAcpG7Qcia7+rS+raRMqaiG+
++3tF932XgCZmq532oSYxFLk/ZssmyHQiUYY/tzC832yoiM8vIHYuQeyaD2i9HdhH
+vS4FLLcP5k4H166wW/uUkRDs/pG2e7uiT6RIhavV3sUIPlzRdkkuYhURcGjpTCsb
+5DRb+FmkRHH61OdLJMkqi7c8z3jmRXBZn+FsENElQPySzaiWJI+XKS8Mn36sFrTM
+gOXEYC3u9H6k3ZdXYVq+Brh0dwaQi7waPt3FJpfYPIDwxOYKtLHrgoS0MzECAwEA
+AaNlMGMwHQYDVR0OBBYEFMi5T4diS2VMxS0jWp5BszYiV96bMEIGA1UdEQQ7MDmC
+D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAErKe5nlDdbds4rre39uKZZXvPuF
++JZ/VvmJJXF7t/YADLYQEhU4ybZOc0MRvGV6IKrmEwXHOpIcD7Uf+T1rvyIKQ24l
+a2qbjZ0/Si4K5V3VHWKw9n1hFxzpBVblRBQKpe3C2/AHtXo42I581Aj4RiMMvdtE
+s6I6mUGkWt+12okiFPkPYkZiKNS44MRH/MpFBRZyq2+16AvarO5TxU8czzuHIaiw
+WWUe6DVFlidT5MLwtVawka9hmB11ck88jfu1I9MuBA3kshE4P3nAZFUSxWBEJVhw
+n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTE1MTEwNDE0MjgwMloX
+DTM1MTEwNDE0MjgwMlowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqigba9iKeQgpVTxXDJdR8XY3unuY
+tE4BnM29l3kUIPO17FPURUkhbrl86SeWHE6xPRATi9XHG44o9ACsLyR85FWkeGnj
+o26QqovXOxFn+YDEXIFu2Ier2YxJiL8MWte5n41Wf1poZQb0Sf4o+LOSrVZxd98n
+xzEuCJ93Luf4RxB9l+dfoVK4EDp6AAIJO/sxBmeEYfvNFukp+duyDFdQV1oSWaWg
+TMIqmaPevF4t39YwGCutFpZJyp++jfkixbNHzC75xiFyWfdumMcOs5FYA70rPUEl
+ZgQs1pUZv4qP7VeNNS6QXQyQl86kxMN7XfymgoqLQdHN2e1+JiEsk95kmwIDAQAB
+o2UwYzAdBgNVHQ4EFgQUTvEk7OlxQx65QaRT+nO7cuOY71wwQgYDVR0RBDswOYIP
+bG9naW4udHN0LmtpLnNlhiZodHRwczovL2xvZ2luLnRzdC5raS5zZS9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATSLgQWRc05CI6vkw8fCaC4pAYKmu
+uMqAIcKhkaVslYJGRRxnPlEKKvXZeh3QAkqj0RW7o/VFbltsfbOKpmg/h1hp110Q
+EdFRvAfpycCvKp7BnJa4mJ9RD0/PwuyeZ6IMg4hGt82gsgRbWJsCb6lYwj8i0ZIu
+N8jxHT9GPA1BezK2+iC7x/UZXuPzI+/AfRMchBzStgau9H+MsP1mXi1SIm+iqaRA
+fyNTnKTNyov83sU5fX101h10Qp9rW7Im/Ol1zZefMdOc4rsSYi8zSlaPWuIPz9nu
+MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDNa
+Fw0zNTExMDQxNDI4MDNaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJ3zTxhdfaqyeZScdvMEST9OtZ8
+DV2qXwakGUN8o2tdxn+zXKcrN0QN1CUsHkQlZ2m3PEEZlpgsp618SBGJVOHsLea8
+v3UxoEtw9BSGWip8xyWKMAhRh7KRmq4K4OqdNlo6M30KuPpPe0ZkI7gA2qR2lVv6
+ybR97uc9DrM8wKJjwYJKaYFeePdU99H4l2bzR6Au3mJ8Dd4Vq4wIPhC0ADvvDzU4
+UfZY/YkqAyroiwPZsaM2o8mspDqnbTOu6lPM4XeKFYKNdDamFVimnYLDKgM81/Ne
+IMv/7Klx5zt1Tf5NZaxgZ/xSXdQQAgQe/emteLIV5bdtIWlmT6O7WUI5QiUCAwEA
+AaNlMGMwHQYDVR0OBBYEFF7LNVAsmm6yfKeW7ViJuMrPTWfHMEIGA1UdEQQ7MDmC
+D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACYeLTIPNFIMCey2yr95YxXdZTzB
+wRAODcgpQGaCPdb+MtyT2a7m/Z3g2bzQvqGgC7er/fv8pXMhpsGuPrgwvQNWXWUA
+l+0EyhfpVZn/KvehtJV911wrqbLh8XVCTL1f+yegjZb927m3i1ctHIRRq5i2xMoC
+xDQRJ2cT1zKmKy/1EaZpJXNvWjt7Jpis7MAa5Upl6bjnYWLfCWwTxnSZ5hVqTU9G
+U5qAm8DQOPhc4+r9NNyiwB159QMR9AcUZNb6YHjqV3vcRQqTL6+UlryQimkERyZO
+jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.tst.ki.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.tst.ki.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.tst.ki.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDRa
+Fw0zNTExMDQxNDI4MDRaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsH/cWaST4Ua0YvM2A1IpfWnWS4
+V8gzg8MFWL9vwAyTmg9prTkOzHxVSXpvrXz+Sr9OvAcpG7Qcia7+rS+raRMqaiG+
++3tF932XgCZmq532oSYxFLk/ZssmyHQiUYY/tzC832yoiM8vIHYuQeyaD2i9HdhH
+vS4FLLcP5k4H166wW/uUkRDs/pG2e7uiT6RIhavV3sUIPlzRdkkuYhURcGjpTCsb
+5DRb+FmkRHH61OdLJMkqi7c8z3jmRXBZn+FsENElQPySzaiWJI+XKS8Mn36sFrTM
+gOXEYC3u9H6k3ZdXYVq+Brh0dwaQi7waPt3FJpfYPIDwxOYKtLHrgoS0MzECAwEA
+AaNlMGMwHQYDVR0OBBYEFMi5T4diS2VMxS0jWp5BszYiV96bMEIGA1UdEQQ7MDmC
+D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAErKe5nlDdbds4rre39uKZZXvPuF
++JZ/VvmJJXF7t/YADLYQEhU4ybZOc0MRvGV6IKrmEwXHOpIcD7Uf+T1rvyIKQ24l
+a2qbjZ0/Si4K5V3VHWKw9n1hFxzpBVblRBQKpe3C2/AHtXo42I581Aj4RiMMvdtE
+s6I6mUGkWt+12okiFPkPYkZiKNS44MRH/MpFBRZyq2+16AvarO5TxU8czzuHIaiw
+WWUe6DVFlidT5MLwtVawka9hmB11ck88jfu1I9MuBA3kshE4P3nAZFUSxWBEJVhw
+n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTE1MTEwNDE0MjgwMloX
+DTM1MTEwNDE0MjgwMlowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqigba9iKeQgpVTxXDJdR8XY3unuY
+tE4BnM29l3kUIPO17FPURUkhbrl86SeWHE6xPRATi9XHG44o9ACsLyR85FWkeGnj
+o26QqovXOxFn+YDEXIFu2Ier2YxJiL8MWte5n41Wf1poZQb0Sf4o+LOSrVZxd98n
+xzEuCJ93Luf4RxB9l+dfoVK4EDp6AAIJO/sxBmeEYfvNFukp+duyDFdQV1oSWaWg
+TMIqmaPevF4t39YwGCutFpZJyp++jfkixbNHzC75xiFyWfdumMcOs5FYA70rPUEl
+ZgQs1pUZv4qP7VeNNS6QXQyQl86kxMN7XfymgoqLQdHN2e1+JiEsk95kmwIDAQAB
+o2UwYzAdBgNVHQ4EFgQUTvEk7OlxQx65QaRT+nO7cuOY71wwQgYDVR0RBDswOYIP
+bG9naW4udHN0LmtpLnNlhiZodHRwczovL2xvZ2luLnRzdC5raS5zZS9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATSLgQWRc05CI6vkw8fCaC4pAYKmu
+uMqAIcKhkaVslYJGRRxnPlEKKvXZeh3QAkqj0RW7o/VFbltsfbOKpmg/h1hp110Q
+EdFRvAfpycCvKp7BnJa4mJ9RD0/PwuyeZ6IMg4hGt82gsgRbWJsCb6lYwj8i0ZIu
+N8jxHT9GPA1BezK2+iC7x/UZXuPzI+/AfRMchBzStgau9H+MsP1mXi1SIm+iqaRA
+fyNTnKTNyov83sU5fX101h10Qp9rW7Im/Ol1zZefMdOc4rsSYi8zSlaPWuIPz9nu
+MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDNa
+Fw0zNTExMDQxNDI4MDNaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJ3zTxhdfaqyeZScdvMEST9OtZ8
+DV2qXwakGUN8o2tdxn+zXKcrN0QN1CUsHkQlZ2m3PEEZlpgsp618SBGJVOHsLea8
+v3UxoEtw9BSGWip8xyWKMAhRh7KRmq4K4OqdNlo6M30KuPpPe0ZkI7gA2qR2lVv6
+ybR97uc9DrM8wKJjwYJKaYFeePdU99H4l2bzR6Au3mJ8Dd4Vq4wIPhC0ADvvDzU4
+UfZY/YkqAyroiwPZsaM2o8mspDqnbTOu6lPM4XeKFYKNdDamFVimnYLDKgM81/Ne
+IMv/7Klx5zt1Tf5NZaxgZ/xSXdQQAgQe/emteLIV5bdtIWlmT6O7WUI5QiUCAwEA
+AaNlMGMwHQYDVR0OBBYEFF7LNVAsmm6yfKeW7ViJuMrPTWfHMEIGA1UdEQQ7MDmC
+D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACYeLTIPNFIMCey2yr95YxXdZTzB
+wRAODcgpQGaCPdb+MtyT2a7m/Z3g2bzQvqGgC7er/fv8pXMhpsGuPrgwvQNWXWUA
+l+0EyhfpVZn/KvehtJV911wrqbLh8XVCTL1f+yegjZb927m3i1ctHIRRq5i2xMoC
+xDQRJ2cT1zKmKy/1EaZpJXNvWjt7Jpis7MAa5Upl6bjnYWLfCWwTxnSZ5hVqTU9G
+U5qAm8DQOPhc4+r9NNyiwB159QMR9AcUZNb6YHjqV3vcRQqTL6+UlryQimkERyZO
+jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml b/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
new file mode 100644
index 00000000..6d13ec2a
--- /dev/null
+++ b/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ludicris.lub.lu.se/Shibboleth">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" 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="sv">Lucris test</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Lucris test</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Uppdaterat forsknings information system</mdui:Description>
+ <mdui:Description xml:lang="en">Current research information system</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEETCCAvmgAwIBAgIJAIw2INOkQuPLMA0GCSqGSIb3DQEBCwUAMIGeMQswCQYDVQQGEwJzZTEO
+MAwGA1UECAwFc2thbmUxDTALBgNVBAcMBGx1bmQxGDAWBgNVBAoMD0x1bmQgVW5pdmVyc2l0eTEb
+MBkGA1UECwwSVW5pdmVyc2l0eSBMaWJyYXJ5MREwDwYDVQQDDAhsdWRpY3JpczEmMCQGCSqGSIb3
+DQEJARYXZGF2aWQuaG9sb3Noa2FAdWIubHUuc2UwHhcNMTUxMTA5MDk0OTQ5WhcNMTcxMDI5MDk0
+OTQ5WjCBnjELMAkGA1UEBhMCc2UxDjAMBgNVBAgMBXNrYW5lMQ0wCwYDVQQHDARsdW5kMRgwFgYD
+VQQKDA9MdW5kIFVuaXZlcnNpdHkxGzAZBgNVBAsMElVuaXZlcnNpdHkgTGlicmFyeTERMA8GA1UE
+AwwIbHVkaWNyaXMxJjAkBgkqhkiG9w0BCQEWF2RhdmlkLmhvbG9zaGthQHViLmx1LnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEdl2vqOVz1qy8S13/9CqYXp2VyrTz+LtIFZf5H/
+45Inzd0I1EMeDPZsW3CNfEmkJMlQzlwH35mQNPFwEL9hsk26I27WRfBc5Md1dviE3zPb54LQfRJP
+ZDaAqP+7fJ2jEUzomJWrO1qUZ08ikMRlZAg/RqkXsf/+yWFhD99n32jwMfWUz4/TW7/hcQnglQTm
+x6iYah6YiQzHAcKDG15eenCzbQEuiYx3jU5mvXR/t2EEYNV3j/QpsS9HRz+2pJNHKBzZJmt6JinG
+TNuknCxqeHLVca5MJXC+TWXBEaQU4ec4BZ1QpnHXvfJ/fPjLm4mFAC/s3kDYBPBLV5N51+c6eQID
+AQABo1AwTjAdBgNVHQ4EFgQU4mr68BYrn/ePlI3AzlErLjyV+w8wHwYDVR0jBBgwFoAU4mr68BYr
+n/ePlI3AzlErLjyV+w8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEASF2PhO6m5GQE
+DaKfV4Urtilp1Ru2hctQX+mhE16JGTHcFWYjO298Y8OmUV1845tUAU+Bgv4DHSWYqUtwutxuNLOL
+gI5cNJs+aCq5/opE4Ele2fcHZ3uvpOU6IrZAG1bu2rheW7KamW88CE5QQ1vWCaGHxdYw1cKyvxoD
+8R4AfsDq0caHuWC8HBozWj2v7F8MlKxQjhPdukYkfQJ8JbHmCQ4HMdgC2f1+s1E1EAVR9zRPHTaB
+qIpjIsKQTnr0tI/EteQ0mJ0T4V5pNp0aJfH+H/RFlDBimI/W3x0fGQg9Xy7ZzkmQvwjCdQFVZRPA
+uuNxKggJPJhRph8bitha6sR6EQ==</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>MIIEETCCAvmgAwIBAgIJAIw2INOkQuPLMA0GCSqGSIb3DQEBCwUAMIGeMQswCQYDVQQGEwJzZTEO
+MAwGA1UECAwFc2thbmUxDTALBgNVBAcMBGx1bmQxGDAWBgNVBAoMD0x1bmQgVW5pdmVyc2l0eTEb
+MBkGA1UECwwSVW5pdmVyc2l0eSBMaWJyYXJ5MREwDwYDVQQDDAhsdWRpY3JpczEmMCQGCSqGSIb3
+DQEJARYXZGF2aWQuaG9sb3Noa2FAdWIubHUuc2UwHhcNMTUxMTA5MDk0OTQ5WhcNMTcxMDI5MDk0
+OTQ5WjCBnjELMAkGA1UEBhMCc2UxDjAMBgNVBAgMBXNrYW5lMQ0wCwYDVQQHDARsdW5kMRgwFgYD
+VQQKDA9MdW5kIFVuaXZlcnNpdHkxGzAZBgNVBAsMElVuaXZlcnNpdHkgTGlicmFyeTERMA8GA1UE
+AwwIbHVkaWNyaXMxJjAkBgkqhkiG9w0BCQEWF2RhdmlkLmhvbG9zaGthQHViLmx1LnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEdl2vqOVz1qy8S13/9CqYXp2VyrTz+LtIFZf5H/
+45Inzd0I1EMeDPZsW3CNfEmkJMlQzlwH35mQNPFwEL9hsk26I27WRfBc5Md1dviE3zPb54LQfRJP
+ZDaAqP+7fJ2jEUzomJWrO1qUZ08ikMRlZAg/RqkXsf/+yWFhD99n32jwMfWUz4/TW7/hcQnglQTm
+x6iYah6YiQzHAcKDG15eenCzbQEuiYx3jU5mvXR/t2EEYNV3j/QpsS9HRz+2pJNHKBzZJmt6JinG
+TNuknCxqeHLVca5MJXC+TWXBEaQU4ec4BZ1QpnHXvfJ/fPjLm4mFAC/s3kDYBPBLV5N51+c6eQID
+AQABo1AwTjAdBgNVHQ4EFgQU4mr68BYrn/ePlI3AzlErLjyV+w8wHwYDVR0jBBgwFoAU4mr68BYr
+n/ePlI3AzlErLjyV+w8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEASF2PhO6m5GQE
+DaKfV4Urtilp1Ru2hctQX+mhE16JGTHcFWYjO298Y8OmUV1845tUAU+Bgv4DHSWYqUtwutxuNLOL
+gI5cNJs+aCq5/opE4Ele2fcHZ3uvpOU6IrZAG1bu2rheW7KamW88CE5QQ1vWCaGHxdYw1cKyvxoD
+8R4AfsDq0caHuWC8HBozWj2v7F8MlKxQjhPdukYkfQJ8JbHmCQ4HMdgC2f1+s1E1EAVR9zRPHTaB
+qIpjIsKQTnr0tI/EteQ0mJ0T4V5pNp0aJfH+H/RFlDBimI/W3x0fGQg9Xy7ZzkmQvwjCdQFVZRPA
+uuNxKggJPJhRph8bitha6sR6EQ==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://ludicris.lub.lu.se/admin/saml/SingleLogout/alias/pure"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://ludicris.lub.lu.se/admin/saml/SingleLogout/alias/pure"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://ludicris.lub.lu.se/admin/saml/SingleLogout/alias/pure"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://ludicris.lub.lu.se/admin/saml/SSO/alias/pure" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://ludicris.lub.lu.se/admin/saml/SSO/alias/pure" index="1" isDefault="true"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>David</md:GivenName>
+ <md:SurName>Holoshka</md:SurName>
+ <md:EmailAddress>david.holoshka@ub.lu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ludwig.lub.lu.se-sp.xml b/swamid-2.0/ludwig.lub.lu.se-sp.xml
new file mode 100644
index 00000000..1b81627e
--- /dev/null
+++ b/swamid-2.0/ludwig.lub.lu.se-sp.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- EntityDescriptor requires an "entityID" attribute. -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ludwig.lub.lu.se/sp">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
+ <md: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://login.ludwig.lub.lu.se/Shibboleth.sso/DS" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Universitetsbiblioteket vid Lunds universitets EZproxy</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Lund University Library Proxy</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDfTCCAuagAwIBAgIBCjANBgkqhkiG9w0BAQUFADCBjDEZMBcGA1UEAxMQbHVk
+d2lnLmx1Yi5sdS5zZTELMAkGA1UEBhMCU0UxGDAWBgNVBAoTD0x1bmQgVW5pdmVy
+c2l0eTEgMB4GA1UECxMXTHVuZCBVbml2ZXJzaXR5IExpYnJhcnkxJjAkBgkqhkiG
+9w0BCQEWF0RhdmUuU2hlcm9obWFuQHViLmx1LnNlMB4XDTE1MTIwODEwMjcyMFoX
+DTE2MTIwNzEwMjcyMFowgYwxGTAXBgNVBAMTEGx1ZHdpZy5sdWIubHUuc2UxCzAJ
+BgNVBAYTAlNFMRgwFgYDVQQKEw9MdW5kIFVuaXZlcnNpdHkxIDAeBgNVBAsTF0x1
+bmQgVW5pdmVyc2l0eSBMaWJyYXJ5MSYwJAYJKoZIhvcNAQkBFhdEYXZlLlNoZXJv
+aG1hbkB1Yi5sdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApb2UyEvo
+xZwI7tjUSLLcisNsVu30dF9cIjuWXWoH7tmTP5CVOfdzyzjJtcfxdccpSIbAjBdk
+0dIKb4q/+MufcWFfczyMzQcDxMCSl9jX1AInLwjdMrPEIggvBcdh5HgJlrsYzWL6
+PffUn4WSy38g0I65MsDK9U7JLtryDyIht78CAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
+UozZB/p7OI56DLF2nv/4f0vYFFgwgbkGA1UdIwSBsTCBroAUUozZB/p7OI56DLF2
+nv/4f0vYFFihgZKkgY8wgYwxGTAXBgNVBAMTEGx1ZHdpZy5sdWIubHUuc2UxCzAJ
+BgNVBAYTAlNFMRgwFgYDVQQKEw9MdW5kIFVuaXZlcnNpdHkxIDAeBgNVBAsTF0x1
+bmQgVW5pdmVyc2l0eSBMaWJyYXJ5MSYwJAYJKoZIhvcNAQkBFhdEYXZlLlNoZXJv
+aG1hbkB1Yi5sdS5zZYIBCjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GB
+ACfIOlklPpPy/CSkVKlUV1FfGFnjRGaMQ/v5JNuB0onPUlS+/BXLkO4c04H2YmtB
+ZjHVX55+FCLvn94f93DtQ5QSlnsL89mUKgIZkJVsIbi6oR9lGn/XTAN5GUc9IVnB
+mmitGb4pfJ2KSrUN4lHz+7RJSlS8SpNH9tCS4CSgNbRR
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML/POST" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML/Artifact" index="4"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Dave</md:GivenName>
+ <md:SurName>Sherohman</md:SurName>
+ <md:EmailAddress>Dave.Sherohman@ub.lu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/mp.uu.se-shibboleth.sso.xml b/swamid-2.0/mp.uu.se-shibboleth.sso.xml
index 91f9b9f1..9052a7d6 100644
--- a/swamid-2.0/mp.uu.se-shibboleth.sso.xml
+++ b/swamid-2.0/mp.uu.se-shibboleth.sso.xml
@@ -5,6 +5,7 @@
<samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
<samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
<samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
@@ -58,9 +59,9 @@ Ohr8KLKt6tC/JZ059e8ENxrN7g==
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:ContactPerson contactType="support">
- <md:EmailAddress>servicedesk@uu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
- <md:EmailAddress>liferay-datordrift@its.uu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:liferay-datordrift@its.uu.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/wisumstage.its.umu.se-shibboleth.xml b/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
index 50ca0a2e..0ac477fc 100644
--- a/swamid-2.0/wisumstage.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
@@ -3,7 +3,7 @@
This is example metadata only. Do *NOT* supply it as is without review,
and do *NOT* provide it in real time to your partners.
-->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wisumstage.its.umu.se/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-gerrit.its.umu.se/shibboleth">
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -25,58 +25,43 @@ and do *NOT* provide it in real time to your partners.
<samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
<samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
<samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wisumstage.its.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
- <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://wisumstage.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wisumstage.its.umu.se/Shibboleth.sso/MIUN"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wisumstage.its.umu.se/Shibboleth.sso/HH"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wisumstage.its.umu.se/Shibboleth.sso/UMU"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SU"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wisumstage.its.umu.se/Shibboleth.sso/KI"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SU"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wisumstage.its.umu.se/Shibboleth.sso/KTH"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wisumstage.its.umu.se/Shibboleth.sso/HIG"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wisumstage.its.umu.se/Shibboleth.sso/LTU"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-gerrit.its.umu.se/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://nya-gerrit.its.umu.se/Shibboleth.sso/DS" index="1"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/Login"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">ITS, Umeå universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">ITS, Umea University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Serviceprovider, används primärt för utveckling</mdui:Description>
- <mdui:Description xml:lang="en">Serviceprovider, primarily used for development</mdui:Description>
+ <mdui:DisplayName xml:lang="sv">Gerrit för NyA på ITS, Umeå universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Gerrit for NyA at ITS, Umeå university</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Gerrit för NyA på ITS, Umeå universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Gerrit for NyA at ITS, Umeå university</mdui:Description>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>its-utv03.ad.umu.se</ds:KeyName>
+ <ds:KeyName>nya-gerrit.its.umu.se</ds:KeyName>
<ds:X509Data>
- <ds:X509SubjectName>emailAddress=ake.andersson@umu.se,CN=its-utv03.ad.umu.se,OU=Organizational Unit Name:ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
- <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAMZSkH53CntAMA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
-CgYDVQQKDANJVFMxJTAjBgNVBAsMHE9yZ2FuaXphdGlvbmFsIFVuaXQgTmFtZTpJ
-VFMxHDAaBgNVBAMME2l0cy11dHYwMy5hZC51bXUuc2UxIzAhBgkqhkiG9w0BCQEW
-FGFrZS5hbmRlcnNzb25AdW11LnNlMB4XDTE0MDkyMzA4MzQxMloXDTE3MDgwNjA4
-MzQxMlowgasxCzAJBgNVBAYTAlNFMRUwEwYDVQQIDAxWYXN0ZXJib3R0ZW4xDTAL
-BgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzElMCMGA1UECwwcT3JnYW5pemF0aW9u
-YWwgVW5pdCBOYW1lOklUUzEcMBoGA1UEAwwTaXRzLXV0djAzLmFkLnVtdS5zZTEj
-MCEGCSqGSIb3DQEJARYUYWtlLmFuZGVyc3NvbkB1bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC6WjbxUU6Sy8YeZIeQ11E2eH66YG/CcAy3nd2g
-0ai2Dzu03wCD+GNdWPuZslLlkvK4AE6iR2+ZQgkqzBoI7ifpxSbnPMfPDMjNK5Yx
-Ix7EHE1kgD7D1iCz30H2O9/oNSVjykMXnjLMlLBYaDjxZoj+L3pwKKTW6Yzg6T7o
-z90xke1qpcVOD0+e2vgLoYbIq7QTzF/VkPyRrDwsbw3f4WiJiRAI9dNLPdt6fh6F
-ePKKPv6xUEOO1uDjVmwL7HUYfh6br5G6jR642rnbJhqd5HJiD1Sn+BMv2ilVFHOr
-KclBHavS9aKvj++IVdjTMk0/APsSi8uV2RF1UEeUVh2afi2pAgMBAAGjUDBOMB0G
-A1UdDgQWBBS/yT6QYUoPUWKDcpJe52kqdgRKXzAfBgNVHSMEGDAWgBS/yT6QYUoP
-UWKDcpJe52kqdgRKXzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCa
-53ROhR17tvRIoeBhUZ3WICcNsrN88LcQX6iiD9beWr4bLYn0hX+vgs/EoznuLZPL
-9yBPk5XlVfRJA6XGQ2mrcWeVPapduIOeRX5MpBaOhOULMahTC9VztR+0/h5lUiVF
-MgYw/UX/wMJheDvEqt31DrwfGPH7cFnZZnNiDBNzpe7RTx5r6W9lXROzyl0BJ+l/
-N1edCRg4D+SjXviDNKli19pL82ONv0x607sCLGKEDR3qhQxd7wcGcNGwlg32MFNQ
-vk7XtvHnrAqG1Nn1WrK5npXCw9Tx8omdql4W0fhtdHDffSxO7iNVswPS8/fYIYHc
-xjIf5blaR7shDIsqWMix
+ <ds:X509SubjectName>CN=nya-gerrit.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAPYUOmUEXEx7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFW55YS1nZXJyaXQuaXRzLnVtdS5zZTAeFw0xNTEyMTYwODU2NDRaFw0yNTEy
+MTMwODU2NDRaMCAxHjAcBgNVBAMTFW55YS1nZXJyaXQuaXRzLnVtdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMt6Yzi3g3Zi2xU/5x0ko16wX6W9
+0MUT/qfPGXpRxbZ7XFtie7Nta7fkycWKbbPVbwqKN8UfFwHX8nKQXDH1qr+DcUsg
+aZkpuZWQCmBak0suJMe9KoWHtuV4rRLy/bGdP1nr/iCQXgzzMaK5Vl3zjwveMGLm
+8o8IEKseiXhOIi6SylOIr7uXSISJDXMsp8ci3+/x5BxspObSabMYP4N/BmHyLS9B
+qRUaPnZXLkAtACJKoO3tFp8WRD8km0MIHxVwyWlt5VZ/O07SwR/aE5S00N90uTUi
+DZvLTdGf5oqFEpvbwwvtxlh+YGa21NTG5gr3jvhBUTPg9htaHXCjoVDOYk8CAwEA
+AaNDMEEwIAYDVR0RBBkwF4IVbnlhLWdlcnJpdC5pdHMudW11LnNlMB0GA1UdDgQW
+BBQFyI1JDTEsUquK39VeFpxYxsURZTANBgkqhkiG9w0BAQUFAAOCAQEAtPNFyjz3
+kCnoRXulU7Q0jCRLUwpprWXnf2dljDDdQWtsT+tGsVPsvkIOw2l8pCHtyk6H2xqs
+0NW5mg3DwveZfs6D2CSMCfjeR/snrFRkecWow+zAJ49Qhb/dzCgwT2HhcWNr/PlY
+Btpf6GrNXRBK32odHiayHphOlMzIjo8Rg3w5o5S4xFH/4njP3dE5yeS6npXBD61P
++Cd3DAHgCMRdOg9XdZFhV1FP/G1h4iBkwXYDGyMyQeVsx3TEmvgwWs/J1mCWXBCR
+t4sAFjL3EzEpVBBtvV7lMHO8Z+6Xqc7La0Auy6ZfZgovFyz919WkueKCdjGZXsJ3
+0PUBKN9pvQ4JWQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -90,19 +75,19 @@ xjIf5blaR7shDIsqWMix
<md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
<md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wisumstage.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
</md:EntityDescriptor>
diff --git a/swamid-2.0/play.mah.se-shibboleth.xml b/swamid-2.0/play.mah.se-shibboleth.xml
deleted file mode 100644
index dcf262f4..00000000
--- a/swamid-2.0/play.mah.se-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.mah.se/shibboleth">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://play.mah.se/Shibboleth.sso/DS/ds.sunet.se"/>
- <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://play.mah.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>play.mah.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=play.mah.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAJ52xKQD6ay3MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC3BsYXkubWFoLnNlMB4XDTEyMDgyOTE0MDMzN1oXDTIyMDgyNzE0MDMzN1ow
-FjEUMBIGA1UEAxMLcGxheS5tYWguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDrgam1nuLBzhYJobwHV+vg7uJwRgsO7E0xfWhq/SyAQtODUW0CXZHN
-s7C6O7e/AFiqpMyLOuPzKr7K2PClY1ShRIm3//GFAMpS2S90F6qwkl67q4jVD/pP
-4zUGRwS8OP6gkIMInFiXrEnzz6nYU+/GNdbmqBsj9/8uLdJYdAbkZnlQkbrpCCkp
-nHwy7GETegUGX3mG+/uu+ELRoc4ZcSZKRCheSDy+kk0QGnH+vP0FdBtM/7RCXuIb
-LHH0Hr2SdknlC5yCgRN3btHZ0d2v2srkkR+6VyyVz64b57Gl4+YY4+NRoH6gmmMD
-qSd698RS1Nl8lNAfE0rBQmEVkP0LT82BAgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Bs
-YXkubWFoLnNlhgtwbGF5Lm1haC5zZTAdBgNVHQ4EFgQUr1PVojxYdezL39aUSZKD
-uaLlcvQwDQYJKoZIhvcNAQEFBQADggEBAJckuU+nW3Sz01q4LQNBVyhFaoHmVu1e
-ZmkSK7NaBquwoYe1VvAgGc4c7iPjM11NVCR/TUfhCn/J97VeQ4JldUaA0yIFVpEw
-0787mKe6bY7MimHrdaQLd4NVL9t2cVgI3zh2cDIeAEcxymEw3plzQIgpFE2u+PAc
-a/NnrvrHXSzY2eLmtCmpqe7EIG8IWl0ehpuKEqYSBjtbQr2NF5iwwPigP5BnOrWn
-sCeIp6hryi9ispKWFrfqlxNblBAFlLAeDtDlcxDB3e45AHamq2QMEfy3ddu566sO
-mjNx3LBpLI4AqwE4TzvxzUkL5k5ZSpVzESJHvb9ljx3jnzEZuWZpH4A=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mah.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mah.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.mah.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mah.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mah.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.mah.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mah.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://play.mah.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mah.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://play.mah.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.mah.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.mah.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/play.mah.se.xml b/swamid-2.0/play.mah.se.xml
new file mode 100644
index 00000000..d563dd36
--- /dev/null
+++ b/swamid-2.0/play.mah.se.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://play.mah.se">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Malmö University Play service</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Malmö högskolas Play tjänst</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This is the Malmö University streaming service</mdui:Description>
+ <mdui:Description xml:lang="sv">Detta är Malmö högskolas play tjänst</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEEjCCAvqgAwIBAgIJAJDfatluVXscMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAnNlMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ4wDAYDVQQHFAVNYWxt9jEZMBcGA1UEChQQTWFsbfYgVW5pdmVyc2l0eTEUMBIGA1UEAxMLcGxheS5tYWguc2UwHhcNMTUxMDIxMDgzMzI5WhcNMjUxMDIwMDgzMzI5WjBjMQswCQYDVQQGEwJzZTETMBEGA1UECBMKU29tZS1TdGF0ZTEOMAwGA1UEBxQFTWFsbfYxGTAXBgNVBAoUEE1hbG32IFVuaXZlcnNpdHkxFDASBgNVBAMTC3BsYXkubWFoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qq/V00tBbzg5h3kverDzW1wg+2FJVvR1rXkALbCMPAS9vfKq66XmPjZMV0Cxsax8iLh5cmN5VTBY/bG7ITBKcj2UzTPssSSvQ0S+3E/hiVAXeJccC5v5g1qhqwzgrMHaPLpPxosNOllfWrYeRLexpvt4H5jI3Cf+oZ2d22QgHqGv6QbWFIP3RmKpEGVoJYjeZvlzbr+Z5t/5ASw63aZUvvyX4qd7n1TVMnk0lQb2lj14qRyoFzNOyM9am1ocfIHZE04VqbRQ0YT3Ll4Y1HzSu3HU01axKDCof5gtIbYvE442SFJG9F+JspJOAueVqmrPMiVC9kf1dYWRWefVmAp8QIDAQABo4HIMIHFMB0GA1UdDgQWBBQMJeN/USD/eVr7VtT9a+Z8d7oyTTCBlQYDVR0jBIGNMIGKgBQMJeN/USD/eVr7VtT9a+Z8d7oyTaFnpGUwYzELMAkGA1UEBhMCc2UxEzARBgNVBAgTClNvbWUtU3RhdGUxDjAMBgNVBAcUBU1hbG32MRkwFwYDVQQKFBBNYWxt9iBVbml2ZXJzaXR5MRQwEgYDVQQDEwtwbGF5Lm1haC5zZYIJAJDfatluVXscMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFsGTUKxKgAeo+nCP60eBkRLAD98siRERqx7BCkqbcjnRGk9jzeR1QQV9EkO2EAKrVdw8trjyRK6QWkiFyjGz7kTweQf6KSAq4uw5blOpoMqOLkqBdkaBIiwsBpAGJSYSlNKxpjMo4h55NlMbKzYWyaQbiBEHL/FKqAprN097T5KFDdK0JXzAAbiMqyHx260FEp4D3uNYUmKGa5PcAA4RGPNcWQO4ocenWryUABBTzUf8ZFFF843Yh/P3wdaK7fTOW3Xc6e+DGtQAAPAID7BFEQChwUdv9rV04L5ldsnzyQ7vAxjB4wzwCt0EKO82VOq/T4ypUldH/z9IjTcVxPfTuU=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEEjCCAvqgAwIBAgIJAJDfatluVXscMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAnNlMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ4wDAYDVQQHFAVNYWxt9jEZMBcGA1UEChQQTWFsbfYgVW5pdmVyc2l0eTEUMBIGA1UEAxMLcGxheS5tYWguc2UwHhcNMTUxMDIxMDgzMzI5WhcNMjUxMDIwMDgzMzI5WjBjMQswCQYDVQQGEwJzZTETMBEGA1UECBMKU29tZS1TdGF0ZTEOMAwGA1UEBxQFTWFsbfYxGTAXBgNVBAoUEE1hbG32IFVuaXZlcnNpdHkxFDASBgNVBAMTC3BsYXkubWFoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qq/V00tBbzg5h3kverDzW1wg+2FJVvR1rXkALbCMPAS9vfKq66XmPjZMV0Cxsax8iLh5cmN5VTBY/bG7ITBKcj2UzTPssSSvQ0S+3E/hiVAXeJccC5v5g1qhqwzgrMHaPLpPxosNOllfWrYeRLexpvt4H5jI3Cf+oZ2d22QgHqGv6QbWFIP3RmKpEGVoJYjeZvlzbr+Z5t/5ASw63aZUvvyX4qd7n1TVMnk0lQb2lj14qRyoFzNOyM9am1ocfIHZE04VqbRQ0YT3Ll4Y1HzSu3HU01axKDCof5gtIbYvE442SFJG9F+JspJOAueVqmrPMiVC9kf1dYWRWefVmAp8QIDAQABo4HIMIHFMB0GA1UdDgQWBBQMJeN/USD/eVr7VtT9a+Z8d7oyTTCBlQYDVR0jBIGNMIGKgBQMJeN/USD/eVr7VtT9a+Z8d7oyTaFnpGUwYzELMAkGA1UEBhMCc2UxEzARBgNVBAgTClNvbWUtU3RhdGUxDjAMBgNVBAcUBU1hbG32MRkwFwYDVQQKFBBNYWxt9iBVbml2ZXJzaXR5MRQwEgYDVQQDEwtwbGF5Lm1haC5zZYIJAJDfatluVXscMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFsGTUKxKgAeo+nCP60eBkRLAD98siRERqx7BCkqbcjnRGk9jzeR1QQV9EkO2EAKrVdw8trjyRK6QWkiFyjGz7kTweQf6KSAq4uw5blOpoMqOLkqBdkaBIiwsBpAGJSYSlNKxpjMo4h55NlMbKzYWyaQbiBEHL/FKqAprN097T5KFDdK0JXzAAbiMqyHx260FEp4D3uNYUmKGa5PcAA4RGPNcWQO4ocenWryUABBTzUf8ZFFF843Yh/P3wdaK7fTOW3Xc6e+DGtQAAPAID7BFEQChwUdv9rV04L5ldsnzyQ7vAxjB4wzwCt0EKO82VOq/T4ypUldH/z9IjTcVxPfTuU=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.mah.se/user/logout"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/user/authenticate" index="0"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">MAH (PROD)</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">MAH (PROD)</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">https://play.mah.se</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Administrator</md:SurName>
+ <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml
deleted file mode 100644
index 431387f5..00000000
--- a/swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://portal.cloud.ipnett.se/shibboleth">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAPKb4F2SRWHbMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMMFnBvcnRhbC5jbG91ZC5pcG5ldHQuc2UwHhcNMTUwMjEwMjA1OTU0WhcNMjYw
- MTIzMjA1OTU0WjAhMR8wHQYDVQQDDBZwb3J0YWwuY2xvdWQuaXBuZXR0LnNlMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzx+JkLQWyBizwwRD9RULQ2hk
- fKgukxwLM46rEtblLfIn6VFHSIT2Ff7Ssx4SEcp/FyOYb88fnyvTQphNCov7OhOh
- 9MfarL6GVkQvrkVgUXwoehPL4BEkwRFlY+GxP/u7GY4RZJHxQSG3jFllzFP3HCaG
- e1wuC4THzuJd4iaUopS9ZQF6s3dv8N/KhJxSs9AvjXl1Qa6zhGa/XoqNVXSvg5zX
- gGWNga9GUgM+aPiNQgmFNY4mR7hiUtwRghgizz/Y7xp+eCuSMXvgfevcS7+a9joH
- ZEa0RY4op92UuMwQnG3o6LSv3OYEVq5k3cGBbYpbMokMFOv0cQI13Pp9Ji6ZHwID
- AQABo1AwTjAdBgNVHQ4EFgQUbji6yOG+NcYePMoP0Yb6Un1l/WcwHwYDVR0jBBgw
- FoAUbji6yOG+NcYePMoP0Yb6Un1l/WcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
- AQUFAAOCAQEAjJMEkgrmXf2ZX2X6BuWabf3vVRhHn8NAOgWXdhyLUXHVeNTpwm4c
- Sfdm1dK6hNGXyGqhLPU3WP1nv93GdnM/ilb/9hcvzueBgGl6Lw7Jyy2vI2U8xm9H
- NoP4PzncPtyWY8G7Gc7OOIHoglHB4wEJwdyJQ5+P5psp6gO0ITq/qq5o337s0n+F
- CVIxRUNuvFC7IMaky2vJTezPBey4FDUwsEGcoeJpiqXmopfRdfxq0R0Ge0aajTEJ
- LTTy+ozNxeKkACigXyZrvk5+f1zlCFg+hKR7BNk2s0VSYm175E2PKzM2TcOuXEy+
- VAYvoweICMB1H3PYBRrj0QM/iwGY4CCfSQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAPKb4F2SRWHbMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMMFnBvcnRhbC5jbG91ZC5pcG5ldHQuc2UwHhcNMTUwMjEwMjA1OTU0WhcNMjYw
- MTIzMjA1OTU0WjAhMR8wHQYDVQQDDBZwb3J0YWwuY2xvdWQuaXBuZXR0LnNlMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzx+JkLQWyBizwwRD9RULQ2hk
- fKgukxwLM46rEtblLfIn6VFHSIT2Ff7Ssx4SEcp/FyOYb88fnyvTQphNCov7OhOh
- 9MfarL6GVkQvrkVgUXwoehPL4BEkwRFlY+GxP/u7GY4RZJHxQSG3jFllzFP3HCaG
- e1wuC4THzuJd4iaUopS9ZQF6s3dv8N/KhJxSs9AvjXl1Qa6zhGa/XoqNVXSvg5zX
- gGWNga9GUgM+aPiNQgmFNY4mR7hiUtwRghgizz/Y7xp+eCuSMXvgfevcS7+a9joH
- ZEa0RY4op92UuMwQnG3o6LSv3OYEVq5k3cGBbYpbMokMFOv0cQI13Pp9Ji6ZHwID
- AQABo1AwTjAdBgNVHQ4EFgQUbji6yOG+NcYePMoP0Yb6Un1l/WcwHwYDVR0jBBgw
- FoAUbji6yOG+NcYePMoP0Yb6Un1l/WcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
- AQUFAAOCAQEAjJMEkgrmXf2ZX2X6BuWabf3vVRhHn8NAOgWXdhyLUXHVeNTpwm4c
- Sfdm1dK6hNGXyGqhLPU3WP1nv93GdnM/ilb/9hcvzueBgGl6Lw7Jyy2vI2U8xm9H
- NoP4PzncPtyWY8G7Gc7OOIHoglHB4wEJwdyJQ5+P5psp6gO0ITq/qq5o337s0n+F
- CVIxRUNuvFC7IMaky2vJTezPBey4FDUwsEGcoeJpiqXmopfRdfxq0R0Ge0aajTEJ
- LTTy+ozNxeKkACigXyZrvk5+f1zlCFg+hKR7BNk2s0VSYm175E2PKzM2TcOuXEy+
- VAYvoweICMB1H3PYBRrj0QM/iwGY4CCfSQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.cloud.ipnett.se/Shibboleth.sso/Logout"/>
- <md:AssertionConsumerService Location="https://portal.cloud.ipnett.se/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
- <md:AttributeConsumingService index="1">
- <md:ServiceName xml:lang="en">IPnett Cloud Services Portal</md:ServiceName>
- <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
index 8706b1ee..4b963b74 100644
--- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -120,19 +120,19 @@ x7JUFw==</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>KTH Royal Institute of Technology</Company>
<SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
- <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+ <EmailAddress>mailto:ita-infra-saml-contact@kth.se</EmailAddress>
<TelephoneNumber>+46 8 790 6000</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>KTH Royal Institute of Technology</Company>
<SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
- <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+ <EmailAddress>mailto:ita-infra-saml-contact@kth.se</EmailAddress>
<TelephoneNumber>+46 8 790 6000</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>KTH Royal Institute of Technology</Company>
<SurName>KTH IT-Support</SurName>
- <EmailAddress>it-support@kth.se</EmailAddress>
+ <EmailAddress>mailto:it-support@kth.se</EmailAddress>
<TelephoneNumber>+46 8 790 6600</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/scalear-saml.herokuapp.com.xml b/swamid-2.0/scalear-saml.herokuapp.com.xml
index 45171085..aad4fddc 100644
--- a/swamid-2.0/scalear-saml.herokuapp.com.xml
+++ b/swamid-2.0/scalear-saml.herokuapp.com.xml
@@ -23,24 +23,9 @@
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>
- MIIC9jCCAd4CCQCbuMwbIA5oKjANBgkqhkiG9w0BAQUFADA9MQswCQYDVQQGEwJT
- RTESMBAGA1UECAwJU1RPQ0tIT0xNMRowGAYDVQQKDBFTQ0FMQUJMRSBMRUFSTklO
- RzAeFw0xMzA4MDUxMzU5MzRaFw0xNDA4MDUxMzU5MzRaMD0xCzAJBgNVBAYTAlNF
- MRIwEAYDVQQIDAlTVE9DS0hPTE0xGjAYBgNVBAoMEVNDQUxBQkxFIExFQVJOSU5H
- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr4s3tVzE06ScVYO6gJQr
- fE/9/qC0VlBeSqXQ+mjZu5erBdUSioqlksOSyLxK5mNgrPfTtMWpmyWzKqdltE+8
- gAlhHxpsHh/Q38yh5Bx7u2CXAm+HOJVmkRzXRN5jCf80sdZ0VgQbflCCQuKs7qB7
- YNWFZeDF8MQ40NlqJPrFpFz7bJ6oErqVF8Cfy3r4plJ3JDl4jfjh7LEbMHpZFacF
- 01P00Cbtebkivjz02Lxl/bPltTtJy2nCjdkDRmMbcPKUBDmOoGy2C+HDzQ/OjOnT
- guQ5AlZ23sZf/vEhIiP1MU3ZLzKYyv3CK3J3TdA1WaelzkTr2VHJ5yYEW6wPXPYn
- fwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB1TCLA5sftQMqG0khM9/BnNdMAnda4
- hhNaUI9L74/Jh+eu3W3Ie1kbsmUXiWgoMNdxtN93BOank7hzYnRqmfeTmkqMwa7i
- hHd0ZdqlPwYEua5k2VvnqTq+2UeBn9cluUxfQkYsYWmSVmkrd8VuP8Hg9bWGWriS
- UhJC+0CSwgyoyREsYnXbb6APHgOpAKFVlKHkfYtEl8bGmUc5+qKpwjq4wrYh+7Ns
- MxU+p7QniH545jzRpO7uYRPxVuGLH7K/X1Y+iJilXrLf063SW6iSRP8Nzqm4H9Z+
- gK/0Rduej0L14dVoSDGGpPNjXxfW0yG0d9khqKK8p4M9lxfD16ebiS9i
- </ds:X509Certificate>
+ <ds:X509Certificate>
+ MIIDaDCCAlACCQC2IjZvk/9exTANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU1RPQ0tIT0xNMRIwEAYDVQQHEwlTVE9DS0hPTE0xGjAYBgNVBAoTEVNDQUxBQkxFIExFQVJOSU5HMSMwIQYDVQQDExpzY2FsZWFyLXNhbWwuaGVyb2t1YXBwLmNvbTAeFw0xNTExMjQxMzU5NDhaFw0xNjExMjMxMzU5NDhaMHYxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTVE9DS0hPTE0xEjAQBgNVBAcTCVNUT0NLSE9MTTEaMBgGA1UEChMRU0NBTEFCTEUgTEVBUk5JTkcxIzAhBgNVBAMTGnNjYWxlYXItc2FtbC5oZXJva3VhcHAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9v8WIZwEs/bOIBj/26QY6bKmwMua9NRNGta7wskrx5ClPU8RclyhdLEMIXMDf1B3Rmq92naz+XUFSXZczsVjBSxjUCwjKSkDnC/3VfVvGfThXzLI1MPChneilTxrMu4LyhtOf3Jty4vICX5ef0TV2gI3W1ttuVkzykU1GWBVRITTeMNQm22auF5CCq8XkK+6IgdVqhjo5xvqz05UgAhLbuSEeqqEjpzyRAjrfpMKkzjVygu/Ee2fcEjcZt0tVnj1fpM9pDyMl05yWhGbIdFFE9R0edl5Zn82sUGdFmMqgl+DIBZTmyqidawzMlw921wMDoxzH+o4cGGyHNC0ob+uOwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB5fNFyQTG08NQot3k/vPgeAJRGVS5g+1AaaOASA1v7DyLjkKpHS2EU5XMzOZ65tchzfgbXjx9JhrIMwqOI5pxt1k4d6NnWL+GOgvhA/yRWT4YFahy+HSQERRRZuzdDHsrjSYSBg8QvZ7AUFDc4b9SHJeygZAST/12cyAJiwCfWPIwCadIQ/EabtEtEgHkoD6Wgo2wcsw2ck+rJ3NcBjlUYAtHw4b+kmDgdNjGlm1/zT2y9oO08VOvlWcpCn/4O1wUEq3julnnuz9dpDtyKtSC+znGJxKS3O2jvg4tkm+3ZsLw0m8tJU9nhCq+E5Y3BoiXhHz/v5eGQofoZ7U85CnkT
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
index e142e8fd..9895f89a 100644
--- a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shib-idp-1.oru.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">oru.se</shibmd:Scope>
@@ -94,19 +101,19 @@ Pz8R3A==</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>Örebro University</Company>
<SurName>IT Avdelningen</SurName>
- <EmailAddress>itsupport@oru.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
<TelephoneNumber>+46 19 303166</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Örebro University</Company>
<SurName>Jonny Ehrnberg</SurName>
- <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress>
+ <EmailAddress>mailto:jonny.ehrnberg@oru.se</EmailAddress>
<TelephoneNumber>+46 19 303851</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Örebro University</Company>
<SurName>IT Avdelningen Örebro universitet</SurName>
- <EmailAddress>itsupport@oru.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
<TelephoneNumber>+46 19 303166</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml b/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
index 2a12307d..0d381477 100644
--- a/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibb1.hj.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">hj.se</shibmd:Scope>
@@ -101,19 +108,19 @@ nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
<ContactPerson contactType="administrative">
<Company>Jönköping University</Company>
<SurName>Joakim Danielsson</SurName>
- <EmailAddress>Joakim.Danielsson@hj.se</EmailAddress>
+ <EmailAddress>mailto:Joakim.Danielsson@hj.se</EmailAddress>
<TelephoneNumber>+46 36 101116</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Jönköping University</Company>
<SurName>Stefan Kindh</SurName>
- <EmailAddress>Stefan.Kindh@hj.se</EmailAddress>
+ <EmailAddress>mailto:Stefan.Kindh@hj.se</EmailAddress>
<TelephoneNumber>+46 36 101170</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Jönköping University</Company>
<SurName>IT-Helpdesk</SurName>
- <EmailAddress>helpdesk@hj.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@hj.se</EmailAddress>
<TelephoneNumber>+46 36 101112</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
index 7293f8f5..813f3965 100644
--- a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibbo.ltu.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">ltu.se</shibmd:Scope>
@@ -97,19 +104,19 @@ B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
<ContactPerson contactType="administrative">
<Company>Lulea University of Technology</Company>
<SurName>LTU Servicedesk</SurName>
- <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+ <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
<TelephoneNumber>+46 920 491664</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Lulea University of Technology</Company>
<SurName>LTU Servicedesk</SurName>
- <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+ <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
<TelephoneNumber>+46 920 491664</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Lulea University of Technology</Company>
<SurName>LTU Servicedesk</SurName>
- <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+ <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
<TelephoneNumber>+46 920 491664</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
index 91fdcccb..4a0dae4e 100644
--- a/swamid-2.0/signon.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
@@ -103,19 +103,19 @@ CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
<ContactPerson contactType="administrative">
<Company>Halmstad University</Company>
<SurName>Magnus Morén</SurName>
- <EmailAddress>magnus.moren@hh.se</EmailAddress>
+ <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
<TelephoneNumber>+46 35 167383</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Halmstad University</Company>
<SurName>Magnus Morén</SurName>
- <EmailAddress>magnus.moren@hh.se</EmailAddress>
+ <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
<TelephoneNumber>+46 35 167383</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Halmstad University</Company>
<SurName>Helpdesk Högskloan i Halmstad</SurName>
- <EmailAddress>helpdesk@hh.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@hh.se</EmailAddress>
<TelephoneNumber>+35 167800</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
index c64ecf72..b6a64218 100644
--- a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://swamid2.shh.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">shh.se</shibmd:Scope>
@@ -96,19 +103,19 @@ URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>Sophiahemmet University</Company>
<SurName>Sophiahemmet IT</SurName>
- <EmailAddress>itsupport@sophiahemmet.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
<TelephoneNumber>+46 8 406 2525</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Sophiahemmet University</Company>
<SurName>Sophiahemmet IT</SurName>
- <EmailAddress>itsupport@sophiahemmet.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
<TelephoneNumber>+46 8 406 2525</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Sophiahemmet University</Company>
<SurName>Sophiahemmet IT</SurName>
- <EmailAddress>itsupport@sophiahemmet.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
<TelephoneNumber>+46 8 406 2525</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/ubas.lu.se-shibboleth.xml b/swamid-2.0/ubas.lu.se-shibboleth.xml
new file mode 100644
index 00000000..a5d91c79
--- /dev/null
+++ b/swamid-2.0/ubas.lu.se-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ubas.lu.se/shibboleth">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ubas.lu.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">uBAS / prod</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">uBAS / prod</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">uBAS och luBAS prod miljö, utbildningsplaner och Kursplaner</mdui:Description>
+ <mdui:Description xml:lang="en">uBAS and luBAS / prod</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>a0221.srv.lu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=a0221.srv.lu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJALmk3ZwQVxRiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2EwMjIxLnNydi5sdS5zZTAeFw0xNTEwMjMxMjQxMTJaFw0yNTEwMjAxMjQx
+MTJaMBoxGDAWBgNVBAMTD2EwMjIxLnNydi5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALMEarnwqXe8kt/rxhSLZtkr1GwLfuWjgef5N8i3d7Ad
+F8GLPjZjdJLh75SLQO+GTNbYnryGswU8DVBU/XivZcal/QBdRYO9f3PHay8OeHv6
+MFsA0/qiUxyVxLJOFpRifRTyLpt62C2b7D9YYFmGoncZ6wVIpasVgLDAEkt7VkOU
+ThF0C/McP0cw+Zx4U+g2m7mU+JUWeqpO4ulhCfyBnX7QRQeeMdpeQNynS0OI/OMf
+k55qeN3iNlALYeZ2ELB1Wi/fC1+CDu0jzB9v209imjey/rbDtxlc6sRPzqYOJBtc
+ytebidHGpXK6fDi92nhAAMya3sFOP/xgkWx/Ru+Bix0CAwEAAaM9MDswGgYDVR0R
+BBMwEYIPYTAyMjEuc3J2Lmx1LnNlMB0GA1UdDgQWBBQa/NllIFHzegFCZ7Pbif5T
+8ZaRoDANBgkqhkiG9w0BAQUFAAOCAQEAT7FA3HvLn2vSuUioHibLCTrJa8rQ6/5K
+vYCXokNham2LFKe84YP5Bqfk4+EUb/4H9qZcQstWZvlLmlAh4D/L44C881FRPBZP
+GwvOwHUMNk2EibBS5Jc+8mGvbfVpFnAW0qz49xwVRlT5T1VrWUTIhAK0R3pbwPNe
+i40tmy2XFzCW52SWL/KRWd1jM5sZIpJhJImvUU93aPYWVQtHtHKi3+iVkjXFYf60
+u21VH/EFiu9zEqiF00OIOqKPItb7pgRaWF9pf1OyAmh8t9I2FjTvUG42nLMJr62+
+/TMaULAeSfWUxSIBNwHBe8+L9YUMOs+i/HXubcZ46ffyOwOee1qn9A==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ubas.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ubas.lu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ubas.lu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ubas.lu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ubas.lu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ubas.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ubas.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ubas.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ubas.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ubas.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Martin</md:GivenName>
+ <md:SurName>Åhfeldt</md:SurName>
+ <md:EmailAddress>martin.ahfeldt@lu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/uraccess.net-shibboleth.xml b/swamid-2.0/uraccess.net-shibboleth.xml
new file mode 100644
index 00000000..bc1aff28
--- /dev/null
+++ b/swamid-2.0/uraccess.net-shibboleth.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uraccess.net/shibboleth">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uraccess.net/Shibboleth.sso/DS/ds.swamid.se"/>
+ <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://uraccess.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">UR access - Mediebiblioteket för högskolor och universitet.</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">UR access innehåller ca 18000 TV- och radioprogram från Utbildningsradion.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://uraccess.net/shibboleth</ds:KeyName>
+ <ds:KeyName>uraccess.net</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=uraccess.net</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAP6pqK7LD1xfMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDHVyYWNjZXNzLm5ldDAeFw0xNTEyMDgxMzQyMDVaFw0yNTEyMDUxMzQyMDVa
+MBcxFTATBgNVBAMTDHVyYWNjZXNzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAPL5dGUPusdwnwRW2S/M+fVgjAxGl9W41JLeHGrd3FRDiLxo47MX
+OLYI8qdzhts3z+G83htGlJI0Iowj6PKQx3xWPmCmFaA8y1Wpx2Y8FT7eJ277F5KL
+KIDoqgL78yubSwyl3sNgjNq0KJ+PHU1WirSwmiJV0dQfX5hc4Ca1UTkQ9H0T9QQL
+XpLF/tqpxJGGbceShZHi1W34pQqhYQaIxl+QhREAybQSMa0cnfXIoTOdgf/6eKCo
+5JoFWtXJMesgDji5R+2wXmbaKCVH5KDcd3pRqb0dKsdGfzaXdqbtTVwj0LezC+4v
+nV7WOn7+zb9GCIBvg1VBrSlOWHrIoqZM7dUCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
+dXJhY2Nlc3MubmV0hh9odHRwczovL3VyYWNjZXNzLm5ldC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBT3qHcAVqfrG19CM9/c1Jlf6/Tf6DANBgkqhkiG9w0BAQUFAAOCAQEA
+XdxT+SX0jtLPiAptvIDrrmc7eG20M/seqsPiIDmuJFeuw7k7vyG2rL6yEGpKVTyX
+BTM2wp9H6vC35z+R3O3c7GMP37LcJMHSwcCgQPWboIp/nxEGEGFwHPB0dUN5qvLR
+OQyxsrnkpOih7FXNtpHItLDGS8JDac4TRWE4x1b1r/B0t50TsXe3Pa6t/H/sGugT
+WA1u0ZsP4QtQfCFyJlIisLruEDEydRdT1UNUcbo6TsRW33G5rzAH9X6+D19LnFRg
+W/UOQjERpXGqmGI72CVn9Q8PXeKyVvIl7zaSzz9GLjJpQLdjkSWHW+qMH+7kbn4S
+RXmDTYIhHnjv+Sc7dzCbIA==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uraccess.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uraccess.net/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uraccess.net/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uraccess.net/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uraccess.net/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uraccess.net/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uraccess.net/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uraccess.net/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uraccess.net/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uraccess.net/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uraccess.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uraccess.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uraccess.net/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uraccess.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="support">
+ <md:EmailAddress>mailto:onsite@ur.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Michael</md:GivenName>
+ <md:SurName>Nilsson</md:SurName>
+ <md:EmailAddress>mailto:Michael.Nilsson@ur.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/urn-urkund-shibboleth-sp.xml b/swamid-2.0/urn-urkund-shibboleth-sp.xml
index 37a361bf..b3ffad65 100644
--- a/swamid-2.0/urn-urkund-shibboleth-sp.xml
+++ b/swamid-2.0/urn-urkund-shibboleth-sp.xml
@@ -83,20 +83,26 @@ gEln3A==
<md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/NIM/POST"/>
<md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/NIM/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/ECP" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.urkund.com/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.urkund.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">URKUND</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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:AttributeConsumingService>
</md:SPSSODescriptor>
<md:ContactPerson contactType="administrative">
<md:GivenName>Peter</md:GivenName>
<md:SurName>Witasp</md:SurName>
- <md:EmailAddress>peter.witasp@prioinfo.se</md:EmailAddress>
+ <md:EmailAddress>mailto:peter.witasp@prioinfo.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Samuel</md:GivenName>
<md:SurName>Otter</md:SurName>
- <md:EmailAddress>samuel@onposition.com</md:EmailAddress>
+ <md:EmailAddress>mailto:samuel@onposition.com</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/vartuppdrag.se.xml b/swamid-2.0/vartuppdrag.se.xml
new file mode 100644
index 00000000..ec8cd7c9
--- /dev/null
+++ b/swamid-2.0/vartuppdrag.se.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vartuppdrag.se">
+ <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" 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="sv">Vårt uppdrag - Webbutbildning från Learnways</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Vårt uppdrag - Webbutbildning från Learnways</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Utbildningsportal för studenter på Göteborg, Malmö and Uppsala Universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Online education portal for university students at Göteborg, Malmö and Uppsala University
+ </mdui:Description>
+ <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="sv">https://vartuppdrag.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://vartuppdrag.se</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC/DCCAmWgAwIBAgIJAMcQQq6rmwVQMA0GCSqGSIb3DQEBCwUAMIGVMQswCQYD
+ VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
+ EjAQBgNVBAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxFzAVBgNVBAMMDnZhcnR1
+ cHBkcmFnLnNlMSQwIgYJKoZIhvcNAQkBFhVmcmVkcmlrQGxlYXJud2F5cy5jb20w
+ IBcNMTYwMTEzMDgzMjE4WhgPMjI4OTEwMjgwODMyMThaMIGVMQswCQYDVQQGEwJT
+ RTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xEjAQBgNV
+ BAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxFzAVBgNVBAMMDnZhcnR1cHBkcmFn
+ LnNlMSQwIgYJKoZIhvcNAQkBFhVmcmVkcmlrQGxlYXJud2F5cy5jb20wgZ8wDQYJ
+ KoZIhvcNAQEBBQADgY0AMIGJAoGBAN6CRfi7tSIbXTXKbUrtIclwO48aWh4sNMkH
+ qHbc4tBZG3wLUl+UV+mxgIt7rmkOldTrQzhyIfncek8+9L2Oc1Ekc9xg8OPtAqgj
+ 2Zb71kL0tK4mheGuHIhRAvMhhyWrTXjmAVdYSiSsUeKiKfFKto/MsCP6pFklyIK1
+ VBgVVQJDAgMBAAGjUDBOMB0GA1UdDgQWBBTdXMeQ0FNPyqyLMt/MoLf689s6BDAf
+ BgNVHSMEGDAWgBTdXMeQ0FNPyqyLMt/MoLf689s6BDAMBgNVHRMEBTADAQH/MA0G
+ CSqGSIb3DQEBCwUAA4GBAJXVENigo8BIrlvDLyhaByEQK+RukwSUh2QqXNVEsA+2
+ vNDD4Soa8JW4kdqtX2VCkYttcSolTNqBbt+ZO3yx6iZPEUPVLvP8taaKU9WeBiTk
+ k3K/qjSaDJC/Pwhxf9fuWZd70hCKDeTFiatSqUCmiCVxMVdJ572aAsCAxWESI3/0
+ </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>
+ MIIC/DCCAmWgAwIBAgIJAMcQQq6rmwVQMA0GCSqGSIb3DQEBCwUAMIGVMQswCQYD
+ VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
+ EjAQBgNVBAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxFzAVBgNVBAMMDnZhcnR1
+ cHBkcmFnLnNlMSQwIgYJKoZIhvcNAQkBFhVmcmVkcmlrQGxlYXJud2F5cy5jb20w
+ IBcNMTYwMTEzMDgzMjE4WhgPMjI4OTEwMjgwODMyMThaMIGVMQswCQYDVQQGEwJT
+ RTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xEjAQBgNV
+ BAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxFzAVBgNVBAMMDnZhcnR1cHBkcmFn
+ LnNlMSQwIgYJKoZIhvcNAQkBFhVmcmVkcmlrQGxlYXJud2F5cy5jb20wgZ8wDQYJ
+ KoZIhvcNAQEBBQADgY0AMIGJAoGBAN6CRfi7tSIbXTXKbUrtIclwO48aWh4sNMkH
+ qHbc4tBZG3wLUl+UV+mxgIt7rmkOldTrQzhyIfncek8+9L2Oc1Ekc9xg8OPtAqgj
+ 2Zb71kL0tK4mheGuHIhRAvMhhyWrTXjmAVdYSiSsUeKiKfFKto/MsCP6pFklyIK1
+ VBgVVQJDAgMBAAGjUDBOMB0GA1UdDgQWBBTdXMeQ0FNPyqyLMt/MoLf689s6BDAf
+ BgNVHSMEGDAWgBTdXMeQ0FNPyqyLMt/MoLf689s6BDAMBgNVHRMEBTADAQH/MA0G
+ CSqGSIb3DQEBCwUAA4GBAJXVENigo8BIrlvDLyhaByEQK+RukwSUh2QqXNVEsA+2
+ vNDD4Soa8JW4kdqtX2VCkYttcSolTNqBbt+ZO3yx6iZPEUPVLvP8taaKU9WeBiTk
+ k3K/qjSaDJC/Pwhxf9fuWZd70hCKDeTFiatSqUCmiCVxMVdJ572aAsCAxWESI3/0
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://vartuppdrag.se/saml2/slo"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://vartuppdrag.se/saml2/acs" index="1"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Fredrik</md:GivenName>
+ <md:SurName>Croneborg</md:SurName>
+ <md:EmailAddress>mailto:fredrik@learnways.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml b/swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml
new file mode 100644
index 00000000..002d00fc
--- /dev/null
+++ b/swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vfu-portfolio-dev.su.se/Shibboleth.sso">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF" index="1"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/wavelan"/>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SWAMID"/>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/SWAMID" index="3"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/guest-idp.it.su.se"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/skolfederation-trial-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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/skolfederation-trial-ds" index="4"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">VFU-portfolio development environment</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">VFU-portfolio utvecklingsmiljlö</mdui:DisplayName>
+ <mdui:Description xml:lang="en">VFU-portfolio development environment, Stockholm University</mdui:Description>
+ <mdui:Description xml:lang="sv">VFU-portfolio utvecklingsmiljlö, Stockholms univsersitet</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>vfuportfolio-dev-app01</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=vfuportfolio-dev-app01</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDCTCCAfGgAwIBAgIJAIpnqZkjKutaMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFnZmdXBvcnRmb2xpby1kZXYtYXBwMDEwHhcNMTUxMDI4MTEzNDM1WhcNMjUx
+MDI1MTEzNDM1WjAhMR8wHQYDVQQDExZ2ZnVwb3J0Zm9saW8tZGV2LWFwcDAxMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyqtR4ajOqkqjqVBkiwxeHdbz
+Aw48lzKxVsKeGCMhnJJBbx9GLM2B9ZmmrlQEsbU7e7HUl0vVO8UwCoekLu+Wx9UY
+c/P0zsSLVH3xK8iJyQOObaoyMOrjwzKGytuAskojxr6b63GGS1B0z9e2P5tU1+JM
+tN61YtV5D6EgC8j1rRI93G6KCmUIbJelFALwaqCSSvxBfMOAw4jkW9mdOr7QeE28
+Bl/RH+EF4lGA8aS5oALFFme+VBMXtcwA2iSFRg7/g7KF4pUF5qRvvus37T5E+yCm
+QuM98fKvx5B27RTOy6SpKTYEzjNQV0im9x1NOp5qE1Rhf9UkWr+ywinSIk5FLwID
+AQABo0QwQjAhBgNVHREEGjAYghZ2ZnVwb3J0Zm9saW8tZGV2LWFwcDAxMB0GA1Ud
+DgQWBBQ5cBe7i06BVSpUeAChZXD4RvL9GDANBgkqhkiG9w0BAQUFAAOCAQEAK0s9
+x9TH1kkJ4lTzLo9kPzBwAgBURAB3yeHmVvH1jlAL55/Kd3qDAvoKKoaWoT+XR7oK
+bcc/9Mfd+c0zWbRaAqag2f53mfdTMU5z5Y919QTaRagYlQmbf7J5aXu95d7PUiCs
+VnwaC9gspgB3nvRKGjPwi9fpDD8dm2V/H73XJ/gEgGF0r8raIZ/cuu2Z8fJST+YW
+kfn2egpShxYbM7RcP3zi25R77Wwtr0ejZGPOP7hxoKok+iaIu99w62Krz7v6V2ef
+H6Kc4jFZ/hhFnKHQp8NlxDR99dktJ0dJJaVl127OX5bwImTA6PrkLGjfisOPKtyO
+uyXS7c6QGBaTTZ+M4g==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML2/ECP" index="9"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
index 9aae47fb..1a5ab5b5 100644
--- a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://vmidgw3.miun.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </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">miun.se</shibmd:Scope>
@@ -102,19 +109,19 @@ I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
<ContactPerson contactType="administrative">
<Company>Mid Sweden University</Company>
<SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</SurName>
- <EmailAddress>SystemDriftIT@miun.se</EmailAddress>
+ <EmailAddress>mailto:SystemDriftIT@miun.se</EmailAddress>
<TelephoneNumber>+46 771 975 000</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Mid Sweden University</Company>
<SurName>Ove Olander</SurName>
- <EmailAddress>Ove.Olander@miun.se</EmailAddress>
+ <EmailAddress>mailto:Ove.Olander@miun.se</EmailAddress>
<TelephoneNumber>+46 63 165787</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Mid Sweden University</Company>
<SurName>IT Helpdesk</SurName>
- <EmailAddress>helpdesk@miun.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@miun.se</EmailAddress>
<TelephoneNumber>+46 771 976130</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/webinar.nordu.net-shibboleth.xml b/swamid-2.0/webinar.nordu.net-shibboleth.xml
index a5e63a07..f74cd1e6 100644
--- a/swamid-2.0/webinar.nordu.net-shibboleth.xml
+++ b/swamid-2.0/webinar.nordu.net-shibboleth.xml
@@ -81,6 +81,6 @@ euZKcqmem+nEk8ZZsFxhsTwGLzwlgA+2TEJnP3AeRTiPLzvbYTUprgL0gKt7pg==
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>NORDUnet NOC</md:Company>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
new file mode 100644
index 00000000..7d46eda0
--- /dev/null
+++ b/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://weblogin-test.kau.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Karlstads universitet Shib 3 Test</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Karlstad University Shib 3 Test</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Shib 3 Test Identity Provider för Karlstads universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Shib 3 Test Identity Provider for Karlstad University</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
+ <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+ <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+ <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
+ <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:DomainHint>kau.se</mdui:DomainHint>
+ <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
+ <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
+ <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
+ <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
+ <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUSXSkW5Pmi6pOuwXzCEYchUZqWhgwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMTE0MTMx
+MjM1WhcNMzYwMTE0MTMxMjM1WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAInK5hGbL7MF0/fE
+oT8C0jAMXJ9olwHKOMX6E9wgOlN64XKdk+63wCdUsiybx1sZ+g4tjEp0k56C5Ayl
+l3B9qPKCXWwUVxJaASTDRlYivaa53REvnDe9475UNWPqjE16T6a12lMVi1J79QKu
+6egbQkPu4WVgc3yYrqwEwk5yzT4h4Mq3zI2rHl+skL1wdidnQIHQ9hu+/qjX39wv
+GGEqqgKuhyjV0rW//O2Dap6iEBptD2y9k9nIp59mKlxqnvNT3ueqxQoc5KEW/rfX
+Pox7k23LD1it28gwnFCZK5E4pLcj46UQpeGEGCNtset0ttSgYWOaM34V2mun0HLu
+gaMrBwsCAwEAAaNvMG0wHQYDVR0OBBYEFLGVhSRl725AJFfC5+TKX8FIuTH3MEwG
+A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
+LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA5
+Klfv9ceNzr0eQndNSlwljYNtRZFCFQvFv7zMTOFmHe2RbNIZbEt1+OWRvU3HEyBE
+rEnchz5+oUvsyw+PX7K78S84WJR9hETFY1bF62Z+XAv2C9adZhj3tVnO3Y2BtmLz
+NnlF0FiNJLpgj7b4IJb3WnZtEhciJtC2f6uXDuE/cLVmgm5N/ywjSfRpAOQXHGwn
+Hfo2ht6aM+SbWsE8K7lbet+6WAYUCRZj0UhrHK9wdmCgwW/8OewzcYE0pLrdO47Z
+2IkRMEEX/4/GQOFWR1I4Hx+Ymc5+XPh8vAjNDhDwdQp64dKmhH6T4DFfDzC7ec8r
+WuEmUtd0NS+CJ1HfNOJk
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUZOboZRw8HRg/KYiXfK01oXfrIyowDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMTE0MTMx
+MjM1WhcNMzYwMTE0MTMxMjM1WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnOED+DHev8lyyF
+DCK8h9+Jpxq5H//RAgizBqcBB0DBmloqxmMDwMMzk5Fzl++Lqqj2bk4xlfX4iTLE
+5t/12mhpqJ40e6HdKPwsdEtu3W2J2trORdRCDDWUTQOiv+BM+oYUgJ+XN/9/KzFO
+TwgRmAv49cVOv1GclM4+x9VerGaU7xZHcjiJcabn17NIhti4SvX5fs6L8uA4TNJr
+QEgA3HPndt8Q6LqErFpuqB4U+ocseIBaqEuQ1FLxHVD8gvMPMQ8Ry3t3jFU7h3Gu
+TGH5as2gDHaWlv3RLXRE/1AtH6Es4AaM1+m6Ztro08a2W+hZNPhim8yWHM1LdWDK
+sZ3dA+sCAwEAAaNvMG0wHQYDVR0OBBYEFJJXL1w6f86QJ1ORluo2cm8Baq7FMEwG
+A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
+LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBG
+f6a4wW73lVZ09c+eZiDNbexOZ0tAxuCGnPJHiLyEf0rUhT57yjo+GlYacVLXULx1
+aS6LcvTi6brdjFX/2lVPJImTSJwomyaJ7Kfe/aNVR8m+lR0hAGMX/bS0qhAu8nl+
+RV+fFxF8ZiNloEz2xLRiLHu0+NLkkptK4t2ivTynDJ3F59iJoKbB3l+E4h5S3mmP
+wr7nxygZucPvCIrual+5K5gFsG+fOo0nQGSGbytB9cpVp6NkAUVmnanRmiwGNYBp
+aZ1kL23AYl88Ga4yLILIdrZMjnpdUhfoQeYr8eMhCRoge1AkxLLaw+AqYb3HaAPA
++R2fxhug1hpz9+ReK+SO
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAJoZmyB+FgEHsWvGmmGB2KbFg8YSMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFHdlYmxvZ2luLXRlc3Qua2F1LnNlMB4XDTE2MDExNDEz
+MTIzNVoXDTM2MDExNDEzMTIzNVowHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5r
+YXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKXexZy1wueXvH
+SriX7QdFQpV70US0oPNXASknn13PoWFhLeys+OJ/bQppjpTqJmkobvBfHnJc2j9Y
+drfciY8YP1M/VflemZKRdp+fiPGiIeG1c4VagQ0Tec+M5E/SIpwU+V8t10DKMj14
+JREVwed2j8exSDpKRbWzjz5xaiisn9Q7iXEc0l81wFR+LjbGXuLc/R5j0LTwTDHS
+FWwtJicyT1F0DRKa9UHgwZucB/n969935Frol1iOqLLU+4+K9zFfiGtp6f9mGzfS
+1fGPwhnWa8LP1Hynw/7V5T53K16/R8NuDWXGfe1Gvx5aysr79uVZZqjohw6y9xzh
+SwF7aaTFAgMBAAGjbzBtMB0GA1UdDgQWBBTuVfBxeo4VvLYwqkA1yVVg2w1UATBM
+BgNVHREERTBDghR3ZWJsb2dpbi10ZXN0LmthdS5zZYYraHR0cHM6Ly93ZWJsb2dp
+bi10ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+aRs+oLvADtbLjiyelKShMQcNA4dxsjmBd2xFA0hWLChc8vDxS6ObelzrR84d3JLy
+sdeCIZkKJno81l2mjnfaNw16sObMxJWhlIPdeQdT5p22ovpXc7NS0L1hZybDxt+x
+sLrfaHLRWGKy+tXFA+AZmDTWzW1HF4h885JV5R3wDnfr2wrR8CPlu2bdNll0AcI0
+fuYMpZ7edLcYBs7AplQmM/RL7e/n+uIYi+zXb1ca2xYoARbajGCBz3P1EwyZEfja
+e/evXJMbiIGvPtOZBVVEYBkKGVEFL7EJqVze69yPl0Qs5l/ipKCjPQ9QEmmSl1l8
+ewZLjPlUe6rZSSKXDoC3Pw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin-test.kau.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin-test.kau.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin-test.kau.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUSXSkW5Pmi6pOuwXzCEYchUZqWhgwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMTE0MTMx
+MjM1WhcNMzYwMTE0MTMxMjM1WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAInK5hGbL7MF0/fE
+oT8C0jAMXJ9olwHKOMX6E9wgOlN64XKdk+63wCdUsiybx1sZ+g4tjEp0k56C5Ayl
+l3B9qPKCXWwUVxJaASTDRlYivaa53REvnDe9475UNWPqjE16T6a12lMVi1J79QKu
+6egbQkPu4WVgc3yYrqwEwk5yzT4h4Mq3zI2rHl+skL1wdidnQIHQ9hu+/qjX39wv
+GGEqqgKuhyjV0rW//O2Dap6iEBptD2y9k9nIp59mKlxqnvNT3ueqxQoc5KEW/rfX
+Pox7k23LD1it28gwnFCZK5E4pLcj46UQpeGEGCNtset0ttSgYWOaM34V2mun0HLu
+gaMrBwsCAwEAAaNvMG0wHQYDVR0OBBYEFLGVhSRl725AJFfC5+TKX8FIuTH3MEwG
+A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
+LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA5
+Klfv9ceNzr0eQndNSlwljYNtRZFCFQvFv7zMTOFmHe2RbNIZbEt1+OWRvU3HEyBE
+rEnchz5+oUvsyw+PX7K78S84WJR9hETFY1bF62Z+XAv2C9adZhj3tVnO3Y2BtmLz
+NnlF0FiNJLpgj7b4IJb3WnZtEhciJtC2f6uXDuE/cLVmgm5N/ywjSfRpAOQXHGwn
+Hfo2ht6aM+SbWsE8K7lbet+6WAYUCRZj0UhrHK9wdmCgwW/8OewzcYE0pLrdO47Z
+2IkRMEEX/4/GQOFWR1I4Hx+Ymc5+XPh8vAjNDhDwdQp64dKmhH6T4DFfDzC7ec8r
+WuEmUtd0NS+CJ1HfNOJk
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUZOboZRw8HRg/KYiXfK01oXfrIyowDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMTE0MTMx
+MjM1WhcNMzYwMTE0MTMxMjM1WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnOED+DHev8lyyF
+DCK8h9+Jpxq5H//RAgizBqcBB0DBmloqxmMDwMMzk5Fzl++Lqqj2bk4xlfX4iTLE
+5t/12mhpqJ40e6HdKPwsdEtu3W2J2trORdRCDDWUTQOiv+BM+oYUgJ+XN/9/KzFO
+TwgRmAv49cVOv1GclM4+x9VerGaU7xZHcjiJcabn17NIhti4SvX5fs6L8uA4TNJr
+QEgA3HPndt8Q6LqErFpuqB4U+ocseIBaqEuQ1FLxHVD8gvMPMQ8Ry3t3jFU7h3Gu
+TGH5as2gDHaWlv3RLXRE/1AtH6Es4AaM1+m6Ztro08a2W+hZNPhim8yWHM1LdWDK
+sZ3dA+sCAwEAAaNvMG0wHQYDVR0OBBYEFJJXL1w6f86QJ1ORluo2cm8Baq7FMEwG
+A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
+LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBG
+f6a4wW73lVZ09c+eZiDNbexOZ0tAxuCGnPJHiLyEf0rUhT57yjo+GlYacVLXULx1
+aS6LcvTi6brdjFX/2lVPJImTSJwomyaJ7Kfe/aNVR8m+lR0hAGMX/bS0qhAu8nl+
+RV+fFxF8ZiNloEz2xLRiLHu0+NLkkptK4t2ivTynDJ3F59iJoKbB3l+E4h5S3mmP
+wr7nxygZucPvCIrual+5K5gFsG+fOo0nQGSGbytB9cpVp6NkAUVmnanRmiwGNYBp
+aZ1kL23AYl88Ga4yLILIdrZMjnpdUhfoQeYr8eMhCRoge1AkxLLaw+AqYb3HaAPA
++R2fxhug1hpz9+ReK+SO
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAJoZmyB+FgEHsWvGmmGB2KbFg8YSMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFHdlYmxvZ2luLXRlc3Qua2F1LnNlMB4XDTE2MDExNDEz
+MTIzNVoXDTM2MDExNDEzMTIzNVowHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5r
+YXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKXexZy1wueXvH
+SriX7QdFQpV70US0oPNXASknn13PoWFhLeys+OJ/bQppjpTqJmkobvBfHnJc2j9Y
+drfciY8YP1M/VflemZKRdp+fiPGiIeG1c4VagQ0Tec+M5E/SIpwU+V8t10DKMj14
+JREVwed2j8exSDpKRbWzjz5xaiisn9Q7iXEc0l81wFR+LjbGXuLc/R5j0LTwTDHS
+FWwtJicyT1F0DRKa9UHgwZucB/n969935Frol1iOqLLU+4+K9zFfiGtp6f9mGzfS
+1fGPwhnWa8LP1Hynw/7V5T53K16/R8NuDWXGfe1Gvx5aysr79uVZZqjohw6y9xzh
+SwF7aaTFAgMBAAGjbzBtMB0GA1UdDgQWBBTuVfBxeo4VvLYwqkA1yVVg2w1UATBM
+BgNVHREERTBDghR3ZWJsb2dpbi10ZXN0LmthdS5zZYYraHR0cHM6Ly93ZWJsb2dp
+bi10ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+aRs+oLvADtbLjiyelKShMQcNA4dxsjmBd2xFA0hWLChc8vDxS6ObelzrR84d3JLy
+sdeCIZkKJno81l2mjnfaNw16sObMxJWhlIPdeQdT5p22ovpXc7NS0L1hZybDxt+x
+sLrfaHLRWGKy+tXFA+AZmDTWzW1HF4h885JV5R3wDnfr2wrR8CPlu2bdNll0AcI0
+fuYMpZ7edLcYBs7AplQmM/RL7e/n+uIYi+zXb1ca2xYoARbajGCBz3P1EwyZEfja
+e/evXJMbiIGvPtOZBVVEYBkKGVEFL7EJqVze69yPl0Qs5l/ipKCjPQ9QEmmSl1l8
+ewZLjPlUe6rZSSKXDoC3Pw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
+ <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">KAU</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Karlstads universitet Shib 3 Test</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Karlstad University Shib 3 Test</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <Company>Karlstad University</Company>
+ <SurName>IT-avdelningen</SurName>
+ <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
+ <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <Company>Karlstad University</Company>
+ <SurName>Paul Scott</SurName>
+ <EmailAddress>mailto:paul.scott@kau.se</EmailAddress>
+ <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <Company>Karlstad University</Company>
+ <SurName>IT-avdelningen Karlstads universitet</SurName>
+ <EmailAddress>mailto:datasupport@kau.se</EmailAddress>
+ <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
index 12e9fc74..2a4c4ff8 100644
--- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -2,6 +2,9 @@
<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://weblogin.uu.se/idp/shibboleth">
<Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
<samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
<samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
<samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
@@ -119,17 +122,17 @@ MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
<ContactPerson contactType="administrative">
<Company>Uppsala University</Company>
<SurName>SAML2 admins</SurName>
- <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+ <EmailAddress>mailto:akka-datordrift@its.uu.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Uppsala University</Company>
<SurName>SAML2 admins</SurName>
- <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+ <EmailAddress>mailto:akka-datordrift@its.uu.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Uppsala universitet</Company>
<SurName>IT Servicedesk</SurName>
- <EmailAddress>helpdesk@uu.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@uu.se</EmailAddress>
<TelephoneNumber>+46 18 4714400</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
new file mode 100644
index 00000000..aa524dbc
--- /dev/null
+++ b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://webproxysrv.uniarts.se/adfs/services/trust">
+ <Extensions>
+ <shibmd:Scope regexp="false">uniarts.se</shibmd:Scope>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">uniarts.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Stockholms konstnärliga högskola</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Stockholm University of the Arts</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för uniarts.se.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for uniarts.se.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://uniarts.se/om-skh</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.uniarts.se/english/about-uniarts</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="encryption">
+ <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+ <X509Data>
+ <X509Certificate>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</X509Certificate>
+ </X509Data>
+ </KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+ <X509Data>
+ <X509Certificate>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</X509Certificate>
+ </X509Data>
+ </KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en-US">Stockholms konstnärliga högskola</OrganizationName>
+ <OrganizationDisplayName xml:lang="en-US">Stockholms konstnärliga högskola</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en-US">http://www.uniarts.se/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Lars</GivenName>
+ <SurName>Lind</SurName>
+ <EmailAddress>mailto:itsupport@uniarts.se</EmailAddress>
+ <TelephoneNumber>+46(0)849400220</TelephoneNumber>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..a19a0648
--- /dev/null
+++ b/swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cvt.uppfoljning.ladok.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok www.env.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok www.env.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+ <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+ <mdui:Logo height="64" width="64">https://www.env.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.cvt.uppfoljning.ladok.se/gui-sp</ds:KeyName>
+ <ds:KeyName>www.cvt.uppfoljning.ladok.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.cvt.uppfoljning.ladok.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAJiQ6Y4LQA2rMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHHd3dy5jdnQudXBwZm9sam5pbmcubGFkb2suc2UwHhcNMTUxMDIyMTMyODM1
+WhcNMjUxMDE5MTMyODM1WjAnMSUwIwYDVQQDExx3d3cuY3Z0LnVwcGZvbGpuaW5n
+LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1HEGTRbi
+gDbH0FVYPs6k4lKZ5MxM3nxAoSXcRDVizojNNzlsiy9VhqpUZyhJS3PWTd4ORII+
+PZxvApKOGMuIV4HElXfeX7YGm/v4KdXro2Sk5U5KVNzfg43Snb7oRS3pq9km2Uzr
+BmxiMwVxbzROnSfePal1wRyXqQwQJOXTLqLm9XBFC1Z3autwVLvn1YQ8t/c21QK8
+HeoxGGQAlf5IlsetiXNoJH714+ovpsbnlpZB9ZEU8gF+E2j/igGA1YxfcKNbusBi
+Ks6olO37lwb0kmULooqEwVIQRXfncOzx/O8QJI9FJWrHQlFmzFre6TAQ/iSVByb6
+rSPw0PXKNzyKYwIDAQABo3cwdTBUBgNVHREETTBLghx3d3cuY3Z0LnVwcGZvbGpu
+aW5nLmxhZG9rLnNlhitodHRwczovL3d3dy5jdnQudXBwZm9sam5pbmcubGFkb2su
+c2UvZ3VpLXNwMB0GA1UdDgQWBBRqHw1wOSeUjkz37X5oJtxCZwq3MDANBgkqhkiG
+9w0BAQUFAAOCAQEAVCyTPqAjAYrbO0t9nj/Vma1hbF2Y2rgBpjQDuSOIPuiFNjgw
+l6QVMhxbroL5FcWnYQ5eJAHGMgs7THDKvEs7lLo8hReyA/gyhtv+wnWw75Zdf7G3
+W5EKt6m0g4T0I6vLykleVx5iGcGGWWUKqBcqOEdEtVSnThPo6+qfGNa0+wAU+wYk
+dcRieDbdpuiP1i98Q6xHyHdufBFWypbxd7ay7/978uHhrMt06zgvBqcN0c6vDAEn
+JN8DBjzaLWDIVRmzVzcl/0rdt5hrTbdsWzWr06BNOXjapzJ+YlQ7efSLJDGlyeek
+Amc24v5TLThVrOsV13FA5SIl4sa5rwDvh3WoSw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.egencia.com-auth-v1.xml b/swamid-2.0/www.egencia.com-auth-v1.xml
index e98e3242..57dcc6ed 100644
--- a/swamid-2.0/www.egencia.com-auth-v1.xml
+++ b/swamid-2.0/www.egencia.com-auth-v1.xml
@@ -25,47 +25,65 @@
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIDXTCCAkWgAwIBAgIEEcjjOjANBgkqhkiG9w0BAQsFADBfMQswCQYDVQQGEwJJTjELMAkGA1UE
-CBMCSFIxEDAOBgNVBAcTB0d1cmdhb24xEDAOBgNVBAoTB2VnZW5jaWExDTALBgNVBAsTBGF1dGgx
-EDAOBgNVBAMTB2VnZW5jaWEwHhcNMTQxMTI1MTMwOTQ3WhcNMTUxMTIwMTMwOTQ3WjBfMQswCQYD
-VQQGEwJJTjELMAkGA1UECBMCSFIxEDAOBgNVBAcTB0d1cmdhb24xEDAOBgNVBAoTB2VnZW5jaWEx
-DTALBgNVBAsTBGF1dGgxEDAOBgNVBAMTB2VnZW5jaWEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCy0EBPrwy8d/T+rlv2hZNxQmcLdk7ewruvjiw3P/1cSo1bJtFEwZrAXERHQPX/DaEX
-y8KL/diYW+fpaalyHJTQLjY4IqDRMPfhleVXqX862y9k46k7ioL/qv11ZtrO9JrecDXqm/twFLL3
-d3GJXz/Qf5AfNvM+a7wny1ZmYNyuXKHWIqWGzHpqTomjtlGE2VrBqC4DtvcEruZ0+CdqqA2Qmwrm
-BSxB/LlLqHuB19DeUbVt0pa0o5oxwbYLBtRH6PUYxBe0i2A3HC/QkxZil5YdD3MHqB3KRdobUdHp
-3Z9QgWwJJ19bZ4gJWYPfTlMXcGVhKR3Vcfrc7jw294H2X9TbAgMBAAGjITAfMB0GA1UdDgQWBBQj
-cVN/E+c2EzvzoZV8vBzJxzUUUzANBgkqhkiG9w0BAQsFAAOCAQEAaBll99MmA2Q4/dE7Q4f3kc+3
-GFqMwrTJokFb2yjafo4+fs+tRbCQi/P2eY7XkEFTWuZGJfDigKGhLINIpMkMd1RHt1iEyYfuZXXC
-uJBQTfSmha6dXceABAD+amTU5BWlNywpdGi8ajp8+Ytq0C+pO7MldDip+7vMS3LhoDHiQlubl2KL
-ob6x0KGydwxsMBN7ETIChkm/def8Edtlmzs3MR63XeB77EgVeb62Be+48Fn/+gLJVromH3TMpN5j
-I6vDyy0Eq6Q8eTv+UR99ax3vBFPfG9qg8jp5aruWeQS3IMyzSbpDQ30nNJl1QIiIYvhS+dVRjFHC
-agvcqwPGk8MYTg==</ds:X509Certificate>
+ <ds:X509Certificate>MIIFLTCCBBWgAwIBAgIMDVCG8gAAAABQ1dX0MA0GCSqGSIb3DQEBCwUAMIG6MQswCQYDVQQGEwJV
+UzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9s
+ZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g
+TDFLMB4XDTE1MTAyNjIxMDQxMFoXDTE4MTAyNTIxMzQwOFowZzELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCldhc2hpbmd0b24xETAPBgNVBAcTCEJlbGxldnVlMRYwFAYDVQQKEw1FeHBlZGlhLCBJbmMu
+MRgwFgYDVQQDEw9TU08uRUdFTkNJQS5DT00wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDTn33bK5kWsiyxwi9F7zc1160xNJcWYykHIiX1aMLXhZln3oS1Ma3idei6PC9R0aK0h0Y7qe8y
+Ab8AajfnCxB8gqKOCR064hMMYB2fon0tC//477x8wG2XrFDzTem21LNRkrI54EcBvykDWSqlC0lI
+QOBTtn5nTfsSuRBYl+CDGaMb/UUHZ5l18TqbCgVmELiEr37j9Cfqv6NO8b80k1zXP8FwFNQmSGxw
+QMBOAf/V43Yn1mdGxaUZBY2MnK1yKH6IoPBKAyafUPedXz5gy/xIQZTQprIb9kosei6IyOtuqmnV
+o1VA7HKPV8w5cIyx11eZgOV0Fi0IswvwBJxPrf1pAgMBAAGjggGDMIIBfzALBgNVHQ8EBAMCBaAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9j
+cmwuZW50cnVzdC5uZXQvbGV2ZWwxay5jcmwwSwYDVR0gBEQwQjA2BgpghkgBhvpsCgEFMCgwJgYI
+KwYBBQUHAgEWGmh0dHA6Ly93d3cuZW50cnVzdC5uZXQvcnBhMAgGBmeBDAECAjBoBggrBgEFBQcB
+AQRcMFowIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVudHJ1c3QubmV0MDMGCCsGAQUFBzAChido
+dHRwOi8vYWlhLmVudHJ1c3QubmV0L2wxay1jaGFpbjI1Ni5jZXIwGgYDVR0RBBMwEYIPU1NPLkVH
+RU5DSUEuQ09NMB8GA1UdIwQYMBaAFIKicHTdvFM/z3vU981/p2DGCky/MB0GA1UdDgQWBBSgfwEI
+76qdV0qOuSAkkfaYK3AlrzAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQC+3Mp8fw1ZSfEK
+ob3KVMH0pW8geCRDnnyh/Cv5/AnlPwdFfWSzIKmE5ZknfVwcV/XftRQxbkuIt0RANWXZvltj9qEP
+bTwTgBrFW+jAxhSI2VeJlFtHwB3NIc/Dt5jrfkC6x1Sdee6X+Jh/Jv7jcDKvEwOuLwzEq1n6lU4e
+9MTmZmtqHJrD4V79qOn7W1aeGfZMqa72kms6InjTAVwENNqY+MbBg1axxr+uXjlBuuRQRHmd/N1D
+dCS4UR5oi0W8746+1iN6fE8qYdVN4bwwa3QtRn9xFzBtsy1V2Dm5H9SMCxZkewj2W7PXNr65gjRy
+iYns87MN+qR53rv18Bbk6be4</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>MIIDXTCCAkWgAwIBAgIEEcjjOjANBgkqhkiG9w0BAQsFADBfMQswCQYDVQQGEwJJTjELMAkGA1UE
-CBMCSFIxEDAOBgNVBAcTB0d1cmdhb24xEDAOBgNVBAoTB2VnZW5jaWExDTALBgNVBAsTBGF1dGgx
-EDAOBgNVBAMTB2VnZW5jaWEwHhcNMTQxMTI1MTMwOTQ3WhcNMTUxMTIwMTMwOTQ3WjBfMQswCQYD
-VQQGEwJJTjELMAkGA1UECBMCSFIxEDAOBgNVBAcTB0d1cmdhb24xEDAOBgNVBAoTB2VnZW5jaWEx
-DTALBgNVBAsTBGF1dGgxEDAOBgNVBAMTB2VnZW5jaWEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCy0EBPrwy8d/T+rlv2hZNxQmcLdk7ewruvjiw3P/1cSo1bJtFEwZrAXERHQPX/DaEX
-y8KL/diYW+fpaalyHJTQLjY4IqDRMPfhleVXqX862y9k46k7ioL/qv11ZtrO9JrecDXqm/twFLL3
-d3GJXz/Qf5AfNvM+a7wny1ZmYNyuXKHWIqWGzHpqTomjtlGE2VrBqC4DtvcEruZ0+CdqqA2Qmwrm
-BSxB/LlLqHuB19DeUbVt0pa0o5oxwbYLBtRH6PUYxBe0i2A3HC/QkxZil5YdD3MHqB3KRdobUdHp
-3Z9QgWwJJ19bZ4gJWYPfTlMXcGVhKR3Vcfrc7jw294H2X9TbAgMBAAGjITAfMB0GA1UdDgQWBBQj
-cVN/E+c2EzvzoZV8vBzJxzUUUzANBgkqhkiG9w0BAQsFAAOCAQEAaBll99MmA2Q4/dE7Q4f3kc+3
-GFqMwrTJokFb2yjafo4+fs+tRbCQi/P2eY7XkEFTWuZGJfDigKGhLINIpMkMd1RHt1iEyYfuZXXC
-uJBQTfSmha6dXceABAD+amTU5BWlNywpdGi8ajp8+Ytq0C+pO7MldDip+7vMS3LhoDHiQlubl2KL
-ob6x0KGydwxsMBN7ETIChkm/def8Edtlmzs3MR63XeB77EgVeb62Be+48Fn/+gLJVromH3TMpN5j
-I6vDyy0Eq6Q8eTv+UR99ax3vBFPfG9qg8jp5aruWeQS3IMyzSbpDQ30nNJl1QIiIYvhS+dVRjFHC
-agvcqwPGk8MYTg==</ds:X509Certificate>
+ <ds:X509Certificate>MIIFLTCCBBWgAwIBAgIMDVCG8gAAAABQ1dX0MA0GCSqGSIb3DQEBCwUAMIG6MQswCQYDVQQGEwJV
+UzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9s
+ZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g
+TDFLMB4XDTE1MTAyNjIxMDQxMFoXDTE4MTAyNTIxMzQwOFowZzELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCldhc2hpbmd0b24xETAPBgNVBAcTCEJlbGxldnVlMRYwFAYDVQQKEw1FeHBlZGlhLCBJbmMu
+MRgwFgYDVQQDEw9TU08uRUdFTkNJQS5DT00wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDTn33bK5kWsiyxwi9F7zc1160xNJcWYykHIiX1aMLXhZln3oS1Ma3idei6PC9R0aK0h0Y7qe8y
+Ab8AajfnCxB8gqKOCR064hMMYB2fon0tC//477x8wG2XrFDzTem21LNRkrI54EcBvykDWSqlC0lI
+QOBTtn5nTfsSuRBYl+CDGaMb/UUHZ5l18TqbCgVmELiEr37j9Cfqv6NO8b80k1zXP8FwFNQmSGxw
+QMBOAf/V43Yn1mdGxaUZBY2MnK1yKH6IoPBKAyafUPedXz5gy/xIQZTQprIb9kosei6IyOtuqmnV
+o1VA7HKPV8w5cIyx11eZgOV0Fi0IswvwBJxPrf1pAgMBAAGjggGDMIIBfzALBgNVHQ8EBAMCBaAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9j
+cmwuZW50cnVzdC5uZXQvbGV2ZWwxay5jcmwwSwYDVR0gBEQwQjA2BgpghkgBhvpsCgEFMCgwJgYI
+KwYBBQUHAgEWGmh0dHA6Ly93d3cuZW50cnVzdC5uZXQvcnBhMAgGBmeBDAECAjBoBggrBgEFBQcB
+AQRcMFowIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVudHJ1c3QubmV0MDMGCCsGAQUFBzAChido
+dHRwOi8vYWlhLmVudHJ1c3QubmV0L2wxay1jaGFpbjI1Ni5jZXIwGgYDVR0RBBMwEYIPU1NPLkVH
+RU5DSUEuQ09NMB8GA1UdIwQYMBaAFIKicHTdvFM/z3vU981/p2DGCky/MB0GA1UdDgQWBBSgfwEI
+76qdV0qOuSAkkfaYK3AlrzAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQC+3Mp8fw1ZSfEK
+ob3KVMH0pW8geCRDnnyh/Cv5/AnlPwdFfWSzIKmE5ZknfVwcV/XftRQxbkuIt0RANWXZvltj9qEP
+bTwTgBrFW+jAxhSI2VeJlFtHwB3NIc/Dt5jrfkC6x1Sdee6X+Jh/Jv7jcDKvEwOuLwzEq1n6lU4e
+9MTmZmtqHJrD4V79qOn7W1aeGfZMqa72kms6InjTAVwENNqY+MbBg1axxr+uXjlBuuRQRHmd/N1D
+dCS4UR5oi0W8746+1iN6fE8qYdVN4bwwa3QtRn9xFzBtsy1V2Dm5H9SMCxZkewj2W7PXNr65gjRy
+iYns87MN+qR53rv18Bbk6be4</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.egencia.com/auth/v1/saml/SingleLogout"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.egencia.com/auth/v1/saml/SingleLogout"/>
<md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
diff --git a/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml b/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
index f969162f..cc27a9d8 100644
--- a/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
+++ b/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
@@ -49,6 +49,6 @@
</md:SPSSODescriptor>
<md:ContactPerson contactType="technical">
<md:GivenName>Administrator</md:GivenName>
- <md:EmailAddress>netdrift@deic.dk</md:EmailAddress>
+ <md:EmailAddress>mailto:netdrift@deic.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/www.researchprofessional.com-shibboleth.xml b/swamid-2.0/www.researchprofessional.com-shibboleth.xml
index d6fed039..90d0f8bc 100644
--- a/swamid-2.0/www.researchprofessional.com-shibboleth.xml
+++ b/swamid-2.0/www.researchprofessional.com-shibboleth.xml
@@ -1,8 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.researchprofessional.com/shibboleth">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.researchprofessional.com/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Research Professional</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Research Professional is an intuitive platform for online access to news and funding services.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://info.researchprofessional.com/</mdui:InformationURL>
+ <mdui:DisplayName xml:lang="sv">Research Professional</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Research Professional är en intuitiv plattform för tillgång online till nyheter och finansieringstjänster.</mdui:Description>
+ </mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -45,4 +60,9 @@ tgwZBKIPISvO0cHB2chZHzDJI9PQsgD0OmVfHqQtlwuMw32qK2EcD1NC/VZZ/w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Steve</md:GivenName>
+ <md:SurName>Potter</md:SurName>
+ <md:EmailAddress>mailto:sso@researchresearch.com</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..ff01c8b0
--- /dev/null
+++ b/swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.test.uppfoljning.ladok.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok www.test.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok www.test.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+ <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+ <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+ <mdui:Logo height="64" width="64">https://www.test.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.test.uppfoljning.ladok.se/gui-sp</ds:KeyName>
+ <ds:KeyName>www.test.uppfoljning.ladok.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.test.uppfoljning.ladok.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFTDCCAzSgAwIBAgIJAJwQ1AOzvzh4MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+BAMTHXd3dy50ZXN0LnVwcGZvbGpuaW5nLmxhZG9rLnNlMB4XDTE2MDExMzA5MzYy
+M1oXDTI2MDExMDA5MzYyM1owKDEmMCQGA1UEAxMdd3d3LnRlc3QudXBwZm9sam5p
+bmcubGFkb2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQClXTeW
+/wJJQsTLzSeJ753U+8cwpv7FOwkUpCcHH6bb7nVIdcJDuYQOw8JVBl9S69cEXXcG
++VevlFNf4qU9bKEGQKnd15YiybR5sus4x25dG4aGk7p6ZapsDoSg/CKwrbhmOjYT
+OCCjHUrsUdBEe0spS4qBGo5QVgMBMBWEhL85pxFxO95j80iU7LSQIKZSMWBZzm37
+ouSxsXT/x52Ao6HtlWK17BF0m9kW3uLW38wlaP7JTWTnve1CMaOMVEbDliw3ysX7
+uO6fKvTWTkpzG62offlKKExCbyH340X5TI8dOhyYOlFyrpccdSCQkcSviSJ4oL0j
+XAO+rCV1PngoecLThIidN8sSqIwL5nFDULCNURYIpd7w15wu01I5y8dy9NUOvZ3b
+XZ16mPKQpL2nGJe1wRS1jSpooeG5TAxvOwdKBLgzeqZ4I1FC0Dha70FfmWrJ0Opt
+sYTQ2jbCxtDx6tBHK1dw9OX/flxqmnxsvNJ/ALuzxbRMJL/j/Yi4SAHnAUtdOFqo
+VK/FxqVwqRRB7igCVIuviZbA7GeODnwah+Llv12vvfis+wipQQ5aKA9DpbK+KwP6
+OsgOZSBhvCCKvMGuxgVifzxSJeQxG2WoehEtuhnUCao+L7WE+NLY5hOUowsQLN+a
+/jlCye3nnQ0lb7ZOxHREazCbztPgO4VX/O40EwIDAQABo3kwdzBWBgNVHREETzBN
+gh13d3cudGVzdC51cHBmb2xqbmluZy5sYWRvay5zZYYsaHR0cHM6Ly93d3cudGVz
+dC51cHBmb2xqbmluZy5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFK9iv5wSca5C
++6vltre0Ko+Z9X98MA0GCSqGSIb3DQEBBQUAA4ICAQBlidVziryz78l+6jlhxif+
+AXSJBQDeNoJ2ApxD9mBdJcXb4O/Huy2o5Ijo19vP0RPM6svK9TafHaOuGR1ZmlJe
+lQY+z+Decit9NsugZTaq2n2eMCqFhDy/Ybu8IEurJ9E09t2o5itqhGUgwJpG3BhV
+fdbKJSwoF2JSAn/PDZaNo9IdOGqxqHvVds4A6WzYVsDl0XiTqeMhb5My3K4nz8ER
+9VdsdldJTRqGp06pxkr2XLUSkX36yyV5uf2M1SR1aNl1WTVmB6/LePSOTgsUCV2r
+Xr6/QoflBFXZySNWV7f1klzl3MnmfOyWaBUILGh2Ke4/L2azEXil5jApeVnt+y6e
+Ql0ZjEruBkDpCkltdew1vaDRuJAPd5NC6LPXWjozZYNx8dNcze/yJTjoWwPltvf8
+0pAU9qPKqLrlX3ZWmtWh6ymT2XnK4mINjpcS3uDZDSkgMZAsgs8SpTdrgtE89sLz
+VqAUw5BQrZQYhV+AtqWCOnQcxaC9mLkdB6wpfZu5xrgWgQGcAvJM0lnOP/LAQPny
+jiCPF0Mux4hPUalhs5RJfQhUZBIo5c0PZSohzHn2pNIWMkppphOMEMrc/HBuDbAZ
+OGHgoQN0dxACvHw1YMHvyFWI+NYO1070o6sY9/MwGyrCClplXiMnDmfbyIsfvq6u
+qqt+VY+dgL11MGCZOGpJVg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..5bff7c50
--- /dev/null
+++ b/swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.uppfoljning.ladok.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok www.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok www.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+ <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+ <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+ <mdui:Logo height="64" width="64">https://www.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.uppfoljning.ladok.se/gui-sp</ds:KeyName>
+ <ds:KeyName>www.uppfoljning.ladok.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.uppfoljning.ladok.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFODCCAyCgAwIBAgIJAOk6eA6bBSUAMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHd3dy51cHBmb2xqbmluZy5sYWRvay5zZTAeFw0xNTEyMDQwNzMxMDNaFw0y
+NTEyMDEwNzMxMDNaMCMxITAfBgNVBAMTGHd3dy51cHBmb2xqbmluZy5sYWRvay5z
+ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMgvIKG0Iddz3FLny2fV
+YENWzgyr/dv0r+c0JDRp3P0bKoQnYiOC+XVAGi6e6u5XazWzkQJapQSO1W3z2eXG
+IWFaAYgZFsqINmIIKKcxN/n9Zevh88DgKa3Oz8S/5cTxhQflikDXvyaCeWy2hZKP
+uLt+mtCxmtBFZQqyWkSPIeb6naAAuMHba2xAfstM9mUJsobKJWjfg40jrhAHo2Kc
+LFES9ckL2IKbduC1RO9S98h8LoTGHI1KCegpmptyMveJL6r5bPJYRTuTCRyIDQ53
+WuzAuOMfTrvTX/2NO2zF7UWASRyZCSNjew/cfE7qL3YRJfeEMPDy/BTmtsdoBdHS
+J3zK1sNLfv8yaYOo2Ows9hFZeNKaFBMunXvIUBnXcfAZQMRutOXJYtC7Cfc0+djl
+3J/l9SLQfQfqxww8cf/RBWNMvjapL2IU5g2D7buEsgkxM56b0Yw3YZ1XMQHOy9pG
+BOEt6NaIdtTyz2dA1JxRurOCkPq3kNfHnJlYAuB9rNc8t5b34M/oZKA7cdVPBa+N
+Ty40YhjZw9Z05b4G+Y0nXMxORB7kJFqAjmBd59ZbhphqgCIkrRuzIMK+iouAlq2f
+lgsJ38oMW1f6DLVGH2GC2Sx81Ngq6BoJFUlJq/sE0fnUbdEpC/aQky5ph9rVCx7r
+yWewkliKVJemhyYYLXR3oas7AgMBAAGjbzBtMEwGA1UdEQRFMEOCGHd3dy51cHBm
+b2xqbmluZy5sYWRvay5zZYYnaHR0cHM6Ly93d3cudXBwZm9sam5pbmcubGFkb2su
+c2UvZ3VpLXNwMB0GA1UdDgQWBBQsive1Oq4SvjwbaHCpcUagbKLD7jANBgkqhkiG
+9w0BAQUFAAOCAgEAMxAsYYpc23IeKioe+YkUMp5w5LSAzFw84Hbnvn7kpWZnCjkJ
+lWQIg43rfoP245VV5iete0s9yvMl5PrnFlGs/5SgTCBdrTXXSjMc9AbXW3WAMnpy
+Uj4mloSfwCURUtm6JlzlQE+cI2/2gqcjyX3NO5bm5ztNxJkMPH/eS8OmaG8PSUdd
+nHCgPGaXMRphFKa6PIOXjauWhSVZMXyQyFUo9NY6arc341qt3DmrrmrQhm6IvavH
+Z9h5c9sjOBqPT0BXMxDWgWkRih3R9nFsITd0rmZTJ1sOt4rDDq5UrTTUMCk6SdsJ
+VFbtw1UaIKfxxD/hI8kvt53dHPQFf07PJM5gHmi6rW0y9qGtgJlbo1gnavRDyIxQ
+7RY0JUZHZbwbErb76VVrq/IYfCRYn9ITSBNaRFmxCYmfk2glZE11MPNijg3/SdN2
+uUIuMpT3jxebMVF/jprgY3SXYVtylGd6jOWZmKqGxMQ0gII0StsMgAlk22MWr4HO
+vK6J9hwUI057LYBOpwF777iKoGTpAdDnk8wEpc/gD6OVAjdmPmoxq1F6aXQ/0Rb0
+9AHiq9QuIZvfZxuLZua08zjkw/PiD51rHgQ6xGabj5dag5rI+WzYvdqQf43Q+NRf
+In/ikXXTMoplS8tRzCrjMQsTrhAg8qemRbZ6iGMqy8/lXraUDplt75yZFcY=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..35b39fb5
--- /dev/null
+++ b/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.utb.uppfoljning.ladok.se/gui-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue> http://www.swamid.se/category/research-and-education </samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok www.utb.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok www.utb.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:Description xml:lang="sv"> Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+ <mdui:Description xml:lang="en"> Administration system for higher education in Sweden (Ladok)</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+ <mdui:Logo height="64" width="64"> https://www.utb.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.utb.uppfoljning.ladok.se/gui-sp</ds:KeyName>
+ <ds:KeyName>www.utb.uppfoljning.ladok.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.utb.uppfoljning.ladok.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAJRuttYMy/CdMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHHd3dy51dGIudXBwZm9sam5pbmcubGFkb2suc2UwHhcNMTUxMDIzMDgyNzE0
+WhcNMjUxMDIwMDgyNzE0WjAnMSUwIwYDVQQDExx3d3cudXRiLnVwcGZvbGpuaW5n
+LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlHyyl8lw
+wkevAYlRJiSqa3yaCbU8D5cUNH9mIPojH1kfb1QXByscQPc9MwGR0tDl67o4+qr8
+f51okBl4+C/AfkGgsc2C+jvPhO/p16Uzw9AXCSN8Nzl+RHBUhONYOKgQA4OaRxOI
+As/rvAYZQEmqVoENANdNNJRi0Tqwqo9FxlX4q9XHwx+53oOfeXVMetMAi/uU75OT
+YCPW5F0Y72XQ2QPZkRNsqYK1IVqMCsgXS1VPiuqCyWHdUhesYC+S2279QrP2sXcJ
+xiQhohE7dY2vdgHLmQq+T2YERVIoGqCNxvKQ4JPeVr9MPVAN1uiJ3wiPpLxh4VVs
+Oa7beN4vr+KboQIDAQABo3cwdTBUBgNVHREETTBLghx3d3cudXRiLnVwcGZvbGpu
+aW5nLmxhZG9rLnNlhitodHRwczovL3d3dy51dGIudXBwZm9sam5pbmcubGFkb2su
+c2UvZ3VpLXNwMB0GA1UdDgQWBBTUNZ+hmTCzgsSS3vs4dxj8Mm5kuzANBgkqhkiG
+9w0BAQUFAAOCAQEAkEPx2U0iQ4NfF+ixzf0LOBUT8njxb8lHfX4PjqinJS15N4si
+xGispD9fabYPNVGK500/Md/4Gl6MrPhsxbAMcRn9FL962JiuTccfsecGAv5+4BKY
+IjBj97jbFJ2fhsQBBaevgfNP2wLHsyQheQgAXY72cCG3OaZeTMMNECb1FG1MhvRt
+Zvdcx+ES1HMOgLCAU2BF/oYnuuGhwOI4H6jabKK44GbWeE0Mv8L/A5knUoujfR0n
+gUbDaBy4oNdSbv4VXVLXLD6XwwzJNfn8TGE8LQh3pvSAOdiTz4ie2ybYfXI2VKVG
+IgTd2o/JWpObjIU/AurReC6h+UPQ4M3O3lBYFA==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index a09ca97d..4dbe9fdc 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -40,7 +40,6 @@
<xi:include href="swamid-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp.his.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
- <xi:include href="swamid-2.0-obsolete/idp.hgo.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/fs.liu.se-adfs-services-trust.xml"/>
<xi:include href="swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/weblogin.uu.se-idp-shibboleth.xml"/>
@@ -49,4 +48,7 @@
<xi:include href="swamid-2.0/login.idp.eduid.se-idp.xml.xml"/>
<xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp.kkh.se-idp-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/login.ki.se-idp-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/idp.ths.se-idp-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 36c531f0..dd100088 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -16,4 +16,5 @@
<xi:include href="swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml"/>
<xi:include href="swamid-2.0/auth.asiaportal.info.xml"/>
<xi:include href="swamid-2.0/urn-urkund-shibboleth-sp.xml"/>
+ <xi:include href="swamid-2.0/mp.uu.se-shibboleth.sso.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-interfederations-1.0.mxml b/swamid-interfederations-1.0.mxml
index c0536a90..b222ce8a 100644
--- a/swamid-interfederations-1.0.mxml
+++ b/swamid-interfederations-1.0.mxml
@@ -8,9 +8,11 @@
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.umit.dk.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.fiol.odense.dk-.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml"/>
@@ -59,6 +61,7 @@
<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-1.0/clarin.ids-mannheim.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/clarin.oeaw.ac.at-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-1.0/clarino.uib.no-.xml"/>
<xi:include href="swamid-interfederations-1.0/clarin.phonetik.uni-muenchen.de.xml"/>
<xi:include href="swamid-interfederations-1.0/compute.deic.dk.xml"/>
<xi:include href="swamid-interfederations-1.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
@@ -74,6 +77,7 @@
<xi:include href="swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.feide.no.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.lut.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.metropolia.fi-idp.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml"/>
@@ -81,12 +85,14 @@
<xi:include href="swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/infra.clarin.dk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-1.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml"/>
<xi:include href="swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/moodle.helsinki.fi-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/openskos.meertens.knaw.nl-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-1.0/portal.clarin.inl.nl-.xml"/>
+<xi:include href="swamid-interfederations-1.0/repo.clarino.uib.no-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-1.0/repos.ids-mannheim.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/rr.funet.fi-attribute-test.xml"/>
<xi:include href="swamid-interfederations-1.0/secure.huygens.knaw.nl.xml"/>
@@ -109,6 +115,8 @@
<xi:include href="swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml"/>
<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.xml"/>
+<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml"/>
+<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml"/>
<xi:include href="swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml"/>
<xi:include href="swamid-interfederations-1.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-1.0/wayf.ordbogen.com.xml"/>
@@ -118,6 +126,7 @@
<xi:include href="swamid-interfederations-1.0/www.clarin-pl.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml"/>
+<xi:include href="swamid-interfederations-1.0/www.nederlab.nl-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml"/>
<xi:include href="swamid-interfederations-1.0/www.ordbogen.com.xml"/>
</EntitiesDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
new file mode 100644
index 00000000..1650f1a5
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/fs.dskd.dk/adfs/services/trust">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-05-27T15:12:32Z" registrationAuthority="https://www.wayf.dk">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
+ <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+ <mdui:DisplayName xml:lang="da">Designskolen Kolding</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Design School Kolding</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL2Zz
+LmRza2QuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
+NTEyMzEyMzU5NTlaMDAxLjAsBgNVBAMMJWh0dHA6Ly9mcy5kc2tkLmRrL2FkZnMv
+c2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH
+iAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZ
+hrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSV
+jp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+
+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BH
+OZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joF
+cy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAi+Kah5zSB6
+KbsrjzAP15Lemsnnlfm01DTYdSnq0DvR8xtuZqg1OrU7jEQuD4aYAK8nyoLtPxmk
+6jPI6CCNAa/MvSgwxivD2hFR7ynKJrbI65DPP7Wo/6GRSr4vMD3xhKFNGS2061M1
+8majtXtIhwqhbEgmq5EAKeTQiUZM9GcJh86+r7Td9aJxiAa2jdn3UnTEfc5pDr71
+Wks1+XvQCZCvDytO08HrCK+2n42p5qVxKX2amKpWDuseBmpuTC9uTFbP2pJuJssN
+VOvL3ykvu7uuZW0/HdBtWE/eVi8dAKE/eV5SDo6p0QUF2GK2fT7a6Mlwl5tyYAoU
+dPcr9FHbXBQ=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/fs.dskd.dk/adfs/ls/"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="da">Designskolen Kolding</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Design School Kolding</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="da">Designskolen Kolding</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Design School Kolding</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="da">http://www.designskolenkolding.dk</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">https://www.designskolenkolding.dk/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>hng@dskd.dk</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
new file mode 100644
index 00000000..16f3997d
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/orphanage.wayf.dk">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:41:26Z" registrationAuthority="https://www.wayf.dk">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">orphanage.wayf.dk</shibmd:Scope>
+ <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+ <mdui:Description xml:lang="da">WAYF Orphanage</mdui:Description>
+ <mdui:Description xml:lang="en">WAYF Orphanage</mdui:Description>
+ <mdui:DisplayName xml:lang="da">WAYF Orphanage</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">WAYF Orphanage</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIICvDCCAaQCAQcwDQYJKoZIhvcNAQELBQAwJDEiMCAGA1UEAwwZaHR0cHM6Ly9v
+cnBoYW5hZ2Uud2F5Zi5kazAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTla
+MCQxIjAgBgNVBAMMGWh0dHBzOi8vb3JwaGFuYWdlLndheWYuZGswggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe
+3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EU
+FS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS3
+6J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2
+qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL
+63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJ
+KoZIhvcNAQELBQADggEBABx+HHsDGyCHtfGNTudzmFRXilr0ay16wRgaLnsCTk3M
+HM2yOputyK+odkVdeIFQ+DnHvWcMOJDiXigiWbNVnN8qaFSHKCJ21Vj5peRpHY6a
+mtoI7FLHoi7t2w9+wmYW20Q4uEc75HrPkmbCn2wSAKDpZ9aBp7oS2KExU58DaLMn
+uxIsjo0ZuT1coH5F8+Pbz763uSbrA7S/c49K8/BZlFStp1419pB4FS+D8mX+ggeq
+Q2kElthI7N5bxzc5JrWQJJG8Vze/g3jvVr8m7p+FEpRjK22WPhfFtwislkYdDfUx
+I81cWocYw/rsAD2kW5C5T1nMZBlgoYk/+yXoXXGHuEI=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/orphanage.wayf.dk/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="da">WAYF Orphanage</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">WAYF Orphanage</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="da">WAYF Orphanage</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">WAYF Orphanage</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="da">http://wayf.dk</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://wayf.dk/index.php/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/clarino.uib.no-.xml b/swamid-interfederations-1.0/clarino.uib.no-.xml
new file mode 100644
index 00000000..2cb23e91
--- /dev/null
+++ b/swamid-interfederations-1.0/clarino.uib.no-.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://clarino.uib.no/">
+ <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://clarino.uib.no/feide/single-login" index="1"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Clarino, UiB</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Clarino, UiB</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Clarino, UiB</mdui:DisplayName>
+ <mdui:Description xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvät CLARIN aloitetta.</mdui:Description>
+ <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</mdui:Description>
+ <mdui:Logo height="165" width="460">https://clarino.uib.no/images/clarino_duo-460.png</mdui:Logo>
+ <mdui:PrivacyStatementURL xml:lang="fi">http://clarino.uib.no/iness/page?page-id=privacy_policy</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>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVp
+Yi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZ
+mm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiX
+DsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15fr
+hNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WCh
+sbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDW
+dy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8R
+piXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+dGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNz
+LnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx
+9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB8
+20waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60
+Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB
+7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7E
+zRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarino.uib.no/feide/single-logout"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarino.uib.no/feide/assertion-consumer" index="1" isDefault="true"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="fi">Clarino, UiB</md:ServiceName>
+ <md:ServiceName xml:lang="en">Clarino, UiB</md:ServiceName>
+ <md:ServiceName xml:lang="sv">Clarino, UiB</md:ServiceName>
+ <md:ServiceDescription xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvat CLARIN aloitetta.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Koenraad</md:GivenName>
+ <md:SurName>De Smedt</md:SurName>
+ <md:EmailAddress>mailto:clarino@uib.no</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Paul</md:GivenName>
+ <md:SurName>Meurer</md:SurName>
+ <md:EmailAddress>mailto:clarino-tech@uib.no</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Paul</md:GivenName>
+ <md:SurName>Meurer</md:SurName>
+ <md:EmailAddress>mailto:clarino-tech@uib.no</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
index bd3c5114..59340ad2 100644
--- a/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -3,13 +3,13 @@
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
<mdui:Description xml:lang="fi">Eduuni on sähköisen työskentelyn ja verkostoitumisen palveluympäristö.</mdui:Description>
<mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking.</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index d97fa342..bf411468 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -52,6 +52,7 @@
<shibmd:Scope regexp="false">bygland.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">bykle.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">cmi.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">danielsen-skoler.no</shibmd:Scope>
<shibmd:Scope regexp="false">diakonhjemmet.no</shibmd:Scope>
<shibmd:Scope regexp="false">diakonova.no</shibmd:Scope>
<shibmd:Scope regexp="false">dmmh.no</shibmd:Scope>
@@ -115,6 +116,7 @@
<shibmd:Scope regexp="false">feide.verdal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">fet.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">fhs.mil.no</shibmd:Scope>
<shibmd:Scope regexp="false">fitjar.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">fjaler.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
@@ -138,6 +140,7 @@
<shibmd:Scope regexp="false">fusa.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">fyresdal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gaular.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">gausdal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">giske.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gjemnes.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gjerdrum.kommune.no</shibmd:Scope>
@@ -150,6 +153,7 @@
<shibmd:Scope regexp="false">gratangen.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">grimstad.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">grong.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">grue.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gs.alesund.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gs.haram.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gs.orskog.kommune.no</shibmd:Scope>
@@ -207,6 +211,7 @@
<shibmd:Scope regexp="false">hyllestad.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
<shibmd:Scope regexp="false">inderoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">innfjorden.no</shibmd:Scope>
<shibmd:Scope regexp="false">iveland.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">jolster.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
@@ -239,6 +244,7 @@
<shibmd:Scope regexp="false">lesjaskulane.no</shibmd:Scope>
<shibmd:Scope regexp="false">lier.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">lierne.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">lillehammer.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">lomskulane.no</shibmd:Scope>
@@ -286,6 +292,7 @@
<shibmd:Scope regexp="false">nmh.no</shibmd:Scope>
<shibmd:Scope regexp="false">nome.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nord-odal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">nordkapp.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">nordreisa.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
@@ -305,6 +312,7 @@
<shibmd:Scope regexp="false">ovgs.no</shibmd:Scope>
<shibmd:Scope regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">oya.vgs.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">oyer.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">oygarden.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">phs.no</shibmd:Scope>
@@ -346,6 +354,7 @@
<shibmd:Scope regexp="false">selskolene.no</shibmd:Scope>
<shibmd:Scope regexp="false">sfj.no</shibmd:Scope>
<shibmd:Scope regexp="false">sigdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sintef.no</shibmd:Scope>
<shibmd:Scope regexp="false">skanland.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">skiptvet.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/idp.lut.fi.xml b/swamid-interfederations-1.0/idp.lut.fi.xml
new file mode 100644
index 00000000..8e98b5a0
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.lut.fi.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.lut.fi">
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">lut.fi</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Lappeenranta University of Technology</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Lappeenrannan teknillinen yliopisto</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Lappeenranta Tekniska Högskolan</mdui:DisplayName>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:IPHint>157.24.0.0/16</mdui:IPHint>
+ <mdui:DomainHint>lut.fi</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:61.06490,28.09240</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEjjCCA3agAwIBAgIQXxAGKmjmI6A8/AokeEg6njANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNTAxMTYwMDAwMDBaFw0xODAyMjUyMzU5NTlaMDgxITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmx1dC5maTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKVkLMT8SYz8D3lRDpfR5Idv
+vB6FJtmrKOgKsR8OH+cwkraeFIAfDzTHSBN/2hViYh0383NSpttIx21lQ/o6H7PE
+16VOTLyFaodMMGm4rSoyaqUxYREij1SZBrC+9d8UtxkAsM9saU0ef6I8MWPtPtod
+ZLVp3oCYCcOgrQ1mcVQBJBwG6zTKfIJiqyI7SQAoueBY7VcvR/NpUPHHneUi0qV/
+u5FO1Oh/0gtPes7rvr6KJX0A6X4TFobZKAKoiqUG8MJXSiyxd1TN5oVgDBrmumVN
+uHb4rSvsYGSZ2NoMAJlTC7p/i6va89bwMNsISPKiv0e+hv+HX9TiqyAVy23x5TUC
+AwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw/ba9MB0G
+A1UdDgQWBBRFT4PC6ScY7RZxNcbaU88KJtfbiDAOBgNVHQ8BAf8EBAMCBaAwDAYD
+VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0g
+BBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4Yp
+aHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmwwbAYIKwYB
+BQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20v
+VEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRy
+dXN0LmNvbTAVBgNVHREEDjAMggppZHAubHV0LmZpMA0GCSqGSIb3DQEBCwUAA4IB
+AQBRo6/qe5rTFpODjAPRbt/rLHebthMIfzYU1yVkfWZ1usiBD7brd08hyPvqjo6l
+btWNk3dgXXrCRH3u33X+HeBykZdYI03sFNnmT85QcYmrpYrGOujMGS9Wu5o0PYHV
+8TWMITsX9Vi9ADH/378KdHUyx0vH6EMvooY+FsL9Dz8pK9s17aCLKbnKEh49AWmE
+HXu+H5jgwuJsS8jvJTWo9E//iEx2M7YddnG3DKaxU4WhZ01Zy+lM0n7TIZOVC8pk
+UisE3gOCfuK9kEQKiQbQN/UBIx9xnY50fpTfplouzcoMzBd9LxU9k5Ir1X0rQ5g6
+CqEjXNP5Vdullr/akxI3IB8X</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lut.fi/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">Lappeenrannan teknillinen yliopisto</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Lappeenranta University of Technology</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Lappeenranta Tekniska Högskolan</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">Lappeenrannan teknillinen yliopisto</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Lappeenranta University of Technology</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Lappeenranta Tekniska Högskolan</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.lut.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.lut.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.lut.fi</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Pekka</md:GivenName>
+ <md:SurName>Kuronen</md:SurName>
+ <md:EmailAddress>mailto:tunnusautomaatio@lut.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Antti</md:GivenName>
+ <md:SurName>Sirvio</md:SurName>
+ <md:EmailAddress>mailto:tunnusautomaatio@lut.fi</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
index cef613f9..ef381a32 100644
--- a/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
@@ -4,13 +4,13 @@
<md:Extensions>
<shibmd:Scope regexp="false">uef.fi</shibmd:Scope>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Itä-Suomen yliopisto</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">Östra Finlands universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">University of Eastern Finland</mdui:DisplayName>
- <mdui:Description xml:lang="fi">Itä-Suomen yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
+ <mdui:DisplayName xml:lang="sv">Östra Finlands universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Itä-Suomen yliopisto</mdui:DisplayName>
<mdui:Description xml:lang="en">University of Eastern Finland students, faculty and employees.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.uef.fi/en/etusivu</mdui:InformationURL>
+ <mdui:Description xml:lang="fi">Itä-Suomen yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
<mdui:InformationURL xml:lang="fi">http://www.uef.fi/fi/etusivu</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.uef.fi/en/etusivu</mdui:InformationURL>
</mdui:UIInfo>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml b/swamid-interfederations-1.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml
new file mode 100644
index 00000000..c955fedb
--- /dev/null
+++ b/swamid-interfederations-1.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.exammonitor.dk/module.php/saml/sp/metadata.php/login">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-12-02T09:44:48Z" registrationAuthority="https://www.wayf.dk">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+ <mdui:Description xml:lang="da">Formålet er at brugerne får adgang til at starte et system som overvåger deres digitale eksamen.</mdui:Description>
+ <mdui:Description xml:lang="en">The purpose is to enable users to start a system that will monitor their digital exam.</mdui:Description>
+ <mdui:DisplayName xml:lang="da">Exam Monitor</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Exam Monitor</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIID7TCCAtWgAwIBAgIJAOCFGMmv3N1CMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYDVQQGEwJESzEMMAoGA1UECAwDRnluMQ8wDQYDVQQHDAZPZGVuc2UxHTAbBgNVBAoMFFN5ZGRhbnNrIFVuaXZlcnNpdGV0MSAwHgYDVQQLDBdJVC1zZXJ2aWNlLCBFeGFtbW9uaXRvcjEdMBsGA1UEAwwUbG9naW4uZXhhbW1vbml0b3IuZGswHhcNMTUxMTI1MDkzMzIxWhcNMjUxMTI0MDkzMzIxWjCBjDELMAkGA1UEBhMCREsxDDAKBgNVBAgMA0Z5bjEPMA0GA1UEBwwGT2RlbnNlMR0wGwYDVQQKDBRTeWRkYW5zayBVbml2ZXJzaXRldDEgMB4GA1UECwwXSVQtc2VydmljZSwgRXhhbW1vbml0b3IxHTAbBgNVBAMMFGxvZ2luLmV4YW1tb25pdG9yLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ZzCSgMEAeIP1sZa/imvZR6tYN78mZuIazkexv3Zhsd/KRTCPfbhtk/J0jicZ6JsqiEd9q2cOf/XKjCw8ejaqJrYqFPWyRLyWs2xgf3lGMTWaxhhJpbnPY6uyFLGKnNkNP9xLpPqB6JkvUiQ1eCSG493ZhWhWQIrMf629U3EEPnwhhbAQa0UYw005BYqK6/MhFB50M6PFZ9O57USna9zBwtv4durotcol6fjgOAQ5Crr2vema4Swd5j56lgftmhLo9VsD5Yqd5SLZaAWWV2U3GvpsJawix7RSkt8jt3Bv6EFgu4ClojhwMB7uJhsHrPbzujhoioPt/Audp27x+zr8wIDAQABo1AwTjAdBgNVHQ4EFgQUqzCIMzUSSz10ICvF8aUDSBacbgUwHwYDVR0jBBgwFoAUqzCIMzUSSz10ICvF8aUDSBacbgUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA4JBwcUBfByuoQBa4DVI/iwroNUlKcft6tXS4315MB7QRJRpT3EL3JKI9XVN52ygiQ7okMxQIHQJjpOEq5k1czPe5WnicO02np9mNnJVK6VVJ/GXi2C/Ucp8UniwG0dVQanFIrajoz93xa/1nvVpVNztSGEm2A7tSc2Ch78XyCUFjbVN/OYm3I+sK2rzKvLTzbpG0W7YzZxUkdsa9trYFnX/1wELsqrYgFQGisJ+cMXU6m5lKOSuxcgPZgcWab7JkqTiW91GwbdlKwpvHsFlr1O352KVG8OtY5fNFjodsqAQ/BCZ2ZhSlDJUK23aRbc1ntTl6USfXH7gEI/6pKbKqLw==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.exammonitor.dk/module.php/saml/sp/saml2-logout.php/login"/>
+ <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://login.exammonitor.dk/module.php/saml/sp/saml2-acs.php/login" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.exammonitor.dk/module.php/saml/sp/saml1-acs.php/login" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.exammonitor.dk/module.php/saml/sp/saml2-acs.php/login" index="2"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="da">Exam Monitor</md:ServiceName>
+ <md:ServiceName xml:lang="en">Exam Monitor</md:ServiceName>
+ <md:ServiceDescription xml:lang="da">Formålet er at brugerne får adgang til at starte et system som overvåger deres digitale eksamen.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">The purpose is to enable users to start a system that will monitor their digital exam.</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="da">Syddansk Universitet</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University of Southern Denmark</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="da">Syddansk Universitet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Southern Denmark</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.sdu.dk</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Lasse Birnbaum Jensen</md:GivenName>
+ <md:EmailAddress>lasse@sdu.dk</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml b/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
index 9263cd89..3a11252e 100644
--- a/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
+++ b/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
@@ -4,9 +4,9 @@
<md:Extensions>
<shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
<mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">University of Helsinki</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Helsingin yliopisto</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Helsingfors universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Helsinki</mdui:DisplayName>
</mdui:UIInfo>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
index c06a056c..b8217741 100644
--- a/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
@@ -1,9 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://logout.uwasa.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://logout.uwasa.fi/idp/shibboleth">
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
<md:Extensions>
<shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
<shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="fi">Vaasan yliopisto</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Vaasa</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Vasa Universitet</mdui:DisplayName>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:DomainHint>uwasa.fi</mdui:DomainHint>
+ </mdui:DiscoHints>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
@@ -40,53 +48,9 @@ yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://logout.uwasa.fi/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://logout.uwasa.fi/idp/profile/SAML2/POST/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logout.uwasa.fi/idp/profile/SAML2/Redirect/SSO"/>
</md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
- <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
-bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
-pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
-jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
-V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
-8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
-4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
-tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
-BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
-LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
-c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
-9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
-StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
-+4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
-6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
-ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
-yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logout.uwasa.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logout.uwasa.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="fi">Vaasan yliopisto</md:OrganizationName>
<md:OrganizationName xml:lang="en">University of Vaasa</md:OrganizationName>
diff --git a/swamid-interfederations-1.0/repo.clarino.uib.no-shibboleth-sp.xml b/swamid-interfederations-1.0/repo.clarino.uib.no-shibboleth-sp.xml
new file mode 100644
index 00000000..ddc91122
--- /dev/null
+++ b/swamid-interfederations-1.0/repo.clarino.uib.no-shibboleth-sp.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://repo.clarino.uib.no/shibboleth/sp">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://repo.clarino.uib.no/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">CLARINO Bergen Repository</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">CLARINO Bergen Repository</mdui:DisplayName>
+ <mdui:Description xml:lang="en">The CLARINO Bergen Repository at the University of Bergen</mdui:Description>
+ <mdui:Logo height="165" width="460">https://clarino.uib.no/images/clarino_duo-460.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="fi">https://repo.clarino.uib.no/xmlui/page/about</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">https://repo.clarino.uib.no/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAP5/Ri7rxa/LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3JlcG8uY2x
+hcmluby51aWIubm8wHhcNMTQxMjE4MDkwNTE1WhcNMjQxMjE1MDkwNTE1WjAeMRwwGgYDVQQDExNyZX
+BvLmNsYXJpbm8udWliLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2OVEwzYCig35I
+i37Buky/t7KWlNUEkGPE2WbfBiSPM2Iw+FIYGrpZ8KIt6qloN19vKwy8m53Asbba477R8CEx0zNQEHP
+fq35vPDxDj2xLN+xvRuk6s6KbZ2eKvV6Vov2vDtOt7kw8gDFUOJd+SdOe+ROdiuV/DbOjpwsW68GdD
+pLWHmKSqXqk8fwCdoc0Imwic5sSfc2LPjAqu95aIb7CiAh8sOg26XKik6Fjibj48l3aVxtIMGJf30Jt
+S1SqnKgqmQoO6opBGnaCF4huNa44JYUSF5CQZ3c4nRxupv2tp696H7lLH3XOI81dsrAVXEwt1q2D8Fz
+NlT+U0AeFaRhbwIDAQABo0EwPzAeBgNVHREEFzAVghNyZXBvLmNsYXJpbm8udWliLm5vMB0GA1UdDgQ
+WBBQaN4I1A6h9Jlo90nhGCWfw3EpT4jANBgkqhkiG9w0BAQUFAAOCAQEADsJ1zgUqZqgnq4gUz/z3N
++5bieEYEZUJnaQ78a3erdYYLETE/PBrN0QUIGR3M2DhjCi0s00QuVFa1JqXIK3dR4ndo5Yv4hV/fVhD
+IZ4mVIUQPBcTRk1om9/gl1fdmRD+YpvhUSzvheLRBsQOyz2syxGRIPwu6LexWb8YbZtcvtWU4ZGwm91
+KXDerV8J05m4X5rv4HZi0MAS349VztNRgm6CrMBfiQUxQw5Gqsiuyf3rpzQLslEWEmP4AuoiUvlXiWq
+W+fDKhDhj2vlc80jOCrQaG00xvCbXSg91K+Xxj1kXjArfX4R7aB1TquBqLoFbPo0lNooYBECv+bN2q
+rYzidg==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="fi">CLARINO Bergen Repository</md:ServiceName>
+ <md:ServiceName xml:lang="en">CLARINO Bergen Repository</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">The CLARINO Bergen Repository at the University of Bergen</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Oyvind Liland</md:GivenName>
+ <md:SurName>Gjesdal</md:SurName>
+ <md:EmailAddress>mailto:dst@uib.no</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Oyvind Liland</md:GivenName>
+ <md:SurName>Gjesdal</md:SurName>
+ <md:EmailAddress>mailto:oyvind.gjesdal@uib.no</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Hemed</md:GivenName>
+ <md:SurName>Al Ruwehy</md:SurName>
+ <md:EmailAddress>mailto:hemed.ruwehy@uib.no</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml
index ae45d161..02c807da 100644
--- a/swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml
@@ -9,8 +9,8 @@
<mdui:Description xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</mdui:Description>
<mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</mdui:Description>
<mdui:Logo height="194" width="189">https://corpus1.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
- <mdui:PrivacyStatementURL xml:lang="en">http://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="fi">http://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
@@ -20,37 +20,25 @@
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHFy/hnqc8wTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
-MDI1MThaFw0xOTAyMjcxMDI1MThaMIGkMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
-R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
-Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
-ZXIgUHN5Y2hvbGluZ3Vpc3RpazEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGbPWbCx1FfjX9sh831NEW6MHN
-VSd9DElQH+1eAqevdt5g6sLCK4HTsigUkl94MdiaLzDwVngYoJ/QwycncE0bFFxg
-H0YHs8URXAOfkO9RmKy4x6TkuYElF8AmBnnEhoF58O1b/0DG8TdSpmWsMBrw+lyB
-gV++v15+WjuHn4DdXbG3AaaUMNYWPSk4fIvjPX19U9ys0euYcKa/kTU8nFuOJzVy
-WmUyNWjcgwImszfwwKaumIGDHGKSJ9eME/idNczuUhihY/kgU30+x4yfQ0PPJ6y1
-YLd+E2xAOmbjEbBnytkbRPVxHAPqw0py80meld2s70Cxxklj739+oP+++PwhAgMB
-AAGjggI/MIICOzA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEE
-AYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUE8+HM0pUcvXN
-4uBiDV/q2xwu2O8wHwYDVR0jBBgwFoAUAtYebgmrv1hlpwo8SDNh0c59w1swRAYD
-VR0RBD0wO4IOY29ycHVzMS5tcGkubmyCDGx1eDA3Lm1waS5ubIEbdG9iaWFzLnZh
-bnZhbGtlbmhvZWZAbXBpLm5sMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
-KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
-hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAGH5IPCi3tfYwo+CN357NdkGav1KQT2
-T0sjZ2chg//8SNucof42LXWvMlRIaRXjFP2bTW8sPt3hNwPyVLLAUFE/ogRz955Y
-a4Fbx/0bS1XZSCCneQ+pP+gnfad0AA3PJ2fDb/LUQ43q8xu8B1tm9GyTz6sE2mjU
-c0GOYUp4wvC/Hu3Wr1/80KbebBX5QxQPg9CVqXaz8yECpZwrTJsa3d+pY8WVA6Fr
-/0vQmp9LyYl9II3xrP5KMkLFWfusAqfDQbO+l0q44mGImEee3G4Wkg7VAcwDgKBa
-LHbuhlrBzMoxQBZGyW4eOToiuysyE37dSKtUgCs4vDN4S4EWz90Y6xY=</ds:X509Certificate>
+ <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
+YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
+MAkGA1UEBhMCTkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzAN
+BgNVBAoTBk1QSS1QTDEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwxHjAcBgkqhkiG
+9w0BCQEWD2xhdGFkbWluQG1waS5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMFrApun/KXB9YtFiT49PHz7uV9EoVmrFsCBNqVWYhM+msq2dkM7rNVe
+eZdy2hHID72ILMeqeXKX+hFQPyX18eN4L6lfJzzJJI2HGdIuGPyKZXCsVrCqnIWo
+VPRi5dnTlCpCEPhebt05L9TMQJrLWue2qDhhdwkaYrVfm+tsYGK9yiy3Gbsoa10L
+kEpd2oJZLDGHXSZJ6GL4oUMbQ+Z9bIjCelQWC4tU/u6qFGIzyoabaJbAlnFAxFSq
+DIQ9+27JObXMnVH/6iK0mhHTooB72Gd0LQHVHGiCrFyxmbhMp7tIX0vU3Qn4/U8F
+kt/Kep3+Wam/1h1NmmOJzTux2NuRurcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+YPPRnb1/92C/Si/V5I15TfFSTdOeMcVHQ0DY0ohUw8B4fEbr9htjZoW7Umyco5pF
+kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
+t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
+uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
+FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
+vKRir2Cb6A/NaScKNHBBhg==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-interfederations-1.0/terena.org-sp.xml b/swamid-interfederations-1.0/terena.org-sp.xml
index 32995ffc..449f6516 100644
--- a/swamid-interfederations-1.0/terena.org-sp.xml
+++ b/swamid-interfederations-1.0/terena.org-sp.xml
@@ -1,9 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
<md:Extensions>
<mdrpi:RegistrationInfo registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes>
+ <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml b/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
index 8b7b2688..f9b68761 100644
--- a/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
+++ b/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
@@ -8,8 +8,8 @@
<mdui:DisplayName xml:lang="fi">LINDAT/CLARIN säilytyspaikka ja palvelut</mdui:DisplayName>
<mdui:Description xml:lang="fi">LINDAT/CLARIN-projektin säilytyspaikka, jonka sijainti on \"Institute of Formal and Applied Linguistics\", Kaarlen yliopisto, Praha.</mdui:Description>
<mdui:Description xml:lang="en">The repository of the LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Charles University in Prague.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
<mdui:InformationURL xml:lang="fi">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="fi">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
@@ -21,31 +21,26 @@
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjEwMjQwMDAwMDBaFw0xNTEwMjQyMzU5NTlaMFUxCzAJBgNV
-BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMR8w
-HQYDVQQDExZ1ZmFsLXBvaW50Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAz4nCZa/xBh1ebd2+99GEqRMSqSkCEVfFi4Tndz6v87Iv
-ZMvLY40OJg3lIEzngOz8tnn/ft6xcLxGwr+IbY6raHT08Xu8lQMd8Rj8Gmdi3Ov3
-XuCgjVpAID+GGfNkahzxebWORNfHyqEGSx2oFgRe8HD9BbT8mqheBPF8FIy6mYvs
-495IEkQVc0BvPvTwqEw+qOHKBX+AWQQIHDJDQQnjoteXplHugOFDJiJYH0T/80u3
-DO7h6oyiLlnyDywOVCQdiJPXNOtPMyM9rMT3Vw9SO4iIaMUkF5EafFFdEPLsi+FO
-2Z3r7pBxv1/LkK9AWuzAYSnjK/szHym25FWroxJZOwIDAQABo4IBaTCCAWUwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKKMnXN92GaN
-5uyL8cZdchPl9NpQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiCFnVmYWwt
-cG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAKWQZsd0zZBi+hz6
-3LBx49MOoCXkpUkIdqecMhz0bpIhC+2Q3Uxp97lpfB/9CIMoI5tq+PRXDXQt2D6A
-fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
-k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
-sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
-adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
-IhAZYQU=</ds:X509Certificate>
+ <ds:X509Certificate>MIIEijCCA3KgAwIBAgIRAJealheT4/uwZyfUIGi6scwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhM
+CTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzEyMTgwMDAwMD
+BaFw0xNjEyMTcyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA
+1UEAxMSbGluZGF0Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxeKm
+DjOkone5YWIlKyQ1OeN9lgJ6yAiiiCY87Gl8o9773E1MCe8BqKF/whN9orwy54pznUFXK0kTxCVVXh
+VUJYqMt7w/PbY9su5x8RECYOUgHKXDVikovtTZYoQgwQNY56+C+t2TmSf1LYxEjArX4epGZ/Vy6HtKf
+Rw2xCvaj43Z3pUjqIf2d4GDM88C4Nece2HehkjDRJ099AMDnk2eK/zyoiGNFR2RLe06FvnoS0soVFAF
+7vr+4MjFHnJByCKgA0WYdIz/j7U+EqarX60Fvr8z58zK17pnB8JZAHd/qX2qJmu+JlIPYt4mBYXcsZ6
+3M0eLIHv9EBLqLXO5PQ3OGwIDAQABo4IBhzCCAYMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6
+pDjue0wHQYDVR0OBBYEFHy58QqIvxQw/MKvdVXYEfd5NMdrMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMB
+Af8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjE
+BAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1
+RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGV
+yZW5hLm9yZzA1BgNVHREELjAsghJsaW5kYXQubWZmLmN1bmkuY3qCFnVmYWwtcG9pbnQubWZmLmN1bm
+kuY3owDQYJKoZIhvcNAQEFBQADggEBAIxjYtINQkxYADOr/MqkSmNZzGi3VhmacPQuwfP7qwi5vWZyP
+6DXrlWgXDQorOfl6/RmLzb1LHwwyJdEUknCxU1AahKDsyG3fiSMOTD/t21RI9mbTCA1rtk0d4nXdJ3b
+KCb0dccRmt5CwbScCQfjsIjWvdkxoMlVIe6DgoqUlLILqSk/drjKpKGOYMZuPXS8zgNeEFw6XzWMKS
+gkB0QFX2WUCVuhWfejJ6OhUkH6S5Bh+p5WPKJ7bM4E6UrfaleieSr7mfwH8VeBwoL+rL1n6xqndwwqA
+nzWtFPAO/hBIuOwkucYl85fBqXT0de7g8fIw7btiALZ/UygiLnb3oX/q0Q=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml b/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml
new file mode 100644
index 00000000..1af32e7c
--- /dev/null
+++ b/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:mace:feide.no:services:no.uio.galaxy-test">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2015-10-15T13:47:32Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Galaxy Bioportal UiO test</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Galaxy server at UiO</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIICbTCCAdYCCQDXiijSZIJdujANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJO
+TzENMAsGA1UEBwwET3NsbzENMAsGA1UECgwEVVNJVDELMAkGA1UECwwCVkQxGzAZ
+BgNVBAMMEmdhbGF4eS10ZXN0LnVpby5ubzEkMCIGCSqGSIb3DQEJARYVbi5hLnZh
+em92QHVzaXQudWlvLm5vMB4XDTEzMDExNTEwNTAwM1oXDTI2MDkyNDEwNTAwM1ow
+ezELMAkGA1UEBhMCTk8xDTALBgNVBAcMBE9zbG8xDTALBgNVBAoMBFVTSVQxCzAJ
+BgNVBAsMAlZEMRswGQYDVQQDDBJnYWxheHktdGVzdC51aW8ubm8xJDAiBgkqhkiG
+9w0BCQEWFW4uYS52YXpvdkB1c2l0LnVpby5ubzCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEAxhQJULqEK0BwR7N5r1VYHj1ZiGREBT9msBDDmMvU1p1UqWIUmLRy
+I/1pn775zdl9qjCQ7VTFjp3SkdZiEnjR4wOyFjpQzs/yneu3SAoFF/tRKrFoTgvt
+jGOb3VDmKHGr1Ygb6wDMoit9rAXD+gM7sjO6TDU1C4l+E2Dk3lUln4UCAwEAATAN
+BgkqhkiG9w0BAQUFAAOBgQCqryzoZSredMYi1vLz6jg0TD9WdedYqVFdKWsmfxsb
+434A6SMEWkt3ql4s1bH3UD9IjK/+KuviVyka3pj3LW347bFOm2sEwwvVHGlAXbzx
+ZFql6Vk1Bc+qGGOsgTK4pM3Xq/etRr0Fjp52YllAQC8DYEbo/UWf0HWGYLPTc4bb
+Ag==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIICbTCCAdYCCQDXiijSZIJdujANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJO
+TzENMAsGA1UEBwwET3NsbzENMAsGA1UECgwEVVNJVDELMAkGA1UECwwCVkQxGzAZ
+BgNVBAMMEmdhbGF4eS10ZXN0LnVpby5ubzEkMCIGCSqGSIb3DQEJARYVbi5hLnZh
+em92QHVzaXQudWlvLm5vMB4XDTEzMDExNTEwNTAwM1oXDTI2MDkyNDEwNTAwM1ow
+ezELMAkGA1UEBhMCTk8xDTALBgNVBAcMBE9zbG8xDTALBgNVBAoMBFVTSVQxCzAJ
+BgNVBAsMAlZEMRswGQYDVQQDDBJnYWxheHktdGVzdC51aW8ubm8xJDAiBgkqhkiG
+9w0BCQEWFW4uYS52YXpvdkB1c2l0LnVpby5ubzCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEAxhQJULqEK0BwR7N5r1VYHj1ZiGREBT9msBDDmMvU1p1UqWIUmLRy
+I/1pn775zdl9qjCQ7VTFjp3SkdZiEnjR4wOyFjpQzs/yneu3SAoFF/tRKrFoTgvt
+jGOb3VDmKHGr1Ygb6wDMoit9rAXD+gM7sjO6TDU1C4l+E2Dk3lUln4UCAwEAATAN
+BgkqhkiG9w0BAQUFAAOBgQCqryzoZSredMYi1vLz6jg0TD9WdedYqVFdKWsmfxsb
+434A6SMEWkt3ql4s1bH3UD9IjK/+KuviVyka3pj3LW347bFOm2sEwwvVHGlAXbzx
+ZFql6Vk1Bc+qGGOsgTK4pM3Xq/etRr0Fjp52YllAQC8DYEbo/UWf0HWGYLPTc4bb
+Ag==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://galaxy-test.uio.no/user/logout_feide_user"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://galaxy-test.uio.no/user/feide_auth" index="1"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">Galaxy Bioportal UiO test</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Galaxy server at UiO</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
+ <md:OrganizationName xml:lang="no">Universitetet i Oslo</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="no">Universitet i Oslo</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uio.no/english/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="no">http://www.uio.no/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Nikolay</md:GivenName>
+ <md:SurName>Vazov</md:SurName>
+ <md:EmailAddress>n.a.vazov@usit.uio.no</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml b/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
new file mode 100644
index 00000000..c4f54fe2
--- /dev/null
+++ b/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:mace:feide.no:services:no.uio.hpc.lap">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2015-10-08T12:37:20Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Language Analysis Portal (LAP)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="no">Språkanalyseportalen (LAP)</mdui:DisplayName>
+ <mdui:Description xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
+ centralized repository of a wide range of language technology tools, all installed on a high-performance
+ computing cluster.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
+aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
+qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
+iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
+GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
+a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
+p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
+RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
+SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
+XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
+5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
+58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
+Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
+agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
+aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
+qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
+iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
+GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
+a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
+p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
+RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
+SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
+XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
+5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
+58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
+Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
+agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lap.hpc.uio.no/user/logout_feide_user"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap.hpc.uio.no/user/feide_auth" index="0"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">Language Analysis Portal (LAP)</md:ServiceName>
+ <md:ServiceName xml:lang="no">Språkanalyseportalen (LAP)</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
+ centralized repository of a wide range of language technology tools, all installed on a high-performance
+ computing cluster.</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
+ <md:OrganizationName xml:lang="no">Universitetet i Oslo</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="no">Universitet i Oslo</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uio.no/english/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="no">http://www.uio.no/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Nikolay</md:GivenName>
+ <md:SurName>Vazov</md:SurName>
+ <md:EmailAddress>n.a.vazov@usit.uio.no</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index 348d8463..1057424e 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -34,7 +34,6 @@
<shibmd:Scope regexp="false">its.itsf.dk</shibmd:Scope>
<shibmd:Scope regexp="false">sikker-adgang.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ibc.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">natmus.dk</shibmd:Scope>
<shibmd:Scope regexp="false">rungsted-gym.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ucsj.dk</shibmd:Scope>
<shibmd:Scope regexp="false">sosuc.cphwest.dk</shibmd:Scope>
@@ -48,13 +47,11 @@
<shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
<shibmd:Scope regexp="false">cbs.dk</shibmd:Scope>
<shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ku.dk</shibmd:Scope>
<shibmd:Scope regexp="false">kristne-gym.dk</shibmd:Scope>
<shibmd:Scope regexp="false">dsn.dk</shibmd:Scope>
<shibmd:Scope regexp="false">vordingborg-gym.dk</shibmd:Scope>
<shibmd:Scope regexp="false">dmjx.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">hasseris-gym.dk</shibmd:Scope>
<shibmd:Scope regexp="false">apoteket.dk</shibmd:Scope>
<shibmd:Scope regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
<shibmd:Scope regexp="false">kadk.dk</shibmd:Scope>
@@ -79,21 +76,20 @@
<shibmd:Scope regexp="false">eadania.dk</shibmd:Scope>
<shibmd:Scope regexp="false">dansidp.stads.dk</shibmd:Scope>
<shibmd:Scope regexp="false">umit.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">campusvejle.dk</shibmd:Scope>
<shibmd:Scope regexp="false">rosborg-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">fhavnhs.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ah.dk</shibmd:Scope>
<shibmd:Scope regexp="false">basyd.dk</shibmd:Scope>
<shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
<shibmd:Scope regexp="false">eamv.dk</shibmd:Scope>
<shibmd:Scope regexp="false">aams.dk</shibmd:Scope>
<shibmd:Scope regexp="false">regionsjaelland.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
<shibmd:Scope regexp="false">fms.dk</shibmd:Scope>
<shibmd:Scope regexp="false">smk.dk</shibmd:Scope>
<shibmd:Scope regexp="false">msk.dk</shibmd:Scope>
<shibmd:Scope regexp="false">drcmr.dk</shibmd:Scope>
<shibmd:Scope regexp="false">simac.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">this.is.not.a.valid.idp</shibmd:Scope>
<shibmd:Scope regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/www.nederlab.nl-shibboleth.xml b/swamid-interfederations-1.0/www.nederlab.nl-shibboleth.xml
new file mode 100644
index 00000000..33fde50d
--- /dev/null
+++ b/swamid-interfederations-1.0/www.nederlab.nl-shibboleth.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.nederlab.nl/shibboleth">
+ <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://www.nederlab.nl/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Meertens Institute Nederlab</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Meertens Instituutti Nederlab</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This Service Provider regulates access to the Nederlab research environment</mdui:Description>
+ <mdui:Description xml:lang="fi">Tämä Palveluntarjoaja säätelee pääsyäNederlab tutkimusympäristö</mdui:Description>
+ <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Meertens research documentation language culture humanities Nederlab</mdui:Keywords>
+ <mdui:InformationURL xml:lang="fi">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">https://www.meertens.knaw.nl/cms/collections/data-protection</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>MIIGBTCCA+2gAwIBAgIJAIGzep3p2hjqMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYDVQQGEwJOTDEWMBQ
+GA1UECAwNTm9vcmQgSG9sbGFuZDESMBAGA1UEBwwJQW1zdGVyZGFtMREwDwYDVQQKDAhNZWVydGVucz
+EMMAoGA1UECwwDSSZBMRgwFgYDVQQDDA93d3cubmVkZXJsYWIubmwxIjAgBgkqhkiG9w0BCQEWE3Nlc
+nZpY2VkZXNrQGtuYXcubmwwHhcNMTQwNzE3MTIxMDUzWhcNMjQwNzE0MTIxMDUzWjCBmDELMAkGA1UE
+BhMCTkwxFjAUBgNVBAgMDU5vb3JkIEhvbGxhbmQxEjAQBgNVBAcMCUFtc3RlcmRhbTERMA8GA1UECg
+wITWVlcnRlbnMxDDAKBgNVBAsMA0kmQTEYMBYGA1UEAwwPd3d3Lm5lZGVybGFiLm5sMSIwIAYJKoZIh
+vcNAQkBFhNzZXJ2aWNlZGVza0BrbmF3Lm5sMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
+23RweYXXwA9mGVNYCpfxOOMcHGsGjCB/rdCHJ9REW3fmdmKn3Rtm9jxI3W/3AneMuE4s+QUog3ec2+i
+HuOvSYFZxSNybqaqZMSTB2IddNPoQiaWV/NNQXC8Cl/BBdCal3TM82R6HgfL3cSFcbq9JPIrhTeRfU
+9QhO7guGKooZGd/emC5GgM4iXowI+UenTHcPVj2eEpCEvigOzBYxY9S9u2nyV26sROTLKRTu8q+uZ92
+YmDbL07oqhmVX7LAjanO/0PcG6Cvhv5m57vyEt4CwzsfmqBswSQSPBSUXRCOeRXh6dvU2Zg2+9+gS4D
+1VjWDRuSjibQV5BvvbtRe6aVm4TC6llySlKw/+WQHKiJF6JgLK8vCg8PWlVPRDskCMEa1z/uwdN4aIb
+43xsyu6RzzDti5Qjgiy3dMK7ARrIKoByF289lw9PR2w6/YGiefgzdp5DVSM6XSax6+4MnpQhd9FrnI
+aW16bvErETJIV8folcTivazGf6pA9/5esJCzZjr4cxAkC22HysNsVHVZpdp+6oqGObeOQ9YflT/0Mp3
+jZbzANAXHADZCLmqO0pqb8xC5gpd1ITvIWIndgy8M2BWz+QtEFVK4Vf/ynjaOp6e+ZFrszdne/d8VRR
+pUnFpDOHsGsi6uuT/3N13WjQmEYNxOfCSTIkIAwi8mVQbhD5ARy48CAwEAAaNQME4wHQYDVR0OBBYEF
+PU7oll5Mreed7gM0ubxwNxhJWb9MB8GA1UdIwQYMBaAFPU7oll5Mreed7gM0ubxwNxhJWb9MAwGA1Ud
+EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBACaAhHAW5xNKt9bjOBk3Sr5Tj0x5puRozg+B5RgNQi
+WR8PIBMCgn1RPGHKXHKbNP4M6b/MWXsmo5VBBcv4ofZW2jlwnonu0baKHNpxhV4xbF1oYicGHN25Uw/
+VbJFljCHOGy2k+UFpSHAOm0kp67wYo/4p7yy4oq5twu1tPDlURwlOcjA8g/2m1ym2j3pNLcyKKWhvzU
+zUvq4SM3IHZ8RR0OLwBBim7kAW6/jydmTX8/EVgFnwh1gkWm5w01ok+5Zy+NhMeqpFixL848pLmOdh8
+L7r4RYbmD8iQKrBgI8dpVTtZLgkEfh3IsDB9vwwyEqkdRXTwLLxCnjyEapp1s13mTjo86Fx6jL0V2b
+WOEZiQqFObmI1GJOqCwx9Fiot5zyUpZ9cTTOufwo5dsL4SLpuDPXCOcgZ7PZn7P9mTNyK5bm454f/Y4
+lYVZyOLp0hUVrKkXSdOPap2QqO5Hcui6wvCMENKaZrP4VckqI0UohXM40SjP5Q9f6od6NevvBBg2R/7
+amAkXXm/MtGEpYtauZZp/XvBWEw3UanLI4k0jYr3bxxk2d325UpxVKnKp+vaIRli99xYLLroaiolrj8
+k981I4u1gBoEGD728wR2l94IA0c+LxNkOwwv4cwsnqO6QKeENxz/eN6RXVcrO1U7ZS2qVvKgQ9sORu
+7Hwjg9MqBq4i</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/POST" index="1" isDefault="true"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="fi">Meertens Instituutti Nederlab</md:ServiceName>
+ <md:ServiceName xml:lang="en">Meertens Institute Nederlab</md:ServiceName>
+ <md:ServiceDescription xml:lang="fi">Tama Palveluntarjoaja saatelee paasyaNederlab tutkimusymparisto</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Nederlab research environment</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Marc</md:GivenName>
+ <md:SurName>Kemps-Snijders</md:SurName>
+ <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Marc</md:GivenName>
+ <md:SurName>Kemps-Snijders</md:SurName>
+ <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>KNAW</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/www.ordbogen.com.xml b/swamid-interfederations-1.0/www.ordbogen.com.xml
index db7a8295..3fa5a3e5 100644
--- a/swamid-interfederations-1.0/www.ordbogen.com.xml
+++ b/swamid-interfederations-1.0/www.ordbogen.com.xml
@@ -29,6 +29,7 @@
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ordbogen.com//singlesignon/simplesamlphp/saml2/sp/SingleLogoutService.php"/>
<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://www.ordbogen.com//singlesignon/simplesamlphp/saml2/sp/AssertionConsumerService.php" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lemma.com/wayf/response/login" index="1"/>
<md:AttributeConsumingService index="1" isDefault="true">
<md:ServiceName xml:lang="da">Ordbogen.com</md:ServiceName>
<md:ServiceName xml:lang="en">Ordbogen.com</md:ServiceName>
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 9ea80011..f68149d0 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -1,8 +1,10 @@
<?xml version="1.0"?>
<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-interfederations-2.0.xml">
+<xi:include href="swamid-interfederations-2.0/1010SE17FAM-V03.famerp.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/2013.qmplus.qmul.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/2014.qmplus.qmul.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/44uoc-shib.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml"/>
<xi:include href="swamid-interfederations-2.0/aai.certh.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai.helmholtz-muenchen.de-idp-shibboleth.xml"/>
@@ -11,8 +13,10 @@
<xi:include href="swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-login.hsr.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-login.phsg.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.ethz.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml"/>
@@ -24,6 +28,7 @@
<xi:include href="swamid-interfederations-2.0/aai.rz.uni-leipzig.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aai.sztaki.hu-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai.unil.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/abcidp.askham-bryan.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/abertay.unidesk.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/abw-shib.hosted.exlibrisgroup.com-shib.xml"/>
@@ -39,6 +44,7 @@
<xi:include href="swamid-interfederations-2.0/acesso.ufabc.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/acm.jordanpublishing.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/activation.glew.org.uk.xml"/>
+<xi:include href="swamid-interfederations-2.0/adfs01.kempel.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs1.oba.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs20.hva.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/adfs2.cito.nl-adfs-services-trust.xml"/>
@@ -69,11 +75,13 @@
<xi:include href="swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/admin.webfiltering.ja.net-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/afbi-shib.ads.qub.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/afire.asnet.am-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/agenda.ct.infn.it-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/agw-sparknet.utu.fi.xml"/>
<xi:include href="swamid-interfederations-2.0/aishib.agropolis.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aiwip.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/alnbmth.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/alpha.bobnational.net-entityid.xml"/>
@@ -97,6 +105,7 @@
<xi:include href="swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/arts.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ashiok.ufpe.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/astonsu-voting.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/athens.bruford.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/athens.gcc.ac.uk-oala-metadata.xml"/>
@@ -109,6 +118,7 @@
<xi:include href="swamid-interfederations-2.0/athensri.forthvalley.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/atlases.muni.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/atlas.sciencespo-lille.eu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml"/>
@@ -135,9 +145,14 @@
<xi:include href="swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/avbmth.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/b2access.eudat.eu-8443-unitygw-saml-sp-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/bathspa.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/bathspa.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bath-test.topdesk.net-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.xml"/>
<xi:include href="swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/beaumontcollege.org-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/beta.aip.pub2web.ingenta.com-shibboleth.xml"/>
@@ -163,6 +178,7 @@
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml"/>
@@ -235,6 +251,7 @@
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/bismarck.nyme.hu-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/bmcidp.brooksbymelton.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bm.stars.manchester.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bmthbs.sisoshibboleth.co.uk-entity.xml"/>
@@ -247,6 +264,7 @@
<xi:include href="swamid-interfederations-2.0/bolton.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/booksandjournals.brillonline.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/brad.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/brain.lab.vvc.niif.hu-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/bristol-shib.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/brunelstudents.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/bsp-idp.shibboleth.ox.ac.uk-shibboleth.xml"/>
@@ -258,8 +276,11 @@
<xi:include href="swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.cnen.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.cp2.g12.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.furg.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ibict.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml"/>
@@ -268,7 +289,10 @@
<xi:include href="swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.int.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.mcti.gov.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.pucgoias.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml"/>
@@ -301,10 +325,13 @@
<xi:include href="swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml"/>
<xi:include href="swamid-interfederations-2.0/cavle.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ccm.copac.jisc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/census.mimas.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cerealchemistry.aaccnet.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cern.ch-login.xml"/>
+<xi:include href="swamid-interfederations-2.0/cgticafe.fiocruz.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/childcare.uas.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/childes.talkbank.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/chronicle.bufvc.ac.uk-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/ck.olmstaging.com-oa-metadata.xml"/>
@@ -318,6 +345,7 @@
<xi:include href="swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/cmi-nuig.calpendo.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/cmu-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/coco.aai.niif.hu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/colaboratorio.redclara.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml"/>
@@ -335,6 +363,7 @@
<xi:include href="swamid-interfederations-2.0/copaiba.unifesspa.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/courses.sci-gaia.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/coventry.ac.uk-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/crowd.it.helsinki.fi-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/crowdskills.ncl.ac.uk-shibboleth-metadata.xml"/>
@@ -353,12 +382,14 @@
<xi:include href="swamid-interfederations-2.0/decbmth.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/demeter.wp.swov.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/demo.eduopen.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dep.s2dv.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dep.software2.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev2.qmplus.qmul.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev2.webauth.soton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.aiwip.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/devapp.shibstats.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.atomwide.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.british-history.ac.uk-shibboleth.xml"/>
@@ -367,10 +398,12 @@
<xi:include href="swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.keynote.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.k-int.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.niif.hu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.overtsoftware.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.pf.adidas.com.xml"/>
<xi:include href="swamid-interfederations-2.0/dev.qmplus.qmul.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/devsaas.topdeskdev.net-tas-secure-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.scotlandonscreen.org.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dev-sso.knewknovel.com-entry-uk_federation-Metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/digital-library.theiet.org-shibboleth.xml"/>
@@ -396,6 +429,9 @@
<xi:include href="swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/drupal-pilot-web-01.it.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/drupal-pilot-web-02.it.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/dspace.jorum.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/duck-dev.bournemouth.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/du-idp.lanet.lv.xml"/>
@@ -404,12 +440,14 @@
<xi:include href="swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ec1.educationcity.com-sso-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/eco2meter.grnet.gr-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/edgehill.idm.oclc.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/edi.izum.si-idp-20100722.xml"/>
<xi:include href="swamid-interfederations-2.0/edinaidp.edina.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/edinburghcollege.cirqahosting.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/edited.com.xml"/>
<xi:include href="swamid-interfederations-2.0/edocs.bathspa.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.xml"/>
<xi:include href="swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml"/>
@@ -420,12 +458,14 @@
<xi:include href="swamid-interfederations-2.0/ed.unidesk.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/eduroam.frizerska.si.xml"/>
<xi:include href="swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/eduspot-n.oca.eu-authsaml2-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml"/>
<xi:include href="swamid-interfederations-2.0/edu.xtremeinformation.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/efoyer.glam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/eka-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/ekrksso.keeleressursid.ee-simplesaml-module.php-saml-sp-metadata.php-ekrk-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/elibrary.exeter.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/elibrary.worldbank.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml"/>
@@ -438,6 +478,7 @@
<xi:include href="swamid-interfederations-2.0/endicott.law.ox.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/endo-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/engine.eduteams.org-authentication-sp-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/engine.elixir-czech.org-authentication-sp-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/engine.t.eduteams.org-authentication-sp-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
@@ -469,6 +510,7 @@
<xi:include href="swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/federatie.umcn.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.ac-strasbourg.fr-idp-shibboleth.xml"/>
@@ -477,6 +519,8 @@
<xi:include href="swamid-interfederations-2.0/federation.bsigroup.com-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.citylit.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml"/>
@@ -531,6 +575,7 @@
<xi:include href="swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gidp.federations.renam.md.xml"/>
<xi:include href="swamid-interfederations-2.0/gidp.geant.net.xml"/>
<xi:include href="swamid-interfederations-2.0/gimb-idp-1.gimb.org-idp-20130521.xml"/>
<xi:include href="swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml"/>
@@ -539,10 +584,12 @@
<xi:include href="swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/grnetbox.cti.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/groupes-aa.renater.fr.xml"/>
<xi:include href="swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml"/>
+<xi:include href="swamid-interfederations-2.0/groupes.renater.fr-sympa.xml"/>
<xi:include href="swamid-interfederations-2.0/g-shib.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/gteavirtual.org.xml"/>
<xi:include href="swamid-interfederations-2.0/guardian.otl.lstest.co.uk-shibboleth.xml"/>
@@ -561,9 +608,11 @@
<xi:include href="swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/hexaa.eduid.hu-hexaa.xml"/>
<xi:include href="swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml"/>
<xi:include href="swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/hstalks.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/iam.atypon.com-shibboleth.xml"/>
@@ -574,6 +623,7 @@
<xi:include href="swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml"/>
@@ -585,11 +635,13 @@
<xi:include href="swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/identites.enim.fr-idp-.xml"/>
<xi:include href="swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml"/>
<xi:include href="swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml"/>
@@ -598,6 +650,7 @@
<xi:include href="swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp0.abertay.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml"/>
@@ -619,6 +672,7 @@
<xi:include href="swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp2.kingston.ac.uk-shibboleth.xml"/>
@@ -628,13 +682,16 @@
<xi:include href="swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp4.halesowen.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aai.um.si-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aai.uni-mb.si-idp-20100614.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.abcolstudents.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml"/>
@@ -643,6 +700,7 @@
<xi:include href="swamid-interfederations-2.0/idp.amersham.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml"/>
@@ -653,12 +711,15 @@
<xi:include href="swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aua.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.bangor.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.barkingdagenhamcollege.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.barnetsouthgate.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.barnfield.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml"/>
@@ -689,6 +750,7 @@
<xi:include href="swamid-interfederations-2.0/idp.cambria.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.camosun.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.candi.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml"/>
@@ -746,6 +808,7 @@
<xi:include href="swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cumbria.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml"/>
@@ -775,6 +838,7 @@
<xi:include href="swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth-devel.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml"/>
@@ -797,9 +861,11 @@
<xi:include href="swamid-interfederations-2.0/idp.esher.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.essingtoncc.co.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.esufa.edu.co-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.etrs.terre.defense.gouv.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.farn-ct.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.fccn.pt-idp-shibboleth.xml"/>
@@ -836,6 +902,7 @@
<xi:include href="swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hs-emden-leer.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml"/>
@@ -870,6 +937,7 @@
<xi:include href="swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.inshea.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml"/>
@@ -905,6 +973,7 @@
<xi:include href="swamid-interfederations-2.0/idp.le.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.lincoln.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.lit.ie-saml2.xml"/>
@@ -942,6 +1011,7 @@
<xi:include href="swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml"/>
@@ -963,6 +1033,7 @@
<xi:include href="swamid-interfederations-2.0/idp.oamk.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.osfc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.os-selnica.si-idp-20131118.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml"/>
@@ -971,6 +1042,7 @@
<xi:include href="swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.port.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml"/>
@@ -985,6 +1057,7 @@
<xi:include href="swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml"/>
@@ -993,6 +1066,7 @@
<xi:include href="swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.riversidecollege.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.rsmith.org.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml"/>
@@ -1001,6 +1075,7 @@
<xi:include href="swamid-interfederations-2.0/idp.sanger.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sccb.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml"/>
@@ -1025,6 +1100,7 @@
<xi:include href="swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.southampton-city.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.southport-college.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.south-thames.ac.uk-entity.xml"/>
@@ -1034,6 +1110,7 @@
<xi:include href="swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.staffordcoll.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.st-andrews.ac.uk-shibboleth.xml"/>
@@ -1042,6 +1119,7 @@
<xi:include href="swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.stephensoncoll.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.stmarysblackburn.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.stokesfc.ac.uk-idp-shibboleth.xml"/>
@@ -1064,7 +1142,9 @@
<xi:include href="swamid-interfederations-2.0/idp.tcat.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.teiath.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.teikoz.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.teimes.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.teipir.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml"/>
@@ -1125,6 +1205,7 @@
<xi:include href="swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.umoncton.ca-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml"/>
<xi:include href="swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml"/>
@@ -1133,6 +1214,7 @@
<xi:include href="swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uni-duesseldorf.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.xml"/>
@@ -1148,6 +1230,7 @@
<xi:include href="swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uni-tuebingen.de-shibboleth.xml"/>
@@ -1161,6 +1244,7 @@
<xi:include href="swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml"/>
@@ -1176,6 +1260,7 @@
<xi:include href="swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uolia.london.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uowm.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.upatras.gr-shibboleth-idp-.xml"/>
@@ -1195,9 +1280,12 @@
<xi:include href="swamid-interfederations-2.0/idp.uwl.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.uxbridge.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.vito.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.vsb.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml"/>
@@ -1225,13 +1313,17 @@
<xi:include href="swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml"/>
<xi:include href="swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.uni.lu-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/ifg-srv-cafe.ifg.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/iif.iucc.ac.il-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/informahealthcare.com-shibboleth.xml"/>
@@ -1248,6 +1340,7 @@
<xi:include href="swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/janus.cnrs.fr-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml"/>
@@ -1262,6 +1355,7 @@
<xi:include href="swamid-interfederations-2.0/kbplus.k-int.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/kclidp.kcl.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/keelesu.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/kentsso.simitive.com.xml"/>
<xi:include href="swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml"/>
@@ -1286,6 +1380,7 @@
<xi:include href="swamid-interfederations-2.0/lists.geant.org.xml"/>
<xi:include href="swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/lma-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml"/>
@@ -1299,6 +1394,7 @@
<xi:include href="swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml"/>
@@ -1313,6 +1409,7 @@
<xi:include href="swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-2.0/login.noa.gr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml"/>
@@ -1324,6 +1421,7 @@
<xi:include href="swamid-interfederations-2.0/login-test.st-andrews.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.tu.kielce.pl-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.uat.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/login.uea.ac.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml"/>
@@ -1340,6 +1438,7 @@
<xi:include href="swamid-interfederations-2.0/lu-idp.lu.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/lumii-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/manage.federations.renam.md.xml"/>
<xi:include href="swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml"/>
@@ -1359,6 +1458,7 @@
<xi:include href="swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/moodle.helsinki.fi-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml"/>
<xi:include href="swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml"/>
@@ -1371,11 +1471,13 @@
<xi:include href="swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml"/>
<xi:include href="swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml"/>
@@ -1384,11 +1486,13 @@
<xi:include href="swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oala-dev.leedsbeckett.ac.uk-oala.xml"/>
+<xi:include href="swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml"/>
<xi:include href="swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oala.uws.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oa.pep-web.org-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml"/>
<xi:include href="swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml"/>
@@ -1423,6 +1527,7 @@
<xi:include href="swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/perfsonarui.geant.org.xml"/>
<xi:include href="swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-shibboleth.xml"/>
@@ -1441,6 +1546,7 @@
<xi:include href="swamid-interfederations-2.0/primo.abdn.ac.uk-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml"/>
<xi:include href="swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/publishing.rcseng.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/pubs.aeaweb.org-shibboleth.xml"/>
@@ -1463,6 +1569,7 @@
<xi:include href="swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/rcse-prod.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
@@ -1477,6 +1584,7 @@
<xi:include href="swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/repository.abertay.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml"/>
@@ -1488,6 +1596,7 @@
<xi:include href="swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/rja-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/royalsocietypublishing.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml"/>
@@ -1513,16 +1622,19 @@
<xi:include href="swamid-interfederations-2.0/sarvik.taat.edu.ee-module.php-saml-sp-metadata.php-TAAT.xml"/>
<xi:include href="swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/scsh.scran.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml"/>
<xi:include href="swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml"/>
<xi:include href="swamid-interfederations-2.0/search.de.dariah.eu-search.xml"/>
+<xi:include href="swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/secure.huygens.knaw.nl.xml"/>
<xi:include href="swamid-interfederations-2.0/secure.nature.com-shibboleth.xml"/>
@@ -1592,12 +1704,16 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth-dev.derby.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.eb.com-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml"/>
@@ -1689,7 +1805,9 @@
<xi:include href="swamid-interfederations-2.0/shibboleth-test.cranfield.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.truro-penwith.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml"/>
@@ -1697,6 +1815,7 @@
<xi:include href="swamid-interfederations-2.0/shibboleth.ulbra.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml"/>
@@ -1719,6 +1838,7 @@
<xi:include href="swamid-interfederations-2.0/shibbsrv1.gsa.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibb.srv.hull-college.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibb.stockport.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shibb.ws.seemis.gov.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml"/>
@@ -1726,6 +1846,7 @@
<xi:include href="swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.dur.ac.uk-444-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.exprodo.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml"/>
@@ -1756,14 +1877,17 @@
<xi:include href="swamid-interfederations-2.0/shib.lexisnexis.com.xml"/>
<xi:include href="swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.newbury-college.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.nnc.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.pebblepad.co.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.rcs.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.reaseheath.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml"/>
@@ -1799,12 +1923,14 @@
<xi:include href="swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sid.kent.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/skmms-idp.lanet.lv.xml"/>
<xi:include href="swamid-interfederations-2.0/slademedia.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/slateford.edina.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml"/>
@@ -1875,6 +2001,7 @@
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-ama-development-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-ama-production-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-ama-staging-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-production-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-staging-shibboleth.xml"/>
@@ -1928,11 +2055,14 @@
<xi:include href="swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.sunderland.ac.uk-auth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.ucd.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.umk.pl-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.vito.be.xml"/>
<xi:include href="swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/stage.qmplus.qmul.ac.uk-shibboleth.xml"/>
@@ -2020,8 +2150,10 @@
<xi:include href="swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/tullbommen.arcada.fi-simplesaml-.xml"/>
<xi:include href="swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml"/>
@@ -2032,6 +2164,7 @@
<xi:include href="swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/uat.v-scene.ja.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/ucl.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml"/>
@@ -2041,17 +2174,20 @@
<xi:include href="swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ukdsdev02.ds.man.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ukfederation.ecu.ac.uk-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/ukfed.one-test2.contrail.rl.ac.uk-portal-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/uk.ihs.com-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/ukmyms01-zone02.smg-uk.com-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/uk.practicallaw.com-cs-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/ulster.unidesk.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/umbrella.psi.ch-.xml"/>
+<xi:include href="swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/unigepass.unige.it-idp.xml"/>
<xi:include href="swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml"/>
<xi:include href="swamid-interfederations-2.0/uoe-shib.hosted.exlibrisgroup.com-shib.xml"/>
@@ -2093,10 +2229,12 @@
<xi:include href="swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml"/>
<xi:include href="swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml"/>
<xi:include href="swamid-interfederations-2.0/urn.nbi.ku.dk-saml-sp-wayf.xml"/>
+<xi:include href="swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/usertest.sciquest.com.xml"/>
<xi:include href="swamid-interfederations-2.0/utwente.nl-.xml"/>
<xi:include href="swamid-interfederations-2.0/va-idp.lanet.lv.xml"/>
@@ -2105,6 +2243,7 @@
<xi:include href="swamid-interfederations-2.0/verify.cranfield.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/verify.dmu.ac.uk-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/verify.sheffield.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/vision.port.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml"/>
@@ -2129,6 +2268,7 @@
<xi:include href="swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml"/>
<xi:include href="swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml"/>
@@ -2142,6 +2282,7 @@
<xi:include href="swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/wiseflow.dk.xml"/>
+<xi:include href="swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.123library.org-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www2.foodle.cz-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.2simple.com-shibboleth.xml"/>
@@ -2199,6 +2340,7 @@
<xi:include href="swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml"/>
<xi:include href="swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml"/>
<xi:include href="swamid-interfederations-2.0/www.elsevierclinicalskills.co.uk-oa-metadata.xml"/>
@@ -2273,6 +2415,7 @@
<xi:include href="swamid-interfederations-2.0/www.myinterfase.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.nejm.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.nescolvoting.org.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml"/>
@@ -2282,6 +2425,7 @@
<xi:include href="swamid-interfederations-2.0/www.nusu.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.openconext.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.ordbogen.com.xml"/>
@@ -2295,6 +2439,8 @@
<xi:include href="swamid-interfederations-2.0/www.qmsu.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.rcpsych.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.reachoutcpd.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-ehuidp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml"/>
@@ -2328,10 +2474,12 @@
<xi:include href="swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml"/>
<xi:include href="swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.structuralbiology.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.sussexstudent.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.swansea-union.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sympa.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.tandfonline.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml"/>
@@ -2371,6 +2519,7 @@
<xi:include href="swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml"/>
<xi:include href="swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml"/>
diff --git a/swamid-interfederations-2.0/1010SE17FAM-V03.famerp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/1010SE17FAM-V03.famerp.br-idp-shibboleth.xml
new file mode 100644
index 00000000..0eeef954
--- /dev/null
+++ b/swamid-interfederations-2.0/1010SE17FAM-V03.famerp.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://1010SE17FAM-V03.famerp.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">famerp.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">FAMERP - Faculdade de Medicina de Rio Preto</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">FAMERP - Faculdade de Medicina de Rio Preto</mdui:DisplayName>
+ <mdui:Description xml:lang="en">FAMERP - Faculdade de Medicina de Rio Preto</mdui:Description>
+ <mdui:Description xml:lang="pt-br">FAMERP - Faculdade de Medicina de Rio Preto</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.famerp.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.famerp.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC3jCCAcYCAQAwDQYJKoZIhvcNAQEFBQAwNTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEYMBYGA1UEAxMPMTAxMFNFMTdGQU0tVjAzMB4XDTE1MTExMTE4MTEx
+OFoXDTE4MTExMDE4MTExOFowNTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEY
+MBYGA1UEAxMPMTAxMFNFMTdGQU0tVjAzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAs35C96cae6HotPptuHb31jj78SqAX2VAW+ghyUZvG8BS3zTBnc0o
+pqB5xkKiSnHUTTBIShlpRRgLnwv/5K99Yqkw0gL4je6c5t+l+nU0NNAlkCp6Sdac
+mI/JdXm72rED2VX2OuTLuZZt4ezoblhaJl4rfxVU0N7gto4vcLsUsHrTp9BskSk4
+0QbCfGhMuDNm7i8d2z0y6L/fy++bjKkzzsBTu71ZDTIy3hmrrZDuPSdPKFoCQz/R
+QHMBq2n4BJFYuDGoadeNHFiPJfpdqOOOF00FQCJtrFaJeRM5+CEeKh5qoFSt6Krd
+J+Ysn+isP3tu2HaPKzcpi83uAXt+EdHkDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCUvPYzLFvAoSdLliRuUKcNNiGFOwUr0DBUELsN+tpKn5sKAJhfONkwihG3Ym40
+6LUtxKuOK1gIDEPINhcv91d81dQowUfjEwd1ovaoSngK5D82zGx98cYHff0S6ahH
+wOJxhkLH4dzLOO+TlRBK0XJHcgDadgkIgPbEOVUy5A3YvFm0Sz2FGu55oQItilK1
+bvlYxi/3H8gw7Q5gl0kpFqzajcsNPmLJHqjYHkCeKG3d9Cn1aQNozqJToXTz9D6c
+18BMRBxE6HjineIuaNcVPROkHt42bS3I4+InmCQCzaH8L4dPBTTxcFnSQIMa+Ko0
+OIFoXRLcQ4+oGzgukcHZg8eG
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://1010SE17FAM-V03.famerp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://1010SE17FAM-V03.famerp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://1010SE17FAM-V03.famerp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://1010SE17FAM-V03.famerp.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://1010SE17FAM-V03.famerp.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://1010SE17FAM-V03.famerp.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">famerp.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIC3jCCAcYCAQAwDQYJKoZIhvcNAQEFBQAwNTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEYMBYGA1UEAxMPMTAxMFNFMTdGQU0tVjAzMB4XDTE1MTExMTE4MTEx
+OFoXDTE4MTExMDE4MTExOFowNTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEY
+MBYGA1UEAxMPMTAxMFNFMTdGQU0tVjAzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAs35C96cae6HotPptuHb31jj78SqAX2VAW+ghyUZvG8BS3zTBnc0o
+pqB5xkKiSnHUTTBIShlpRRgLnwv/5K99Yqkw0gL4je6c5t+l+nU0NNAlkCp6Sdac
+mI/JdXm72rED2VX2OuTLuZZt4ezoblhaJl4rfxVU0N7gto4vcLsUsHrTp9BskSk4
+0QbCfGhMuDNm7i8d2z0y6L/fy++bjKkzzsBTu71ZDTIy3hmrrZDuPSdPKFoCQz/R
+QHMBq2n4BJFYuDGoadeNHFiPJfpdqOOOF00FQCJtrFaJeRM5+CEeKh5qoFSt6Krd
+J+Ysn+isP3tu2HaPKzcpi83uAXt+EdHkDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCUvPYzLFvAoSdLliRuUKcNNiGFOwUr0DBUELsN+tpKn5sKAJhfONkwihG3Ym40
+6LUtxKuOK1gIDEPINhcv91d81dQowUfjEwd1ovaoSngK5D82zGx98cYHff0S6ahH
+wOJxhkLH4dzLOO+TlRBK0XJHcgDadgkIgPbEOVUy5A3YvFm0Sz2FGu55oQItilK1
+bvlYxi/3H8gw7Q5gl0kpFqzajcsNPmLJHqjYHkCeKG3d9Cn1aQNozqJToXTz9D6c
+18BMRBxE6HjineIuaNcVPROkHt42bS3I4+InmCQCzaH8L4dPBTTxcFnSQIMa+Ko0
+OIFoXRLcQ4+oGzgukcHZg8eG
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://1010SE17FAM-V03.famerp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://1010SE17FAM-V03.famerp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">FAMERP - Faculdade de Medicina de Rio Preto</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">FAMERP - Faculdade de Medicina de Rio Preto</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">FAMERP - Faculdade de Medicina de Rio Preto</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">FAMERP - Faculdade de Medicina de Rio Preto</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.famerp.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.famerp.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Joao Marcelo Rondina</md:SurName>
+ <md:EmailAddress>joaomarcelo@famerp.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/44uoc-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/44uoc-shib.hosted.exlibrisgroup.com-shib.xml
new file mode 100644
index 00000000..23ad68b0
--- /dev/null
+++ b/swamid-interfederations-2.0/44uoc-shib.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://44uoc-shib.hosted.exlibrisgroup.com/shib">
+ <!--
+ This is a "Primo - University of Cumbria" Shibboleth SP for Ex Libris (UK) Limited.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-26T11:18:34Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC3DCCAcSgAwIBAgIJAPWl7V7VX/BFMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+ BAMTB2FpbzAwNDQwHhcNMTUxMDI1MTQ0NTQ2WhcNMjUxMDIyMTQ0NTQ2WjASMRAw
+ DgYDVQQDEwdhaW8wMDQ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ uIcM5XvuJ5roqwsphtfHdwjxqIVJunIy0pwyck/KeRY0rZy3K/ai42qCmTdSPGMU
+ Wrwfdl/JR8A4e2/b/AntlpDl2/G+jPQ3dhFx4eG/sk04ut/X+LO0RuGNdkKe4VbJ
+ ha63y/A9kE9a1lQ8oKsqed8Cr0nmB5H/nthYQ6UA+8aRZWO1g0qT6UHg5CTX7Zub
+ sIkn3bQgNm5dVUFj5x6CBMeWHz+BWy3XzXn75kI4pN1NZ9HiD8jGmQCFF6lRzizJ
+ TUjtKQhypNhcFrQKoMwMXgs8x4qB4MAI302NaBIz4V1R62kha6rNKn45wJEZXLmf
+ bN9rScqFZvDdTG/SkX6SQQIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDQ0MB0G
+ A1UdDgQWBBQXn/9ZqY5Ort4ff/XLCRX62+IwYTANBgkqhkiG9w0BAQUFAAOCAQEA
+ R8xjk3N+t3FLTObtLn35afpxZfNBOpJzbFLKwFKSRI4iZt10VVE1nSRdljLkaMhR
+ vpiPPtjEYYvKHt5kRNA15NxnGpxYr9qfQGu+3fAtAG1auBFowVQVhOoKQEbzcrQh
+ UwOLwcpN/8P+iPSkC8YxuyK7aXKF9w0xUZrSjAd8iQQ6vbFDQrMWYGy5oqOU/rqP
+ E07zzDN6vGUjOBs1x3cETWhHM+albmFtA2dy8c/OCt5VnVclq8fEwtl/RUnYcXEw
+ 6CUcCp/EGnOJy+SfLxLpMR8A6o6Nt0XY41xVVzZBq8HIEa7TPmLcDU/AuSnDcRMV
+ UYiWPI94pu+HFPXSz+yu3w==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Primo - University of Cumbria</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Benoit</GivenName>
+ <SurName>Ginestet</SurName>
+ <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Benoit</GivenName>
+ <SurName>Ginestet</SurName>
+ <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
index 93222079..3a22a1fc 100644
--- a/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.unibe.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-01-05T15:05:49Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-12-08T13:29:18Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -11,14 +11,14 @@
</saml:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
- <md:IDPSSODescriptor errorURL="http://www.id.unibe.ch/content/helpdesk" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:IDPSSODescriptor errorURL="http://www.helpdesk.unibe.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="de">Universität Bern</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Bern</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Universität Bern</mdui:DisplayName>
<mdui:Description xml:lang="de">Universität Bern</mdui:Description>
- <mdui:Description xml:lang="en">University of Bern</mdui:Description>
+ <mdui:Description xml:lang="en">Universität Bern</mdui:Description>
<mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAeVJREFUeJyUkr9LQlEUx58u6p8gOLq5CeKkq+gkooMi6CCCILi4ujyMokhLkSIJdDKMUmxoShOHkFwEHdR0CULQ5+Dv3yfPhSsVGTncx7vfe87nnPs9lwEA5r9rvV4zFosFqtXqA9X+nYxrPB6farVayGQy9W63e7k3gOO4C4VCAV6vF8xmM4xGo8BegFKp9OR0Oje/wJpMJqjVavd7ARKJxIfP54N6vX6n0+mg1+tFGGxjMpmcrFarg9lsdrxYLA6/JqG+XC6JlkqlmkajEbCLXC73Sjzw+/3gcrlApVKBUqmEZrOZpMlYTa1WQyAQAArr9/vn8/n8aDuFwWBwjhBm46dEIgF0mjqOe9RDodBq17Xww9psNhKIM6YH5XL5kc/nA4/HAzRvJ2DTDiOTyQggGAxuAdFodEC7Gg6HZzsBrVbrRiAQEECxWHymBw6Hg2h6vR52JRNAOp1++1lpOp2eSKVSAmBZlgBwZHQa3wDoNAYaDIZtpXg8zqGG989ms6+Y7Ha7twZ/A2AiBmMAvoF8Pl+02+1EEwqFZKwejweSyeT7r1eIRCJzkUgEYrEYrFYrhMPhZbvdvpbL5YDeaDQaiMVi3F9jZCqVygO+rEajcUsPOp3OVaFQeEGT/zLxEwAA//8DAH2UumiGm7jIAAAAAElFTkSuQmCC</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+hkAAAZRSURBVHic7Jp9TFNXGMaJMYpTg4tBF2OMATGYhYWZCUTEzSj+Y2Q47DLUyWAJKhsi39kQEIHJhLCBjgxxGwgCg/GhCOL4UNSKEw0MHBXHN8jnBAUc0MJz9pZbSiHGLN5LK5UnTXN73nNvnt8957znbW912GsmHf6XiI2NXb169dDQEP9LqUECAPv5+VlYWPC/jnokALBIJHJwcOB/HfVIAGBLS0tbW1tHR0dPT8/u7m7+F5xW8QUeHBw0MDAwMzMLDAyklWxnZwdAEGfTJL7Ara2tS5YsEYvFdJyTk7N48eKOjg4hjE2X+AKXlZURcFNTEx3funVr0aJFjY2NQhibLvEFTktLW7VqlVQqpePg4GBDQ0Oa5EIYmy7xBQ4NDV23bp1EIomOjqb5HB8fL4it6RNf4LCwsDVr1piYmGzZsiUjI0MQT9MqBXBqaqqXl5ePjw8l22PHjnl4eDg7O09Zjbm5uQEBARSlPs3NzVyjTCbrG5O6jb+sFMCnTp0KCgry9/dfuHChzphofnZ2dir70WZD+y0XmjdvnhJ4xmnSlKaygVIuR7Vt2zbVEMHr6+tzISokR0dH1etTME0CzsvL0xkXVciqoaKiImXI1dVVvSaF1CRg2leUVLRiVUOUjZWh5ORk9ZoUUpOAbWxsOCQ9Pb2WlhbV0I4dO7jQ/Pnzq6ur1WtSSE0ADwwMUNnAUZmbm4+MjChDT548WblyJRcyNjZ+xUuLF2sCuKqqitLvc1dpaWnpnDlzuJC9vb3aTQqpCeCkpCTlKk1JSVHtFBkZqQxFRUWp3aSQmgB2c3PjkBYsWFBTU6Paafv27VyIxpm+IXCNtbW1/f39ajUrhBTAVFdYWVlxVFQbq/5AVVFRQbeAC61YseLx48fU2NvbS93u3bunGdc8pADu6ekhGI5KJBIpw5S6du7cqZzP1tbWXLu3tzcNu2pimylSANMc1tXV5agIhmukCtnFxYWm+tKlS7mQr68vtefn5y9btuz+/fsac81DCuCuri5l5WhkZJSYmBgTE0MlZHh4OA3j2rVruRCNakREBG1R6enpmvX90ppIWnFxccuXL+fA5s6du3nz5oKCAi6UkJCgrLFNTU0LCws15FYATaq02traSkpKiouLKQNP6VdXV0ft5eXl9H1QjfaElwA/084szQJru2aBtV2zwNquWWBt1yywtmsWWNulAM7Qdk0FjtZ2TQV+faQAlkqlAwMDmrWiHimAJRJJVFTU8PCwZt2oQQpgsVjs7u4+5YGDVkoBnJmZGRISkp2drVk3apACuKOjo7KycuY+1///en6WhspLtZFNbnnuWVP64FEXqv5m7d0vPldtGgeuaWLXy1HXitJKNLUj+TLa/0FxGevtQ+5N1Lawgtvs2SByrqOxHXFZ+OUiep6yCyXsTDqrqGHDMpy/jNgMDA4hT4wHDeznC4hNR00jrt2FpSPEFZDUy1vOZrNeTT6CGwc+k8X2ByLlCg6dwKUb0DFBwI/45Cv2Vz02fIo/H2KTE9IK8LEvu1IKQxscP4uuHph/Bmtn7PbBjXK8+QGiU+XAFg64WobDJ7FhL6N7R+RvbUViLhoeYZMjvghj/c9eAeD4HGbvh7hMMoQL12DtAsMPYefNquvx3j6MjkLki3f3IKuYhh1v2+GHNDztx0YnvLMb/jGs7xm9w/gj+TBu+pzmMFLysddPPsk3OsJsn7yRjg+EIilPg7RsArixDTZHYH0IhX/g91JEpcDzOxz6Bg2t2HeU4mQUZvvRN8BuV2HrARwOR30rvvwW2dfk75IGOAfDxh2POuEUxB42yacJ3Qjqs+drlNzFLm80tyP0J3axRJO4k5KWVEarVH4wCvmLJBthAFM+Ex0Zy+HUMiRlA/8ySulcSCaTh3r7xj+OnUVXGBnrwP19mutM75reCF7XWpqV1+BgCDwjWVsXTqfhyAn8VoTaZhwIhnsEuNxz8hwoY+Xe1KhhvhoHziiWpxyjXexmBWw9IfKglcyK7sB4F0ztQQcHQ6H3vjyNhSdo1DBfjf/HI+sqrJzke0/2VdqNcPC4fEOm3WW9PWVp9qARbuHyHUvXAqd/1axjnhof4UvX8cYGGNjId8vdvtC3YF7fo/gOHINwNAbh55jrSeTewPq9LPK8Rg3z1WuXtP4DAAD//wMAnPfzPGW0I0UAAAAASUVORK5CYII=</mdui:Logo>
</mdui:UIInfo>
@@ -132,7 +132,7 @@ W2X26PAcxR9Ni6k2VcPdwrF+wSz0jKwCrJzugJ1Z99ABWA==
<md:Organization>
<md:OrganizationName xml:lang="en">unibe.ch</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="de">Universität Bern</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Bern</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Universität Bern</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="de">http://www.unibe.ch/</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://www.unibe.ch/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
index 537f783b..74cab698 100644
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.uzh.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-11T15:17:46Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-12-14T14:31:44Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
diff --git a/swamid-interfederations-2.0/aai-login.hsr.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.hsr.ch-idp-shibboleth.xml
index 105a3679..a1ccb1cc 100644
--- a/swamid-interfederations-2.0/aai-login.hsr.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-login.hsr.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.hsr.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-05-20T13:40:33Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-28T14:02:53Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -112,6 +112,11 @@ VlqG9d3H6ougFWjTlcGEmbCKHbuP6pmxM9POV16FGrrLUPHB
<md:EmailAddress>mailto:servicedesk@hsr.ch</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
+ <md:GivenName>Cedric</md:GivenName>
+ <md:SurName>Früchtenicht</md:SurName>
+ <md:EmailAddress>mailto:cedric.fruechtenicht@hsr.ch</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
<md:GivenName>Patrick</md:GivenName>
<md:SurName>Oberli</md:SurName>
<md:EmailAddress>mailto:poberli@hsr.ch</md:EmailAddress>
diff --git a/swamid-interfederations-2.0/aai-login.phsg.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.phsg.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..f78da06b
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-login.phsg.ch-idp-shibboleth.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.phsg.ch/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-11-12T12:42:53Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor errorURL="https://helpdesk.phsg.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phsg.ch</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">PHSG - Pädagogische Hochschule St.Gallen</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">PHSG - Pädagogische Hochschule St.Gallen</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Pädagogische Hochschule St.Gallen</mdui:Description>
+ <mdui:Description xml:lang="en">Pädagogische Hochschule St.Gallen</mdui:Description>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAxklEQVQ4EWP4//8/JxBPBuInQEwsAKltAWI2BiAxjVhdWNS1MwIFvzEwMHACMTngNciA/+TohOlhgTGIoTfdWMCw6eZCsFI/9XgGP40EBiYQr7SsAo5hBoHEYADGhmkGicPYYANAAt1dHWAMUwwSIwbg9QK6YSBnw2wGscEAFIglpeVwDOKDAEgMBpDZMDEYDXcByAvkAHgYkKMZpIfidECxC0AGfCfX+UB9L0AGLKDAgGWg3AjKznOA+C0saoigQWpnAjEnAIt5HRA+6LqUAAAAAElFTkSuQmCC</mdui:Logo>
+ <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAANUElEQVR4nOxae1BU1xnf/tNJnfyT1CRNOgmJYjJm0mlnmDbTWmc6aadpk5pEEvEBy7ILXEERJT4wKPEREREF1EQFE0GQXZDdBUEQHyS+0BCXgCYCyyMSEkx8ALuQTUyifv3OuXvvnnv3Ltw1pjs7lZmP+zj3nvPd3/19z7saANDclduXgCsQ7BJwBYJdAq5AsEvAFQh2CbgCwS4BVyDYJeAKBLsEXIFgl4ArEOwScAWCXQKuQLAL/Vc6pEFp/z+TDo3J2UnFOHAhrPhyC7fn6xau5EoLZxpqCzc5u8YbHfZR5xABNDnJZHaPONzHDva4w30sXMtulc555jMKx+55jQ6F6xxK8zHXSO5Vuk9Bf5kI65aNdGuMQxcmF3ZXWzaczoYlh+Mhaf+LML/q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</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://www.phsg.ch</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="de">http://www.phsg.ch</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>195.176.16.128/25</mdui:IPHint>
+ <mdui:IPHint>195.176.18.0/24</mdui:IPHint>
+ <mdui:DomainHint>phsg.ch</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:47.430364,9.382454</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:47.472613,9.494863</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:47.409875,9.252674</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIJAMQ2VbSnpmdHMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFhaS1sb2dpbi5waHNnLmNoMB4XDTEzMDEyMjE5MTkxMVoXDTE2MDEyMjE5
+MTkxMVowHDEaMBgGA1UEAxMRYWFpLWxvZ2luLnBoc2cuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDGO1HqlzT5L9rIgsxjRCT7dgFtkUxkaN8tnQUW
+CEzHnIkoT5Nrj5ZASFfBJh+1hWJ71/9RNVlO/u25PwQhYrQ7xnKjn3OTqdWWKgey
+8GH/oPVsMVh5u7bfwoLEswLJOPfx0Cxspsxra/oKBamCsbjlqVPBraXyXJ2voR48
+3dMB2/eKvpsWS2trkfOJ37h5whOu0xA0cUk749A6OKA+Hd/YMiDmVUGA415rRY8t
+jnJUDou3UUnXK5TwCco9yW8kMICM6f7BlWmrr/wOtM9u6TAGBneHrDodKbKHV6fD
+HfqweKmUgnMw1/bBa1/bd/eIjspLjQtiIqId1L5GMOLjuhalAgMBAAGjaTBnMEYG
+A1UdEQQ/MD2CEWFhaS1sb2dpbi5waHNnLmNohihodHRwczovL2FhaS1sb2dpbi5w
+aHNnLmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSVgDQR8YQ1yJm/6mJDNJ07
+3jbSrTANBgkqhkiG9w0BAQUFAAOCAQEAMAMhtaSanl/fq+Dn5tqPRV5lW9riuYLQ
+FEd3rifh0m+wNd6oSnsq2tbjKDGo0ZensOlaDlC5kmOCbc+nSSs9oX2UEoELqJVA
+ErjxAqIU8cSc4a1d1NIdQji2PuVWmYCNCwN4ASW/NN8IV5MVVqgI3AkracCMIjbf
+LCsN7r85ZNDpmS40BLFpmcOMmTVucrqYzZ+uPg/QKry2njxK2N1fTNbFESE4p7gp
+/5bm4uZyt05QDx4W0ZMMyVBlHKHpvHtktdlSn2IQu4jC8X8fnGVxerhKI0bRVFxh
+YRSoMfB/FcNFOP3/Oe6qDPgH/ZBiyj4HBr4+wwRXT28tIhc3UVfWoQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.phsg.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.phsg.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-login.phsg.ch/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.phsg.ch/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.phsg.ch/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-login.phsg.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phsg.ch</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIJAMQ2VbSnpmdHMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFhaS1sb2dpbi5waHNnLmNoMB4XDTEzMDEyMjE5MTkxMVoXDTE2MDEyMjE5
+MTkxMVowHDEaMBgGA1UEAxMRYWFpLWxvZ2luLnBoc2cuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDGO1HqlzT5L9rIgsxjRCT7dgFtkUxkaN8tnQUW
+CEzHnIkoT5Nrj5ZASFfBJh+1hWJ71/9RNVlO/u25PwQhYrQ7xnKjn3OTqdWWKgey
+8GH/oPVsMVh5u7bfwoLEswLJOPfx0Cxspsxra/oKBamCsbjlqVPBraXyXJ2voR48
+3dMB2/eKvpsWS2trkfOJ37h5whOu0xA0cUk749A6OKA+Hd/YMiDmVUGA415rRY8t
+jnJUDou3UUnXK5TwCco9yW8kMICM6f7BlWmrr/wOtM9u6TAGBneHrDodKbKHV6fD
+HfqweKmUgnMw1/bBa1/bd/eIjspLjQtiIqId1L5GMOLjuhalAgMBAAGjaTBnMEYG
+A1UdEQQ/MD2CEWFhaS1sb2dpbi5waHNnLmNohihodHRwczovL2FhaS1sb2dpbi5w
+aHNnLmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSVgDQR8YQ1yJm/6mJDNJ07
+3jbSrTANBgkqhkiG9w0BAQUFAAOCAQEAMAMhtaSanl/fq+Dn5tqPRV5lW9riuYLQ
+FEd3rifh0m+wNd6oSnsq2tbjKDGo0ZensOlaDlC5kmOCbc+nSSs9oX2UEoELqJVA
+ErjxAqIU8cSc4a1d1NIdQji2PuVWmYCNCwN4ASW/NN8IV5MVVqgI3AkracCMIjbf
+LCsN7r85ZNDpmS40BLFpmcOMmTVucrqYzZ+uPg/QKry2njxK2N1fTNbFESE4p7gp
+/5bm4uZyt05QDx4W0ZMMyVBlHKHpvHtktdlSn2IQu4jC8X8fnGVxerhKI0bRVFxh
+YRSoMfB/FcNFOP3/Oe6qDPgH/ZBiyj4HBr4+wwRXT28tIhc3UVfWoQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.phsg.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.phsg.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">phsg.ch</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">PHSG - Pädagogische Hochschule St.Gallen</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">PHSG - Pädagogische Hochschule St.Gallen</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.phsg.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.phsg.ch/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>PHSG</md:GivenName>
+ <md:SurName>Helpdesk</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@phsg.ch</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Stefan</md:GivenName>
+ <md:SurName>Keel</md:SurName>
+ <md:EmailAddress>mailto:stefan.keel@phsg.ch</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml
index 48099bcd..ddf68548 100644
--- a/swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.pmodwrc.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-22T09:13:33Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-11-03T16:47:17Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -64,7 +64,7 @@ KLnxSFoYmtjuLBu3m3iafGjKLhqrSuUjijQkUpiBhU9L+mHYqsiFhWtN0shDDArV
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.pmodwrc.ch/idp/profile/SAML2/Redirect/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.pmodwrc.ch/idp/profile/SAML2/POST/SSO"/>
</md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmodwrc.ch</shibmd:Scope>
</md:Extensions>
@@ -97,7 +97,6 @@ KLnxSFoYmtjuLBu3m3iafGjKLhqrSuUjijQkUpiBhU9L+mHYqsiFhWtN0shDDArV
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.pmodwrc.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">pmodwrc.ch</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/aai-logon.ethz.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.ethz.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..a321b261
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.ethz.ch-idp-shibboleth.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.ethz.ch/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-11-12T12:43:21Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor errorURL="http://www.id.ethz.ch/servicedesk" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ethz.ch</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">ETHZ - ETH Zürich</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">ETHZ - ETH Zurich</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">ETHZ - ETH Zurich</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Eidgenössische Technische Hochschule Zürich</mdui:Description>
+ <mdui:Description xml:lang="en">Swiss Federal Institute of Technology Zurich</mdui:Description>
+ <mdui:Description xml:lang="fr">Ecole Polytechnique Fédérale de Zurich</mdui:Description>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAASBQTFRFAD59Aj9+AT9+AD19ADh5ADd4ADp6AD18A0F/HleOJ12SJl2SJVuRIVmPIFiPJFuRIlmQFlCJBEF/H1iOBkOAA0B+ADV3OWub9vr80N7p0+Dq3ujw7vT48/f62+bv////bpG0MF+T9vv8ADl6ADF0apG09/r8YomvU3+oBESBuczcu83dD0yG+v39gaG/iqjE3ObuADt6mbPM5ezypr3SADN11uHreZq7F0yG/f7+wNHg+vz9o7vRAT99ADl50t/pzNrlc5i5N2maD0qFP2+dUn6o9Pn6Aj582ePsgKG/AC9zADx8CEWBl7TLsMbYx9fjTHmlFVCIrcXWEUuFVIGpjqzGBUOAor3RNmmZADZ4AkB+ADZ3ADR2AD99A0B/AT595RKpMgAAAAFiS0dEHwUNEL0AAAAJcEhZcwAADsMAAA7DAcdvqGQAAACjSURBVBjTY2AgCzBCARMDI5jPzMLKysrCwsrCxsDCDuJzcHJx8/Dy8QsICgmLsDOIiolLSEpJy8jKySsoKgkqMwipqKqpa2hqaevo6ukbGDIABYyMTfRNzcwtLK2sbUw5GGzt7B0cnZzlXVzd3D08vYQYvH18/fwDAoOCQ0LDwiMio4DWRJuqsDDHsLOJMcSwxYLcIRoXx8QQF88kyiDKRJbHADKiFN5zQY3pAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTExLTExVDE1OjM4OjQ2KzAxOjAw/4hh9gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0xMS0xMVQxNDo0MTowNyswMTowMKRQO8gAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo height="64" width="64">data:image/png;base64,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</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>195.176.0.48/28</mdui:IPHint>
+ <mdui:IPHint>195.176.96.0/19</mdui:IPHint>
+ <mdui:IPHint>82.130.64.0/18</mdui:IPHint>
+ <mdui:IPHint>129.132.0.0/16</mdui:IPHint>
+ <mdui:IPHint>129.132.40.0/24</mdui:IPHint>
+ <mdui:IPHint>193.134.200.0/21</mdui:IPHint>
+ <mdui:IPHint>192.33.87.0/24</mdui:IPHint>
+ <mdui:IPHint>192.33.88.0/23</mdui:IPHint>
+ <mdui:IPHint>192.33.91.0/24</mdui:IPHint>
+ <mdui:IPHint>192.33.92.0/22</mdui:IPHint>
+ <mdui:IPHint>192.33.88.0/21</mdui:IPHint>
+ <mdui:IPHint>192.33.96.0/21</mdui:IPHint>
+ <mdui:IPHint>192.33.104.0/22</mdui:IPHint>
+ <mdui:IPHint>192.33.108.0/23</mdui:IPHint>
+ <mdui:IPHint>192.33.110.0/24</mdui:IPHint>
+ <mdui:IPHint>2001:620:8::/48</mdui:IPHint>
+ <mdui:IPHint>2001:620:1a0::/48</mdui:IPHint>
+ <mdui:DomainHint>ethz.ch</mdui:DomainHint>
+ <mdui:DomainHint>cscs.ch</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:47.37646,8.54792</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:47.41039,8.50902</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:47.566087,7.602298</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:46.022244,8.916146</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFojCCBIqgAwIBAgIUQV6//MsvpNeQ0A5F/aEZGwpWK9swDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDgxMTE1NTA0
+OVoXDTE3MDgxMTE1NTA0NVowYzELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJp
+Y2gxEDAOBgNVBAcTB1p1ZXJpY2gxFDASBgNVBAoTC0VUSCBadWVyaWNoMRowGAYD
+VQQDExFhYWktbG9nb24uZXRoei5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAM+Es3JJBpK6DNRjHcHcD1mPQOHKDnGfauHSbFuswybBJ5vaG/MNhKkT
+wEMU3I9seUkB6aMmFQ7Jb0h0L9chYzU4WQs87F5KHtDk7LUOPg23vLm0exArR1q9
+edcpju4wNXzT0Xs//5pBYfVtXBtqS1KDnR99hAn171PFOVgHyrAhZBiuthqnzKDx
+LXb8ZOcotrJf6w9KBryzE5N6iqJvsSblSobqNplFOJm19brnzaDvXs4XTdh590Gi
+OpGVnLIyzPnqc29vyFzXzQy+PnJSbA4rcH0WdZjb1QErl9SxRimp9Eu6FURuh2fz
+okqCXzkGYGapqnhbtacMpYU/55TXtZECAwEAAaOCAmIwggJeMHMGCCsGAQUFBwEB
+BGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29t
+MDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2
+c3NsZzIuY3J0MIHoBgNVHREEgeAwgd2CEWFhaS1sb2dvbi5ldGh6LmNogg92Y2lw
+aGVyLmV0aHouY2iCD3ZjYWVzYXIuZXRoei5jaIIPdmN1cnRlci5ldGh6LmNogg92
+Y29wcGVyLmV0aHouY2iCD3ZjZW5zb3IuZXRoei5jaIISbGRhcHMtaW5mby5ldGh6
+LmNogg92YmFnZ2VyLmV0aHouY2iCD2xpbnRlc3QuZXRoei5jaIIPdmtpa3V5dS5l
+dGh6LmNogg92a2FyYXRlLmV0aHouY2iBG3ZsYWRpc2xhdi5uZXNwb3JAaWQuZXRo
+ei5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUFBwIBFiho
+dHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB
+/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgw
+FoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDov
+L2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFCu2
+n3cvVuUwhk5Trij3/AjY83eRMA0GCSqGSIb3DQEBCwUAA4IBAQBsieDeYEP421Ju
+vgGSCfFVz3COdaeApYbDVTrNgNXVz6SMJUtei4Am6Usn+LdS4T+JU2+XH9kwbMhs
+tB4HvrZ1B4knmP6HG3d3l5IFLKHOTsjaFi8iP1g5FScP4ZDU22gOmheBiUBxFWeg
+XlYNL0Oo0thjlEABy9xRhPKOOCPobph8yXNms3R26fNcWOr1vqrelgRliCCp+C8r
+XgNUpzJ27dWP55rM0g1xit7Yf70mLRYwhaIHqGoa1dLAzFgAUp09tRAh9e994HcE
+HZjdI2qJ9f74k5S+I+11iWbm0WPiClz0nKbzb2120cJp3DJuUwLFZUO75xFd1624
+Qpo1uN+B
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.ethz.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.ethz.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.ethz.ch/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.ethz.ch/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.ethz.ch/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.ethz.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ethz.ch</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFojCCBIqgAwIBAgIUQV6//MsvpNeQ0A5F/aEZGwpWK9swDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDgxMTE1NTA0
+OVoXDTE3MDgxMTE1NTA0NVowYzELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJp
+Y2gxEDAOBgNVBAcTB1p1ZXJpY2gxFDASBgNVBAoTC0VUSCBadWVyaWNoMRowGAYD
+VQQDExFhYWktbG9nb24uZXRoei5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAM+Es3JJBpK6DNRjHcHcD1mPQOHKDnGfauHSbFuswybBJ5vaG/MNhKkT
+wEMU3I9seUkB6aMmFQ7Jb0h0L9chYzU4WQs87F5KHtDk7LUOPg23vLm0exArR1q9
+edcpju4wNXzT0Xs//5pBYfVtXBtqS1KDnR99hAn171PFOVgHyrAhZBiuthqnzKDx
+LXb8ZOcotrJf6w9KBryzE5N6iqJvsSblSobqNplFOJm19brnzaDvXs4XTdh590Gi
+OpGVnLIyzPnqc29vyFzXzQy+PnJSbA4rcH0WdZjb1QErl9SxRimp9Eu6FURuh2fz
+okqCXzkGYGapqnhbtacMpYU/55TXtZECAwEAAaOCAmIwggJeMHMGCCsGAQUFBwEB
+BGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29t
+MDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2
+c3NsZzIuY3J0MIHoBgNVHREEgeAwgd2CEWFhaS1sb2dvbi5ldGh6LmNogg92Y2lw
+aGVyLmV0aHouY2iCD3ZjYWVzYXIuZXRoei5jaIIPdmN1cnRlci5ldGh6LmNogg92
+Y29wcGVyLmV0aHouY2iCD3ZjZW5zb3IuZXRoei5jaIISbGRhcHMtaW5mby5ldGh6
+LmNogg92YmFnZ2VyLmV0aHouY2iCD2xpbnRlc3QuZXRoei5jaIIPdmtpa3V5dS5l
+dGh6LmNogg92a2FyYXRlLmV0aHouY2iBG3ZsYWRpc2xhdi5uZXNwb3JAaWQuZXRo
+ei5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUFBwIBFiho
+dHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB
+/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgw
+FoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDov
+L2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFCu2
+n3cvVuUwhk5Trij3/AjY83eRMA0GCSqGSIb3DQEBCwUAA4IBAQBsieDeYEP421Ju
+vgGSCfFVz3COdaeApYbDVTrNgNXVz6SMJUtei4Am6Usn+LdS4T+JU2+XH9kwbMhs
+tB4HvrZ1B4knmP6HG3d3l5IFLKHOTsjaFi8iP1g5FScP4ZDU22gOmheBiUBxFWeg
+XlYNL0Oo0thjlEABy9xRhPKOOCPobph8yXNms3R26fNcWOr1vqrelgRliCCp+C8r
+XgNUpzJ27dWP55rM0g1xit7Yf70mLRYwhaIHqGoa1dLAzFgAUp09tRAh9e994HcE
+HZjdI2qJ9f74k5S+I+11iWbm0WPiClz0nKbzb2120cJp3DJuUwLFZUO75xFd1624
+Qpo1uN+B
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.ethz.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.ethz.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">ethz.ch</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">ETHZ - ETH Zürich</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">ETHZ - ETH Zurich</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fr">ETHZ - ETH Zurich</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.ethz.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.ethz.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.ethz.ch/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Vladislav</md:GivenName>
+ <md:SurName>Nespor</md:SurName>
+ <md:EmailAddress>mailto:vladislav.nespor@id.ethz.ch</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Vladislav</md:GivenName>
+ <md:SurName>Nespor</md:SurName>
+ <md:EmailAddress>mailto:vladislav.nespor@id.ethz.ch</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml
index ba59b244..ffb00e20 100644
--- a/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.fhsg.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-05T08:54:49Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-10-13T07:59:38Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
index 1c0f8dfe..e80aa0cb 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.switch.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-17T06:59:34Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-10-07T19:42:37Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
diff --git a/swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml
index 3584898c..a6710562 100644
--- a/swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.unibas.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-07-09T08:38:39Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-11-02T13:10:17Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
diff --git a/swamid-interfederations-2.0/aai.unil.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.unil.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..2695acfe
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.unil.ch-idp-shibboleth.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.unil.ch/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-12-18T13:40:46Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor errorURL="http://www.unil.ch/ci/helpdesk" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unil.ch</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Université de Lausanne</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">Université de Lausanne</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Université de Lausanne</mdui:Description>
+ <mdui:Description xml:lang="fr">Université de Lausanne</mdui:Description>
+ <mdui:Keywords xml:lang="en">University Université Lausanne Switzerland Suisse Vaud UNIL HEC</mdui:Keywords>
+ <mdui:Keywords xml:lang="fr">University Université Lausanne Switzerland Suisse Vaud UNIL HEC</mdui:Keywords>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAbUlEQVQ4EWNkmHDpPwMFgIkCvWCtw8WA//m68KCAsUF0rJ4kWBxZDCQA44PYeMNgkaMISA1egNcAkE6YK3CZgteAuP1vGAi5Aq8Biy89x2UxXJwFxALZBAsYEBsZ4HIFTD3jaFLGn5CQAxMXGwBfgCBoMtEr2QAAAABJRU5ErkJggg==</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+hkAAAhXSURBVHic7Fh7bFtnFbcE3VZR8Sio3YTQQCxiYxRB/0CFgSZNDIYGEoJp68YmhPYH0mC0nTSQQEgg0S3rEppHnTh16jSxnZfzsONHkjpOnDqOX9eP61dsx3b9fsSv+HX9TjnOTdy0S9PG7sLk+Sfr6t5zz3fO+Z3vfOf7rgk3P2Ug/L8DOGg0CNc7GoTrHQ3C9Y4G4XpHg3C9o0G43tEgXO+4N2HHOvaeyiMPxm9ubBxAQB839iKcLZbopuDjV5WElqX3FC5cmC+VjJEUVijW7juazfvT2drt7At7EQ5huXdF9kf7lJ/pkqKhJC5s03gfbhd3aX01OuY5Il+lIMd7FUgwUaOpfeEeJZ0pFB7rQ55jGkqb9VzcKJ0a0xHalidt4Vq8LnnjR7plL0+bjpIVl/X+WkztF/cgTDUFgR7LvkUPCSYPEWXHKMoQlq/aZTiT+0a/6i2hLZjOHO1VLLjXqzZVBfYiDLP643H9d4fQXLGES94SWgn/Ff+Ks1KLy3dE9qdoarBJ1PqPU5B4rlCLtf1iL8KqtSShUwJ9C390xrEvkRWENkkz4q7anyeZ+TJZPuuM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</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://www.unil.ch</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="fr">http://www.unil.ch</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="fr">http://www.unil.ch/ci/home/menuinst/documentation/reglements-et-directives.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>192.33.222.0/23</mdui:IPHint>
+ <mdui:IPHint>192.33.224.0/21</mdui:IPHint>
+ <mdui:IPHint>192.33.217.0/24</mdui:IPHint>
+ <mdui:IPHint>192.33.218.0/23</mdui:IPHint>
+ <mdui:IPHint>192.33.220.0/24</mdui:IPHint>
+ <mdui:IPHint>195.176.0.144/28</mdui:IPHint>
+ <mdui:IPHint>192.33.214.0/23</mdui:IPHint>
+ <mdui:IPHint>192.33.216.0/22</mdui:IPHint>
+ <mdui:IPHint>2001:620:600::/48</mdui:IPHint>
+ <mdui:IPHint>192.80.31.0/24</mdui:IPHint>
+ <mdui:IPHint>192.80.32.0/21</mdui:IPHint>
+ <mdui:IPHint>192.80.40.0/23</mdui:IPHint>
+ <mdui:IPHint>192.80.31.0/24</mdui:IPHint>
+ <mdui:IPHint>192.80.32.0/21</mdui:IPHint>
+ <mdui:IPHint>192.80.40.0/23</mdui:IPHint>
+ <mdui:IPHint>192.33.220.0/24</mdui:IPHint>
+ <mdui:IPHint>192.80.42.0/24</mdui:IPHint>
+ <mdui:IPHint>129.194.0.0/16</mdui:IPHint>
+ <mdui:IPHint>192.33.222.0/23</mdui:IPHint>
+ <mdui:IPHint>192.33.212.0/24</mdui:IPHint>
+ <mdui:IPHint>192.33.212.0/22</mdui:IPHint>
+ <mdui:IPHint>192.33.216.0/24</mdui:IPHint>
+ <mdui:DomainHint>unil.ch</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:46.521542,6.579157</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAMN83YPbe/AVMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2FhaS51bmlsLmNoMB4XDTE0MDQxMDA2NTc0N1oXDTE3MDQwOTA2NTc0N1ow
+FjEUMBIGA1UEAxMLYWFpLnVuaWwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDS4Fn9ab7qC1kgxX8O4r8QcfDZG0T89Bu4qD9O8vD/1aPLo5ZqSjao
+1mrhiVbqGgLmPjbS/IsuCMRrUfDeQyBJGqZ8O5GOL6sL3eH5Qd2wZAdHcFZHWx7b
+oCz1wXb1+a0bhTCaSE3UJpUqvo7bf/1ClBpzcJD1jSdt2sQt/U8bq0rb9vtnzLMc
+OM4wetmS8lS5WsJGuGqGrdsKb8SD4QAemaYjTYgY9yoXZh0ZYvdce0jImGMbOF43
+55LxIF6L89U+VFF7Z5KyrZQRCP5e9MinvMeShCtYiAJyBW9RMF4vEZuQBTgAjmvZ
+8xVVkwqsdpUnwmCsVV5ZeRtG7yqev+4LAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2Fh
+aS51bmlsLmNohiJodHRwczovL2FhaS51bmlsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBTX3RXRntMu7Rn62PNfGuvDMFJ4IzANBgkqhkiG9w0BAQUFAAOCAQEA
+hTRI7Gj5D+fEq59EnmD+vZa1MGGoftEdGWhVGmKA5Stki5hI4OtrogNG0H6TqlLx
+tzg7EXIsjR5sqifAx2nA+W+bWuQiAZPyqVbz4ttqSa63E6XJcfzT1HP7wJVUnkYn
+JyqeHAbvPrAQDsil2l/RHSfnFT4BiDi/g39nye15jUI1QZP1j43AIttSbsCUJf1O
+2XCs2/apHYzF4FF7Dqej35omJPm8sr4+ylZR6nSJKa1QDs7EjM2sCgd6oEeHipHn
+bQ7puHs24ooO2rLro9m3g8eIRPL9vY8eK4Za1FoMzuyeYRUMr29nybh93k74FPh7
+bixqHGtUL73JGpgPqlP05A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unil.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai.unil.ch/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.unil.ch/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.unil.ch/idp/profile/SAML2/POST/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unil.ch</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAMN83YPbe/AVMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2FhaS51bmlsLmNoMB4XDTE0MDQxMDA2NTc0N1oXDTE3MDQwOTA2NTc0N1ow
+FjEUMBIGA1UEAxMLYWFpLnVuaWwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDS4Fn9ab7qC1kgxX8O4r8QcfDZG0T89Bu4qD9O8vD/1aPLo5ZqSjao
+1mrhiVbqGgLmPjbS/IsuCMRrUfDeQyBJGqZ8O5GOL6sL3eH5Qd2wZAdHcFZHWx7b
+oCz1wXb1+a0bhTCaSE3UJpUqvo7bf/1ClBpzcJD1jSdt2sQt/U8bq0rb9vtnzLMc
+OM4wetmS8lS5WsJGuGqGrdsKb8SD4QAemaYjTYgY9yoXZh0ZYvdce0jImGMbOF43
+55LxIF6L89U+VFF7Z5KyrZQRCP5e9MinvMeShCtYiAJyBW9RMF4vEZuQBTgAjmvZ
+8xVVkwqsdpUnwmCsVV5ZeRtG7yqev+4LAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2Fh
+aS51bmlsLmNohiJodHRwczovL2FhaS51bmlsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBTX3RXRntMu7Rn62PNfGuvDMFJ4IzANBgkqhkiG9w0BAQUFAAOCAQEA
+hTRI7Gj5D+fEq59EnmD+vZa1MGGoftEdGWhVGmKA5Stki5hI4OtrogNG0H6TqlLx
+tzg7EXIsjR5sqifAx2nA+W+bWuQiAZPyqVbz4ttqSa63E6XJcfzT1HP7wJVUnkYn
+JyqeHAbvPrAQDsil2l/RHSfnFT4BiDi/g39nye15jUI1QZP1j43AIttSbsCUJf1O
+2XCs2/apHYzF4FF7Dqej35omJPm8sr4+ylZR6nSJKa1QDs7EjM2sCgd6oEeHipHn
+bQ7puHs24ooO2rLro9m3g8eIRPL9vY8eK4Za1FoMzuyeYRUMr29nybh93k74FPh7
+bixqHGtUL73JGpgPqlP05A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unil.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unil.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">unil.ch</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Université de Lausanne</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fr">Université de Lausanne</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.unil.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.unil.ch/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Equipe</md:GivenName>
+ <md:SurName>AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@unil.ch</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>HelpDesk</md:GivenName>
+ <md:SurName>UNIL</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@unil.ch</md:EmailAddress>
+ <md:TelephoneNumber>+41216922211</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Alexandre</md:GivenName>
+ <md:SurName>Roy</md:SurName>
+ <md:EmailAddress>mailto:Alexandre.Roy@unil.ch</md:EmailAddress>
+ <md:TelephoneNumber>+41216922233</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Christopher</md:GivenName>
+ <md:SurName>Greiner</md:SurName>
+ <md:EmailAddress>mailto:christopher.greiner@unil.ch</md:EmailAddress>
+ <md:TelephoneNumber>+41216922193</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml
index c95ba562..ec84bd4c 100644
--- a/swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml
@@ -9,12 +9,12 @@
<md:Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="nl">Hogeschool Rotterdam</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Rotterdam University</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Rotterdam University of Applied Sciences</mdui:DisplayName>
<mdui:Description xml:lang="nl">Hogeschool Rotterdam</mdui:Description>
<mdui:Description xml:lang="en">Hogeschool Rotterdam</mdui:Description>
- <mdui:Logo height="75" width="75">https://static.surfconext.nl/media/sp/hro-logo.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Hogeschool Rotterdam University HRO HBO</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Hogeschool Rotterdam University HRO HBO</mdui:Keywords>
+ <mdui:Logo height="75" width="75">https://static.surfconext.nl/logos/sp/hro-logo.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">hogeschool rotterdam university hro hbo</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">hogeschool rotterdam university hro hbo</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
@@ -30,9 +30,9 @@
</md:IDPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="nl">Hogeschool Rotterdam</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Rotterdam University</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Rotterdam University of Applied Sciences</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="nl">Hogeschool Rotterdam</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Rotterdam University</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Rotterdam University of Applied Sciences</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="nl">http://www.hro.nl</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://www.hro.nl</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml
index f61f4009..7fc3d491 100644
--- a/swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml
@@ -14,32 +14,28 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEszCCA5ugAwIBAgIRAIm9F5IqfEtgz+aqJQ6z8OEwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMIGCMQswCQYD
+ MIIEBDCCAuygAwIBAgIJAN9TCY4/UbHrMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
VQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRz
MSIwIAYDVQQKExlMZWVkcyBDb2xsZWdlIG9mIEJ1aWxkaW5nMQswCQYDVQQLEwJJ
- VDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
- ggEPADCCAQoCggEBALQyZT/SwHUAS2OE3jpY3SF6hbNSykchdwFNI23nvArXybmq
- l8/ZKXZOl7fG4kVxA/EviUGfi7uE17snR72FtsWpII0FYjV3XVWnnoj9hE7kdBh+
- UEpeCAsXx2PYrL5h8GjFJuHiAPYGX3hjEuQHvGIojtoEL1z02jH1WX4I98u0B5Vm
- yV2flqKGn+68eMPMVtgO7nnp889IJmQGVOXoRuotZi987UV3dzBK71oo6SAS5YR0
- 1PwnRD2FepU0DyLHIWAIhLe1hbqU8nN48RU9Lm6uoU/RPHCQ7hd6QtakSV9oIfaW
- Zr7ps4YCZ0O0J3elLyIU/bvws2TUsJrRW6MpEHcCAwEAAaOCAW0wggFpMB8GA1Ud
- IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSMhrVWHwGDq1Ml
- xTe2LoaUWkLjYDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
- FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
- HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
- ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
- BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
- BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
- EoIQYWNjZXNzLmxjYi5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAMs1x9M3D/j7o
- PrmPdL5U2q0bDp7XqyrKUzqW2rN5c3qBElVS5aqV2nFoUSxI/SdBgom324APX4Iw
- Y6RoFBJyAfUMZ6Dce7Jeyu1BzhxjGE/RjO0B8JnKPlNc8Q+FMlUHTpGFaUXvM7TK
- QOe5Giavbh76bGQaAmhAFMGxXfEYnAWhwCI8YagY3N00OLQYag5QwrJa8e2t7szQ
- NjNkLbJzs9g/pkmLRH/oDJqRvjPPcdk8ZffGqq9Y+yFsO9dyuVElCi+reb9XNEn8
- 4OwKftsJyCgu106HmCFWH/dRi0cZIJfAOKTbIivcEMKbERxqgwRYqy08StD/KPVn
- CTyuNFCgDg==
+ VDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51azAeFw0xNTEwMjYxMjM2NTNaFw0y
+ NTEwMjMxMjM2NTNaMIGCMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jr
+ c2hpcmUxDjAMBgNVBAcTBUxlZWRzMSIwIAYDVQQKExlMZWVkcyBDb2xsZWdlIG9m
+ IEJ1aWxkaW5nMQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51
+ azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJhPGIb8Ic803/i5gcez
+ RoBda2SRhO3OTa2/EJT4gV2wWpu8ZRtpHztDjGOIg7UugkPuYaf4gZYAEvxesV+Y
+ q7tMo2PrAsgKpB6ojEMRKF4mTrL9zXmmPaVlFvNtcO9rLZsTrx2YTOnEQhQZDXKf
+ TmFWOA9mcZTtsSVNorzXnzl9bbJ60z/J3WHgOe4CaySoB0XkZAuWz6rlPcNxiva+
+ 1mhuH/1L1VpjNikm1jbrPd3mOdtrXyV/pvsRtQSPIIwjJNH9tNxB0VUwnNMTBp0p
+ EaVyD7YuuDtgTdTucXk9UAX2q5r1KcjDqUXzeKaqZaOW2DN1HJGGVSB32iUddUwq
+ lUMCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
+ ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFJA+9GMp9gH9Aci+LoESpsYx
+ iK28MB8GA1UdIwQYMBaAFJA+9GMp9gH9Aci+LoESpsYxiK28MA0GCSqGSIb3DQEB
+ CwUAA4IBAQCB+A+aczQV7nH16EGXoHX7mp53MhDaedNxby8/OvA0QPdmbswUzlFk
+ kjTm586LHBVmHRl2T6O/frWa+Gj9a5JHZpPOPbfqX/cXukMxPPTowovaMCZpVt+M
+ z3RGgVZM+bC/tG/6uRW8uqx+G15HmPPuaPGurm270PGMaCrZyeLsQFy7O49KiGPB
+ atsdksWwCGMFwEZTBq1C8evMcXJsX+jXG2aJelmdzTXF3pgwk/xFEva/WRyTFJzw
+ wk9lJCd1E74ji6tYtVoFwsuyjSfAVHFBXW1A4uzzFcZXOHVNtnJC3mb+FbtD4l9S
+ vjXcKCtem5JD2o4TAAjWFrb9l5ZJZvZq
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -61,32 +57,28 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEszCCA5ugAwIBAgIRAIm9F5IqfEtgz+aqJQ6z8OEwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMIGCMQswCQYD
+ MIIEBDCCAuygAwIBAgIJAN9TCY4/UbHrMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
VQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRz
MSIwIAYDVQQKExlMZWVkcyBDb2xsZWdlIG9mIEJ1aWxkaW5nMQswCQYDVQQLEwJJ
- VDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
- ggEPADCCAQoCggEBALQyZT/SwHUAS2OE3jpY3SF6hbNSykchdwFNI23nvArXybmq
- l8/ZKXZOl7fG4kVxA/EviUGfi7uE17snR72FtsWpII0FYjV3XVWnnoj9hE7kdBh+
- UEpeCAsXx2PYrL5h8GjFJuHiAPYGX3hjEuQHvGIojtoEL1z02jH1WX4I98u0B5Vm
- yV2flqKGn+68eMPMVtgO7nnp889IJmQGVOXoRuotZi987UV3dzBK71oo6SAS5YR0
- 1PwnRD2FepU0DyLHIWAIhLe1hbqU8nN48RU9Lm6uoU/RPHCQ7hd6QtakSV9oIfaW
- Zr7ps4YCZ0O0J3elLyIU/bvws2TUsJrRW6MpEHcCAwEAAaOCAW0wggFpMB8GA1Ud
- IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSMhrVWHwGDq1Ml
- xTe2LoaUWkLjYDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
- FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
- HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
- ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
- BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
- BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
- EoIQYWNjZXNzLmxjYi5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAMs1x9M3D/j7o
- PrmPdL5U2q0bDp7XqyrKUzqW2rN5c3qBElVS5aqV2nFoUSxI/SdBgom324APX4Iw
- Y6RoFBJyAfUMZ6Dce7Jeyu1BzhxjGE/RjO0B8JnKPlNc8Q+FMlUHTpGFaUXvM7TK
- QOe5Giavbh76bGQaAmhAFMGxXfEYnAWhwCI8YagY3N00OLQYag5QwrJa8e2t7szQ
- NjNkLbJzs9g/pkmLRH/oDJqRvjPPcdk8ZffGqq9Y+yFsO9dyuVElCi+reb9XNEn8
- 4OwKftsJyCgu106HmCFWH/dRi0cZIJfAOKTbIivcEMKbERxqgwRYqy08StD/KPVn
- CTyuNFCgDg==
+ VDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51azAeFw0xNTEwMjYxMjM2NTNaFw0y
+ NTEwMjMxMjM2NTNaMIGCMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jr
+ c2hpcmUxDjAMBgNVBAcTBUxlZWRzMSIwIAYDVQQKExlMZWVkcyBDb2xsZWdlIG9m
+ IEJ1aWxkaW5nMQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51
+ azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJhPGIb8Ic803/i5gcez
+ RoBda2SRhO3OTa2/EJT4gV2wWpu8ZRtpHztDjGOIg7UugkPuYaf4gZYAEvxesV+Y
+ q7tMo2PrAsgKpB6ojEMRKF4mTrL9zXmmPaVlFvNtcO9rLZsTrx2YTOnEQhQZDXKf
+ TmFWOA9mcZTtsSVNorzXnzl9bbJ60z/J3WHgOe4CaySoB0XkZAuWz6rlPcNxiva+
+ 1mhuH/1L1VpjNikm1jbrPd3mOdtrXyV/pvsRtQSPIIwjJNH9tNxB0VUwnNMTBp0p
+ EaVyD7YuuDtgTdTucXk9UAX2q5r1KcjDqUXzeKaqZaOW2DN1HJGGVSB32iUddUwq
+ lUMCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
+ ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFJA+9GMp9gH9Aci+LoESpsYx
+ iK28MB8GA1UdIwQYMBaAFJA+9GMp9gH9Aci+LoESpsYxiK28MA0GCSqGSIb3DQEB
+ CwUAA4IBAQCB+A+aczQV7nH16EGXoHX7mp53MhDaedNxby8/OvA0QPdmbswUzlFk
+ kjTm586LHBVmHRl2T6O/frWa+Gj9a5JHZpPOPbfqX/cXukMxPPTowovaMCZpVt+M
+ z3RGgVZM+bC/tG/6uRW8uqx+G15HmPPuaPGurm270PGMaCrZyeLsQFy7O49KiGPB
+ atsdksWwCGMFwEZTBq1C8evMcXJsX+jXG2aJelmdzTXF3pgwk/xFEva/WRyTFJzw
+ wk9lJCd1E74ji6tYtVoFwsuyjSfAVHFBXW1A4uzzFcZXOHVNtnJC3mb+FbtD4l9S
+ vjXcKCtem5JD2o4TAAjWFrb9l5ZJZvZq
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/adfs.amolf.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.amolf.nl-adfs-services-trust.xml
index c92b5d83..b7b31186 100644
--- a/swamid-interfederations-2.0/adfs.amolf.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.amolf.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">AMOLF</mdui:DisplayName>
<mdui:Description xml:lang="nl">AMOLF</mdui:Description>
<mdui:Description xml:lang="en">AMOLF</mdui:Description>
- <mdui:Logo height="48" width="76">https://static.surfconext.nl/media/idp/amolf.png</mdui:Logo>
+ <mdui:Logo height="48" width="76">https://static.surfconext.nl/logos/idp/amolf.png</mdui:Logo>
<mdui:Keywords xml:lang="en">AMOLF FOM Institute Foundation for Fundamental Research on Matter</mdui:Keywords>
<mdui:Keywords xml:lang="nl">AMOLF FOM Institute Foundation for Fundamental Research on Matter Instituut</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs.artez.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.artez.nl-adfs-services-trust.xml
index 795445e0..267a1835 100644
--- a/swamid-interfederations-2.0/adfs.artez.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.artez.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">ArtEZ Institute of the Arts Hogeschool voor de Kunsten</mdui:DisplayName>
<mdui:Description xml:lang="nl">ArtEZ Hogeschool voor de Kunsten</mdui:Description>
<mdui:Description xml:lang="en">ArtEZ Institute of the Arts</mdui:Description>
- <mdui:Logo height="35" width="96">https://static.surfconext.nl/media/idp/artez.png</mdui:Logo>
+ <mdui:Logo height="35" width="96">https://static.surfconext.nl/logos/idp/artez.png</mdui:Logo>
<mdui:Keywords xml:lang="en">ArtEZ Institute of the Arts Hogeschool voor de Kunsten</mdui:Keywords>
<mdui:Keywords xml:lang="nl">ArtEZ Institute of the Arts Hogeschool voor de Kunsten</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs.driestar-educatief.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.driestar-educatief.nl-adfs-services-trust.xml
index 98dbc403..7b6a318b 100644
--- a/swamid-interfederations-2.0/adfs.driestar-educatief.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.driestar-educatief.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Driestar Educatief</mdui:DisplayName>
<mdui:Description xml:lang="nl">Driestar Educatief</mdui:Description>
<mdui:Description xml:lang="en">Driestar Educatief</mdui:Description>
- <mdui:Logo height="30" width="108">https://static.surfconext.nl/media/idp/driestar.png</mdui:Logo>
+ <mdui:Logo height="30" width="108">https://static.surfconext.nl/logos/idp/driestar.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Driestar Educatief HBO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Driestar Educatief HBO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs.fom.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.fom.nl-adfs-services-trust.xml
index ea8ffc60..753e80d8 100644
--- a/swamid-interfederations-2.0/adfs.fom.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.fom.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">FOM-bureau</mdui:DisplayName>
<mdui:Description xml:lang="nl">Stichting voor Fundamenteel Onderzoek der Materie - bureau</mdui:Description>
<mdui:Description xml:lang="en">Foundation for Fundamental Research on Matter - bureau</mdui:Description>
- <mdui:Logo height="300" width="500">https://static.surfconext.nl/media/idp/fom.png</mdui:Logo>
+ <mdui:Logo height="300" width="500">https://static.surfconext.nl/logos/idp/fom.png</mdui:Logo>
<mdui:Keywords xml:lang="en">FOM Foundation for Fundamental Research on Matter bureau</mdui:Keywords>
<mdui:Keywords xml:lang="nl">FOM Stichting voor Fundamenteel Onderzoek der Materie bureau</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml
index b240c823..67a9ca2d 100644
--- a/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml
@@ -69,6 +69,31 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDCjCCAfKgAwIBAgIQs5tPc9z706NO4mzHhrCV8TANBgkqhkiG9w0BAQsFADAZ
+ MRcwFQYDVQQDEw5hZGZzLmdlYW50Lm9yZzAeFw0xNTExMzAyMzAwMDBaFw0yNTEy
+ MzEyMzAwMDBaMBkxFzAVBgNVBAMTDmFkZnMuZ2VhbnQub3JnMIIBIjANBgkqhkiG
+ 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmRspgLghse0p+atImNpxxYICpkNEGZ/KYsCT
+ wkDpje68srDJQYJoRGo2H8RJO0JRhLdtCKtHPSB5UffPVbC2rhHRyRKbAJ+Lcwpz
+ frPe82WsHm6oTIuL+QlmjWDjjdHJ6JmYDgIhNflPsoStZ5pF7vd2NpVzPysneAWX
+ g9X8PZvvD+Vs0jA+eGFzm23t6Fq/Dd74Je+FL5avGWHGVfqDwn7gjpnV/DprC+y1
+ Aq/YE1ISsYlDbCoc9caghtdDFe+UyAZ3ftQICS2KGSw6N3JilTIlY4MB/WLlnPC1
+ KDdSRWtxAphCFg0tVOArYFfy5uiI+8/TKAl8lNCc/sdD9URk+QIDAQABo04wTDBK
+ BgNVHQEEQzBBgBDE00phQQHYraGrC4n0nrkmoRswGTEXMBUGA1UEAxMOYWRmcy5n
+ ZWFudC5vcmeCELObT3Pc+9OjTuJsx4awlfEwDQYJKoZIhvcNAQELBQADggEBAFto
+ 4jjSLViYHyICsyFsdCu3Gp3dbOcGkokEcR+EuDjuJX2ckDmXaVleyuEO73VIWFdn
+ AeCckGMgzl5Kp+QQAVJrre75kTtc7DelHeu8q4/v4mJX5jbGIikg3FzaoPPp4aeN
+ bCFADvM30dp6Tx2Jo70oaDBlmmt1IZ7/CSM8BHMYsouOvLbvexfuEhCVyjo4rlXf
+ ULZJqKXuExn8g6ACrSXxkWec0P40QJqeFmQpuW4An6KzFEvwKA8jogtEY4Vo6mJ1
+ NyQCZybAQfgvDyviwbu2fgMwy3UyIaDV0y3jNrLqVIcxn2bdsUP35jI8PFpIv6T4
+ WKQ3AllzMMauGECc7IU=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.geant.org/adfs/ls/"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.geant.org/adfs/ls/"/>
<NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
diff --git a/swamid-interfederations-2.0/adfs.glu.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.glu.nl-adfs-services-trust.xml
index b4ca078f..c2833218 100644
--- a/swamid-interfederations-2.0/adfs.glu.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.glu.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Grafisch Lyceum Utrecht</mdui:DisplayName>
<mdui:Description xml:lang="nl">Grafisch Lyceum Utrecht</mdui:Description>
<mdui:Description xml:lang="en">Grafisch Lyceum Utrecht</mdui:Description>
- <mdui:Logo height="35" width="108">https://static.surfconext.nl/media/idp/glu.png</mdui:Logo>
+ <mdui:Logo height="35" width="108">https://static.surfconext.nl/logos/idp/glu.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Grafisch Lyceum Utrecht MBO GLU</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Grafisch Lyceum Utrecht MBO GLU</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs.hsleiden.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.hsleiden.nl-adfs-services-trust.xml
index e3876f1a..0c4031f1 100644
--- a/swamid-interfederations-2.0/adfs.hsleiden.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.hsleiden.nl-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">University of Applied Sciences Leiden</mdui:DisplayName>
<mdui:Description xml:lang="nl">Hogeschool Leiden</mdui:Description>
<mdui:Description xml:lang="en">Hogeschool Leiden</mdui:Description>
- <mdui:Logo height="48" width="38">https://static.surfconext.nl/media/idp/hsleiden.gif</mdui:Logo>
- <mdui:Keywords xml:lang="en">University of Applied Sciences Leiden Hogeschool HSLEIDEN HBO</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">University of Applied Sciences Leiden Hogeschool HSLEIDEN HBO</mdui:Keywords>
+ <mdui:Logo height="48" width="38">https://static.surfconext.nl/logos/idp/hsleiden.gif</mdui:Logo>
+ <mdui:Keywords xml:lang="en">university of applied sciences leiden hogeschool hsleiden hbo</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">university of applied sciences leiden hogeschool hsleiden hbo</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/adfs.hsmarnix.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.hsmarnix.nl-adfs-services-trust.xml
index c93c51ee..6a606bc1 100644
--- a/swamid-interfederations-2.0/adfs.hsmarnix.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.hsmarnix.nl-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">Marnix Academie</mdui:DisplayName>
<mdui:Description xml:lang="nl">Marnix Academie</mdui:Description>
<mdui:Description xml:lang="en">Marnix Academie</mdui:Description>
- <mdui:Logo height="18" width="108">https://static.surfconext.nl/media/idp/marnix.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Marnix Academie HBO</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Marnix Academie HBO</mdui:Keywords>
+ <mdui:Logo height="18" width="108">https://static.surfconext.nl/logos/idp/marnix.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">marnix academie hbo</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">marnix academie hbo</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/adfs.ipabo.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.ipabo.nl-adfs-services-trust.xml
index f1f4ac77..5d95af14 100644
--- a/swamid-interfederations-2.0/adfs.ipabo.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.ipabo.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Hogeschool IPABO</mdui:DisplayName>
<mdui:Description xml:lang="nl">Hogeschool IPABO</mdui:Description>
<mdui:Description xml:lang="en">Hogeschool IPABO</mdui:Description>
- <mdui:Logo height="26" width="108">https://static.surfconext.nl/media/idp/ipabo.png</mdui:Logo>
+ <mdui:Logo height="26" width="108">https://static.surfconext.nl/logos/idp/ipabo.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Hogeschool IPABO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Hogeschool IPABO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs.kb.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.kb.nl-adfs-services-trust.xml
index d6dcdb44..d3dca3d4 100644
--- a/swamid-interfederations-2.0/adfs.kb.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.kb.nl-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">Koninklijke Bibliotheek</mdui:DisplayName>
<mdui:Description xml:lang="nl">Koninklijke Bibliotheek</mdui:Description>
<mdui:Description xml:lang="en">Koninklijke Bibliotheek</mdui:Description>
- <mdui:Logo height="15" width="108">https://static.surfconext.nl/media/idp/kb.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Koninklijke Bibliotheek KB</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Koninklijke Bibliotheek KB</mdui:Keywords>
+ <mdui:Logo height="15" width="108">https://static.surfconext.nl/logos/idp/kb.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Koninklijke Bibliotheek kb</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">Koninklijke Bibliotheek kb</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/adfs.knmi.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.knmi.nl-adfs-services-trust.xml
index a3620921..d1211975 100644
--- a/swamid-interfederations-2.0/adfs.knmi.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.knmi.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">KNMI</mdui:DisplayName>
<mdui:Description xml:lang="nl">KNMI</mdui:Description>
<mdui:Description xml:lang="en">KNMI</mdui:Description>
- <mdui:Logo height="36" width="108">https://static.surfconext.nl/media/idp/knmi.png</mdui:Logo>
+ <mdui:Logo height="36" width="108">https://static.surfconext.nl/logos/idp/knmi.png</mdui:Logo>
<mdui:Keywords xml:lang="en">KNMI Koninklijk Nederlands Meteorologisch Instituut</mdui:Keywords>
<mdui:Keywords xml:lang="nl">KNMI Koninklijk Nederlands Meteorologisch Instituut</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs.maastrichtuniversity.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.maastrichtuniversity.nl-adfs-services-trust.xml
index 6f38e3d4..5834f921 100644
--- a/swamid-interfederations-2.0/adfs.maastrichtuniversity.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.maastrichtuniversity.nl-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">Maastricht University</mdui:DisplayName>
<mdui:Description xml:lang="nl">Universiteit Maastricht</mdui:Description>
<mdui:Description xml:lang="en">Maastricht University</mdui:Description>
- <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/unimaas.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Maastricht University Universiteit UNIMAAS Universiteit MU UM</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Maastricht University Universiteit UNIMAAS Universiteit MU UM</mdui:Keywords>
+ <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/unimaas.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Maastricht University Universiteit unimaas Universiteit mu um</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">Maastricht University Universiteit unimaas Universiteit mu um</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/adfs.nwo.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.nwo.nl-adfs-services-trust.xml
index 74429bbc..efa65835 100644
--- a/swamid-interfederations-2.0/adfs.nwo.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.nwo.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">NWO</mdui:DisplayName>
<mdui:Description xml:lang="nl">De Nederlandse Organisatie voor wetenschappelijk Onderzoek (NWO) financiert wetenschappelijk onderzoek en stimuleert kwaliteit en vernieuwing in de wetenschap.</mdui:Description>
<mdui:Description xml:lang="en">The Netherlands Organisation for Scientific Research (NWO) is the Dutch national research council and promotes quality and innovation in science.</mdui:Description>
- <mdui:Logo height="251" width="500">https://static.surfconext.nl/media/idp/nwo.png</mdui:Logo>
+ <mdui:Logo height="251" width="500">https://static.surfconext.nl/logos/idp/nwo.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Netherlands Organisation for Scientific Research NWO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Nederlandse Organisatie voor Wetenschappelijk Onderzoek NWO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs.rijnhuizen.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.rijnhuizen.nl-adfs-services-trust.xml
index fe6b392d..fe49c2a2 100644
--- a/swamid-interfederations-2.0/adfs.rijnhuizen.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.rijnhuizen.nl-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">FOM-Instituut DIFFER</mdui:DisplayName>
<mdui:Description xml:lang="nl">FOM-Instituut DIFFER</mdui:Description>
<mdui:Description xml:lang="en">FOM-Instituut DIFFER</mdui:Description>
- <mdui:Logo height="40" width="40">https://static.surfconext.nl/media/idp/differ.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">FOM DIFFER Dutch Institute For Fundamental Energy Research</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">FOM DIFFER Dutch Institute For Fundamental Energy Research</mdui:Keywords>
+ <mdui:Logo height="40" width="40">https://static.surfconext.nl/logos/idp/differ.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">fom differ dutch institute for fundamental energy research</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">fom differ dutch institute for fundamental energy research</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/adfs.stenden.com-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.stenden.com-adfs-services-trust.xml
index cc545faf..bed792af 100644
--- a/swamid-interfederations-2.0/adfs.stenden.com-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.stenden.com-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Stenden Hogeschool</mdui:DisplayName>
<mdui:Description xml:lang="nl">Stenden Hogeschool</mdui:Description>
<mdui:Description xml:lang="en">Stenden Hogeschool</mdui:Description>
- <mdui:Logo height="300" width="427">https://static.surfconext.nl/media/idp/stenden.png</mdui:Logo>
+ <mdui:Logo height="300" width="427">https://static.surfconext.nl/logos/idp/stenden.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Stenden Hogeschool HBO CHN</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Stenden Hogeschool HBO CHN</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs.stw.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.stw.nl-adfs-services-trust.xml
index 72f28b87..28ecaf05 100644
--- a/swamid-interfederations-2.0/adfs.stw.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.stw.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Technologiestichting STW</mdui:DisplayName>
<mdui:Description xml:lang="nl">Technologiestichting STW realiseert kennisoverdracht tussen technische wetenschappen en gebruikers. Dat doet zij door excellent technisch-wetenschappelijk onderzoek te financieren en bij elk project onderzoekers en gebruikers letterlijk bij elkaar te brengen.</mdui:Description>
<mdui:Description xml:lang="en">Technology Foundation STW realises knowledge transfer between the technical sciences and users. It does that by funding excellent technical sciences research and for each project literally bringing researchers and users together.</mdui:Description>
- <mdui:Logo height="194" width="259">https://static.surfconext.nl/media/idp/stw.png</mdui:Logo>
+ <mdui:Logo height="194" width="259">https://static.surfconext.nl/logos/idp/stw.png</mdui:Logo>
<mdui:Keywords xml:lang="en">STW NWO research, science, technical science, technical, engineering, Foundation, valorisation, IP</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Technologiestichting STW NWO research, science, technical science, technical, engineering, Foundation, valorisation, IP</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs.surfmarket.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.surfmarket.nl-adfs-services-trust.xml
index 5b868288..6a9df67f 100644
--- a/swamid-interfederations-2.0/adfs.surfmarket.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.surfmarket.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">SURFmarket</mdui:DisplayName>
<mdui:Description xml:lang="nl">SURFmarket</mdui:Description>
<mdui:Description xml:lang="en">SURFmarket</mdui:Description>
- <mdui:Logo height="34" width="108">https://static.surfconext.nl/media/idp/surfmarket.png</mdui:Logo>
+ <mdui:Logo height="34" width="108">https://static.surfconext.nl/logos/idp/surfmarket.png</mdui:Logo>
<mdui:Keywords xml:lang="en">SURFmarket SURFdiensten</mdui:Keywords>
<mdui:Keywords xml:lang="nl">SURFmarket SURFdiensten</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml
index bb91c9ae..39bd3e40 100644
--- a/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">Eindhoven University of Technology</mdui:DisplayName>
<mdui:Description xml:lang="nl">Technische Universiteit Eindhoven</mdui:Description>
<mdui:Description xml:lang="en">Technische Universiteit Eindhoven</mdui:Description>
- <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/tue.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Eindhoven University of Technology Technische Universiteit Eindhoven TUE</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Eindhoven University of Technology Technische Universiteit Eindhoven TUE</mdui:Keywords>
+ <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/tue.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">eindhoven university of technology technische universiteit eindhoven tue</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">eindhoven university of technology technische universiteit eindhoven tue</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml
index 0eb8c36c..e04286c8 100644
--- a/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml
@@ -29,21 +29,21 @@
<md:KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIQFZiyu9vx3bVBXRoeCQUILTANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgwN1oXDTE1MTIyMzIxNDgwN1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2+ePiq76UBNnhcXAGacPiTg6kLX5OAmUM0ehzmMYLEywp/eH65OjzD6Gz0mYxXL9xCw9U/m61LGhVLzZt7ZmYPs8SlxMHzsjawrGp5gsFXdo99nwbxGElbCYlJiS7Y+GMkXUtAIW3N4MoktO9j7Q7Iu4f6bnOkRLgdGXkvv2RTiD5CaOodAnzdwncVmFORk3ued1ZeS0S4AyFJFC4RqYmDrvU3eLyCdHQZoZ3SO1RkSicpTHibOaYZ1pP8keEHJ2aP63iw1WFF49cIucVcyeJ+1SBkorXPKBKhw5BJP17USD290ZWzPmTXLLieHyYKINxK3xe1xCESVLxJJgnca78CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZDl80K94WjYpIjpa2q6FZ7ZaLTGA7ffW5gdQfPcbJbCkuWCmCsCmOwDmFFZ5Gb+4tKJxHF2Z+Tzt8yIY/OCg0Y61lerXdoNC1bYahnUDDfU11m441vsCAyymftBZsOewupXdcyh3NPiduOlJd8iXybZ6BZaUoVUjfkFAmjkii+pJB+H+gXo2CBNksAXhUAbk4es/1FSSNdXGrDG8qj91uX+l69oQK1ERIpux2ALEv/j/zBNYNQgYiYPyP+/b06/MUTxNbFC4LGb3XcIk0OqOauhoZcoEcTLcmPycOYs8hJl80lWSEGhl9+qXhoxNpkh4ucYxvDArCsCgYQZd/HhN6w==</ds:X509Certificate>
+ <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIQO7k5W9bEBJdDpzGopgV4OzANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTE1MTIwNDAwMTgxN1oXDTE2MTIwMzAwMTgxN1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALfykzr9WnvSwX4yhG6rLbTwvvAXcvMWyUcbV5usDITt2FpdPyD7eMOJVoefIimvQGQ3JKlnoKwsTBMNZGJIaKXNRX06rYjOr2Isip0f7BLxiHXAJcif80MLqeuXRGELa0Z5en3irAscOGOWtpxYebslAAhZZqjOUbU4BlvutwCPa/FIqPhLhWoWkfXy8/Bs1VYnSCWCAO5UTRFzRi3K8glKy/1NFiP90LapP+/V1U+Zr3/rGg+2usWFjADPEFjFj7bnFC2pmxuEQf0F0XFC6s8mbXOOcsHGqvKrsQdgeqfBJMHofhh0hkTA9Gsl8TP4yRT5NQ80EA8ry6Zko6TmcC8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEANAq63e5sekNfz1PnSG1dLGa9xpMCz3Nk5IyPb5ED7hrPXHXZG2FXRJDXHm2ux0yIOhS0uLkoApAupXiE87pga/6aPod2fSGbBgihRIBNRuAr7g7HjL5w5N0gZPEzby3fYqFR0L4qRxALWbnYfFAjPbY+KfRs86TVgSBFoSY6N5+MYGtcoAL7wl0TRO3aua8uHsTZp8pZ4/CxSmLL1tC1abVuoqD7EcwWJq0tRdrI7UM1vjAWiLMvsp3XS+7LHvZXVXnYnp/rVpSnkA8C7ApthhV7s4ms2ecUYUO1t8AHBgYRQ/kme0Twd7SddHyAwN/PZVGwu3bPIPbUgg374YP69g==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQKEGE7N1PhqND4Izv6Nl9tzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MDExMjE5MjYwMloXDTE1MDExMjE5MjYwMlowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgssWOg27ZeOAIofyLaYIxZxFPVyWVMoX8uaAeM0mYEj+ENT1pM4+G7sGNwKEIyOST6Lu7L7BMMku8jFF6Rt2GgV7dWDgWa2nNQ3H3XDQIH4ggZTmibrfBoyEpgNwuPhCqW+n4sr19jmO5aYs3elwSc4ogiaEPQy+CDpBKq9wO4hD4YOuD6jBtmkySvkG/rE7BSkC/fxg6qeNFdC4xVhkJZuU+tJRbBIHznqAD6kErdgHlM82sKoTN6q1dZk9AkE8ZwmI9T1s2g2eY1cB77Px7rqXCvbA2+Tjt2I3f8m99JxY5gHedR7UJfKLBPlo3V0rMJZlFfGOGKR8z9AphA/G0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAtbBphHKTw16aTAZ1ihlZQNnT3UgVC2JwlnZD16iczLa+96NiBNwu6il9K7UwjA/JD6t7dNWoVXEJTREGJUs9IzN1XP7PwqU8zlIiug8p7q8Efit8JppO1vmgpofom+OVxZ1A8vc5wmsuvwLoEQGu0Y/3JawPsaDvA7wdF+Bnqo+DTVCIe3wOGAY6D2C4XIvYZirz3cFoTd4BrGLx/dfRkmBmIeDJ39G1DcRfAZF59b1c7n4OeEhq2dg7yKP1ql0e1bKOKKqW0wXStNHamceJWU/hbCNid87rKpvTMvH8ClkC2pf3R2/bR27VuhWyAbPTp1+hhIJKmCWTkEtt/JOg4w==</ds:X509Certificate>
+ <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQYSuOi8k52qFDiHIcmLzhUzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgxMVoXDTE1MTIyMzIxNDgxMVowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeZpLVFfRtz3BFIEKaCOcf0w3041Vna4JAhxKT9hkhMW5TSh2S7hcgBiRm6Q2olmBtc+KMN9ReJT1ZJzQUa27qaGRepO/M+isJk4QqL9zOX/BpYFEWTRYMLlqqukZBhtwdtluIMCJlAClccRSikCx+bGN+fcPwfrv3T2y+C+MMp8GIN/QWJf97GEP5XR9VooItR8+nkUm1FOkvKMr5xFwZfilXQTzDer3Z42yMYRpr8rw7QdMJP11A7v7NIZTYRQIU+Qi0uPsvRI5FI7IG3NWyepslS1vwjU/dpKeBUYLQwwRxvV09YX+ULSKpClm2oZ7LuE/vt7Bok6vnPa3TG+i0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAktHUw5HNOOH/ETVIeAgdi5FXq5e8maX8Qe5vFsWRWPTP9MygRwNajY07XpXQmw2CKbAzY6ZD2RoA7g9swBpCcNYuJmAnA3LtyFiRrog/+XzWeRt7tbqDjiYZiBdVD84JbfVMD3q0Pi4iLn+KPAmYajYAzftf1vKr/fvwFt2D2eR+sXefEmcwNPSFFma0umEgSajxiN4gdTA3ZMTNV1J5tv1cwb9TYx0mDHP+FCwsEE2bHsDk5CDBWpgFVvEiQwfra1amz+BIPWG5Nln9bedfE0BjdGH5OK424DBwBTygzBV8OM9jB7dOcaA+0K0/UduM+ka42XxP7WFrq3VKmGfCbg==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQYSuOi8k52qFDiHIcmLzhUzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgxMVoXDTE1MTIyMzIxNDgxMVowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeZpLVFfRtz3BFIEKaCOcf0w3041Vna4JAhxKT9hkhMW5TSh2S7hcgBiRm6Q2olmBtc+KMN9ReJT1ZJzQUa27qaGRepO/M+isJk4QqL9zOX/BpYFEWTRYMLlqqukZBhtwdtluIMCJlAClccRSikCx+bGN+fcPwfrv3T2y+C+MMp8GIN/QWJf97GEP5XR9VooItR8+nkUm1FOkvKMr5xFwZfilXQTzDer3Z42yMYRpr8rw7QdMJP11A7v7NIZTYRQIU+Qi0uPsvRI5FI7IG3NWyepslS1vwjU/dpKeBUYLQwwRxvV09YX+ULSKpClm2oZ7LuE/vt7Bok6vnPa3TG+i0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAktHUw5HNOOH/ETVIeAgdi5FXq5e8maX8Qe5vFsWRWPTP9MygRwNajY07XpXQmw2CKbAzY6ZD2RoA7g9swBpCcNYuJmAnA3LtyFiRrog/+XzWeRt7tbqDjiYZiBdVD84JbfVMD3q0Pi4iLn+KPAmYajYAzftf1vKr/fvwFt2D2eR+sXefEmcwNPSFFma0umEgSajxiN4gdTA3ZMTNV1J5tv1cwb9TYx0mDHP+FCwsEE2bHsDk5CDBWpgFVvEiQwfra1amz+BIPWG5Nln9bedfE0BjdGH5OK424DBwBTygzBV8OM9jB7dOcaA+0K0/UduM+ka42XxP7WFrq3VKmGfCbg==</ds:X509Certificate>
+ <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQMXP1/ezaSIZIOp/pjOiCgDANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE1MTIwNDAwMTgyMloXDTE2MTIwMzAwMTgyMlowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALdO7kcKNsClDGcJNKysS7MxE6iNlMAYxIkoJju5qvxjazuHxKmOzScYv1x83pw0VhJRg3psmus52tynauQ0Rvsba8F7Ngk6W9e21MbPjpMdF68k2x0zWnNpg+fMDoEWTds5S6QNUzsKp3eaI2tkMny8Ng33ZD2XvjkG/T7BDkIeH1aZvA1COBqNPx0WS7usc9LYtdNghdn24H7ZlcPCokZJbeDnbuUNS7c/mjQLXKKExUFcoEKduEeUF3zeT2D531TSLNwiJ9iQJ9rRFWK7hrgr2oP+sdojvoeI8cwP/TSGWfvDoU1sRZ9qTlSN+b0W/MnSkdKBzRjTCMpRa/ABvWkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAo9sQIrRQ3uEENG/oyrmV65NUb3Ta9fd28VHq1Rk/M5UUeqzsO6Agyt3YBAdaeRgGw8l6NBG+XFyNjLsGY9gND64gQF+65zSrEwdbwqEFciR0ZNVw1E3Bqq7W4MjeH4EtG5eTplvR3A77vfKy/vFXn13draGgZOX7e2mJ/CNK4drUYNvMorf2+ZcP1FjvypV91bY8g168+0lZYHGYrmy4ajVBvFZ82LJuW2OCZ4KPLIY51qpNiMeikePzUNc6/CKJ0zLq4bRRSy2kCyj0Pq2dwV+N0WAVGFJ8uxDRZx7AFG5+JcajSyDYHVVjUIzzqS8UDVV7/XWAQmWcEU4eNid1Hg==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -88,19 +88,19 @@
<md:ContactPerson contactType="administrative">
<md:Company>Swedish Defence University</md:Company>
<md:SurName>FHS IT Helpdesk</md:SurName>
- <md:EmailAddress>helpdesk@fhs.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@fhs.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 55342545</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Swedish Defence University</md:Company>
<md:SurName>FHS IT Helpdesk</md:SurName>
- <md:EmailAddress>helpdesk@fhs.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@fhs.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 55342545</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Swedish Defence University</md:Company>
<md:SurName>FHS IT Helpdesk</md:SurName>
- <md:EmailAddress>helpdesk@fhs.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@fhs.se</md:EmailAddress>
<md:TelephoneNumber>+46 08 55342545</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs01.kempel.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs01.kempel.nl-adfs-services-trust.xml
new file mode 100644
index 00000000..74d5bb9f
--- /dev/null
+++ b/swamid-interfederations-2.0/adfs01.kempel.nl-adfs-services-trust.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs01.kempel.nl/adfs/services/trust">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-11-16T12:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="nl">Hogeschool de Kempel</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Hogeschool de Kempel</mdui:DisplayName>
+ <mdui:Description xml:lang="nl">Hogeschool de Kempel</mdui:Description>
+ <mdui:Description xml:lang="en">Hogeschool de Kempel</mdui:Description>
+ <mdui:Logo height="79" width="108">https://static.surfconext.nl/logos/idp/kempel.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Hogeschool de Kempel</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">Hogeschool de Kempel</mdui:Keywords>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/5ed01520efa3f5c56ae3638e4c6d74aa"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Hogeschool de Kempel</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Hogeschool de Kempel</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.kempel.nl/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs1.oba.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs1.oba.nl-adfs-services-trust.xml
index 2dcb4e9b..be42e3d1 100644
--- a/swamid-interfederations-2.0/adfs1.oba.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs1.oba.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Openbare Bibliotheek Amsterdam (OBA)</mdui:DisplayName>
<mdui:Description xml:lang="nl">Openbare Bibliotheek Amsterdam (OBA)</mdui:Description>
<mdui:Description xml:lang="en">Openbare Bibliotheek Amsterdam (OBA)</mdui:Description>
- <mdui:Logo height="48" width="48">https://static.surfconext.nl/media/idp/oba.png</mdui:Logo>
+ <mdui:Logo height="48" width="48">https://static.surfconext.nl/logos/idp/oba.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Openbare Bibliotheek Amsterdam OBA</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Openbare Bibliotheek Amsterdam OBA</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs2.cito.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs2.cito.nl-adfs-services-trust.xml
index 4a297113..c936304c 100644
--- a/swamid-interfederations-2.0/adfs2.cito.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs2.cito.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Cito</mdui:DisplayName>
<mdui:Description xml:lang="nl">Cito</mdui:Description>
<mdui:Description xml:lang="en">Cito</mdui:Description>
- <mdui:Logo height="48" width="94">https://static.surfconext.nl/media/idp/cito.png</mdui:Logo>
+ <mdui:Logo height="48" width="94">https://static.surfconext.nl/logos/idp/cito.png</mdui:Logo>
<mdui:Keywords xml:lang="en">cito</mdui:Keywords>
<mdui:Keywords xml:lang="nl">cito</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs2.fontys.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs2.fontys.nl-adfs-services-trust.xml
index 31d4eb66..fa7624a6 100644
--- a/swamid-interfederations-2.0/adfs2.fontys.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs2.fontys.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Fontys Hogescholen</mdui:DisplayName>
<mdui:Description xml:lang="nl">Fontys Hogescholen</mdui:Description>
<mdui:Description xml:lang="en">Fontys Hogescholen</mdui:Description>
- <mdui:Logo height="57" width="75">https://static.surfconext.nl/media/idp/fontys.png</mdui:Logo>
+ <mdui:Logo height="57" width="75">https://static.surfconext.nl/logos/idp/fontys.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Fontys Hogescholen</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Fontys Hogescholen</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfs20.hva.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs20.hva.nl-adfs-services-trust.xml
index 91a97cb9..9d9b1e08 100644
--- a/swamid-interfederations-2.0/adfs20.hva.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs20.hva.nl-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">Hogeschool van Amsterdam</mdui:DisplayName>
<mdui:Description xml:lang="nl">Hogeschool van Amsterdam</mdui:Description>
<mdui:Description xml:lang="en">Hogeschool van Amsterdam</mdui:Description>
- <mdui:Logo height="44" width="266">https://static.surfconext.nl/media/idp/hva.jpg</mdui:Logo>
- <mdui:Keywords xml:lang="en">Hogeschool van Amsterdam HVA HBO</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Hogeschool van Amsterdam HVA HBO</mdui:Keywords>
+ <mdui:Logo height="44" width="266">https://static.surfconext.nl/logos/idp/hva.jpg</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Hogeschool van Amsterdam hva HBO</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">Hogeschool van Amsterdam hva HBO</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/adfs3host.proxy.rocmn.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs3host.proxy.rocmn.nl-adfs-services-trust.xml
index 015d01d9..bfe1f5b8 100644
--- a/swamid-interfederations-2.0/adfs3host.proxy.rocmn.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs3host.proxy.rocmn.nl-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">ROC Midden Nederland</mdui:DisplayName>
<mdui:Description xml:lang="nl">ROC Midden Nederland is een onderwijsorganisatie voor middelbaar beroepsonderwijs, voortgezet onderwijs voor volwassen (VAVO Lyceum), bedrijfsopleidingen en participatieonderwijs in de provincie Utrecht.</mdui:Description>
<mdui:Description xml:lang="en">ROC Midden Nederland is een onderwijsorganisatie voor middelbaar beroepsonderwijs, voortgezet onderwijs voor volwassen (VAVO Lyceum), bedrijfsopleidingen en participatieonderwijs in de provincie Utrecht.</mdui:Description>
- <mdui:Logo height="70" width="130">https://static.surfconext.nl/media/idp/ROCMNlogo.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">ROCMN, ROC Midden Nederland</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">ROCMN, ROC Midden Nederland</mdui:Keywords>
+ <mdui:Logo height="70" width="130">https://static.surfconext.nl/logos/idp/ROCMNlogo.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">rocmn ROC Midden Nederland</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">rocmn ROC Midden Nederland</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/adfs3prod.aventus.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs3prod.aventus.nl-adfs-services-trust.xml
index c59056b3..63be3438 100644
--- a/swamid-interfederations-2.0/adfs3prod.aventus.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs3prod.aventus.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">ROC Aventus</mdui:DisplayName>
<mdui:Description xml:lang="nl">ROC Aventus</mdui:Description>
<mdui:Description xml:lang="en">ROC Aventus</mdui:Description>
- <mdui:Logo height="300" width="500">https://static.surfconext.nl/media/idp/aventus3.png</mdui:Logo>
+ <mdui:Logo height="300" width="500">https://static.surfconext.nl/logos/idp/aventus3.png</mdui:Logo>
<mdui:Keywords xml:lang="en">ROC Aventus MBO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">ROC Aventus MBO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/adfsv2.inholland.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfsv2.inholland.nl-adfs-services-trust.xml
index e452f0e4..bd8849b4 100644
--- a/swamid-interfederations-2.0/adfsv2.inholland.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfsv2.inholland.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Inholland University of Applied Sciences</mdui:DisplayName>
<mdui:Description xml:lang="nl">Hogeschool Inholland</mdui:Description>
<mdui:Description xml:lang="en">Hogeschool Inholland</mdui:Description>
- <mdui:Logo height="37" width="108">https://static.surfconext.nl/media/idp/inholland.png</mdui:Logo>
+ <mdui:Logo height="37" width="108">https://static.surfconext.nl/logos/idp/inholland.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Hogeschool Inholland Inholland University of Applied Sciences HBO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Hogeschool Inholland Inholland University of Applied Sciences HBO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 19d2e7f8..c14f7643 100644
--- a/swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/metadata.php/default-sp">
<!--
- This is a "M3C Administration" SimpleSAMLphp SP for the University of Nottingham.
+ This is a "M3C Administration" simpleSAMLphp SP for the University of Nottingham.
-->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-17T10:17:54Z">
diff --git a/swamid-interfederations-2.0/afire.asnet.am-idp-shibboleth.xml b/swamid-interfederations-2.0/afire.asnet.am-idp-shibboleth.xml
new file mode 100644
index 00000000..919bcdf3
--- /dev/null
+++ b/swamid-interfederations-2.0/afire.asnet.am-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://afire.asnet.am/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.asnet.am" registrationInstant="2015-12-06T12:47:02Z"/>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnet.am</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Academic Scientific Network of Armenia</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">https://afire.asnet.am/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://afire.asnet.am/index.php/identity-federation-policy</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFkTCCBHmgAwIBAgIRAJGxdi6BndHGs8GWsagMbaYwDQYJKoZIhvcNAQELBQAw
+gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
+VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
+Q0EwHhcNMTUwNjAyMDAwMDAwWhcNMTgwNjAxMjM1OTU5WjCBoTEhMB8GA1UECxMY
+RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
+dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
+QVMuMRwwGgYDVQQLExNDT01PRE8gU1NMIFdpbGRjYXJkMRMwEQYDVQQDFAoqLmFz
+bmV0LmFtMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtYnlRhHME8WP
+4x/2SiMMV25dK9HnrJmrssJVi/A/3Om0cSMVyybohqMcWTLq4s6A1kBSy4pEK7Kl
+3M7qaTBUVOkXZZPn/vpOJoaHR71tG/CClNivpN5Q/a3RA6jRjT20pvUApNzQglwN
+23wYPu5Uz1iLjVT53Bq3HnbuYlI7FIjWKyfHonHnYw0CARJHRXeq/ykFngbxj1ie
+sdtVdrpI4hUDk1o85y4rDuvK1HYcMudI8kbfZ1a8l/3jiA4EnNeoe5fbKQDkP63V
+cN2f1cM3Noj1GGAGYX5sY9PY3d0UmBH/8Kzg4i58E8V4EJTwLLYpSfAXO04+e3Bb
+VKCUUz5vywIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99D
+tDoo2ucwHQYDVR0OBBYEFKjnkZCHfwFjf2kkMGdeTAcM4Q8SMA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjBPBgNVHSAESDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBz
+Oi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmg
+R6BFhkNodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxp
+ZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYB
+BQUHMAKGQ2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZh
+bGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
+Y3NwLmNvbW9kb2NhLmNvbTAfBgNVHREEGDAWggoqLmFzbmV0LmFtgghhc25ldC5h
+bTANBgkqhkiG9w0BAQsFAAOCAQEAAN5hdW1ipGLn9khP5UoSEHFJPuKzR4yzuWrF
+Kc1UamsQLWA2SNvN3Lb+4vj+W7q++aBgmGEjfhw/BWQzFOXfeHHYb8YLBZuweesm
+5neG4kULC4Qpf6tc5LgK0V6geVNHzXnAchLn2KzBhjgMUmvHOJFPSwCJHKSyN2Qc
+lCrQol4CRGiKXH7428yGMgFi2kqdL9xlxxned0/13GfyMVQwUfwmLe2a/HH7nn4k
+iNKDKTPbYWvuDjrIuKskC0uBwkvqEunCqE0beN5/bzfA/XiN7VFQm19o6T/8fwFO
+xAkgTb8s+nKQoqK0D7O7EXRzLd/m825ao8+E21sqAhwodilGeg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://afire.asnet.am:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://afire.asnet.am:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://afire.asnet.am/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://afire.asnet.am/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://afire.asnet.am:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://afire.asnet.am/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://afire.asnet.am/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://afire.asnet.am/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://afire.asnet.am/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnet.am</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFkTCCBHmgAwIBAgIRAJGxdi6BndHGs8GWsagMbaYwDQYJKoZIhvcNAQELBQAw
+gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
+VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
+Q0EwHhcNMTUwNjAyMDAwMDAwWhcNMTgwNjAxMjM1OTU5WjCBoTEhMB8GA1UECxMY
+RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
+dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
+QVMuMRwwGgYDVQQLExNDT01PRE8gU1NMIFdpbGRjYXJkMRMwEQYDVQQDFAoqLmFz
+bmV0LmFtMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtYnlRhHME8WP
+4x/2SiMMV25dK9HnrJmrssJVi/A/3Om0cSMVyybohqMcWTLq4s6A1kBSy4pEK7Kl
+3M7qaTBUVOkXZZPn/vpOJoaHR71tG/CClNivpN5Q/a3RA6jRjT20pvUApNzQglwN
+23wYPu5Uz1iLjVT53Bq3HnbuYlI7FIjWKyfHonHnYw0CARJHRXeq/ykFngbxj1ie
+sdtVdrpI4hUDk1o85y4rDuvK1HYcMudI8kbfZ1a8l/3jiA4EnNeoe5fbKQDkP63V
+cN2f1cM3Noj1GGAGYX5sY9PY3d0UmBH/8Kzg4i58E8V4EJTwLLYpSfAXO04+e3Bb
+VKCUUz5vywIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99D
+tDoo2ucwHQYDVR0OBBYEFKjnkZCHfwFjf2kkMGdeTAcM4Q8SMA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjBPBgNVHSAESDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBz
+Oi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmg
+R6BFhkNodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxp
+ZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYB
+BQUHMAKGQ2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZh
+bGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
+Y3NwLmNvbW9kb2NhLmNvbTAfBgNVHREEGDAWggoqLmFzbmV0LmFtgghhc25ldC5h
+bTANBgkqhkiG9w0BAQsFAAOCAQEAAN5hdW1ipGLn9khP5UoSEHFJPuKzR4yzuWrF
+Kc1UamsQLWA2SNvN3Lb+4vj+W7q++aBgmGEjfhw/BWQzFOXfeHHYb8YLBZuweesm
+5neG4kULC4Qpf6tc5LgK0V6geVNHzXnAchLn2KzBhjgMUmvHOJFPSwCJHKSyN2Qc
+lCrQol4CRGiKXH7428yGMgFi2kqdL9xlxxned0/13GfyMVQwUfwmLe2a/HH7nn4k
+iNKDKTPbYWvuDjrIuKskC0uBwkvqEunCqE0beN5/bzfA/XiN7VFQm19o6T/8fwFO
+xAkgTb8s+nKQoqK0D7O7EXRzLd/m825ao8+E21sqAhwodilGeg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://afire.asnet.am:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://afire.asnet.am:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Academic Scientific Network of Armenia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">ASNET-AM</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.asnet.am/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Andranik</md:GivenName>
+ <md:SurName>Hayrapetyan</md:SurName>
+ <md:EmailAddress>mailto:andranik@ipia.sci.am</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/agenda.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/agenda.ct.infn.it-shibboleth.xml
index f0f76a6e..bc601c59 100644
--- a/swamid-interfederations-2.0/agenda.ct.infn.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/agenda.ct.infn.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://agenda.ct.infn.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://agenda.ct.infn.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T06:20:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml
index 84e171ae..bdcb2e5c 100644
--- a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aginfra-sg.ct.infn.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aginfra-sg.ct.infn.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-07-06T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/aiwip.com-shibboleth.xml b/swamid-interfederations-2.0/aiwip.com-shibboleth.xml
new file mode 100644
index 00000000..b0d7f130
--- /dev/null
+++ b/swamid-interfederations-2.0/aiwip.com-shibboleth.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aiwip.com/shibboleth">
+ <!--
+ This is a Shibboleth SP for Aiwip Ltd.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T10:40:29Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aiwip.com/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Aiwip</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Free printing for University students</mdui:Description>
+ <mdui:Logo height="135" width="90">https://aiwip.com/static/images/logo2-dark.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDijCCAnKgAwIBAgIJALiUPWnEh4GGMA0GCSqGSIb3DQEBCwUAMEYxCzAJBgNV
+ BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xEjAQBgNVBAoMCUFpd2lwIEx0ZDESMBAG
+ A1UEAwwJYWl3aXAuY29tMB4XDTE1MDkxMTE1MTMyNVoXDTI1MDkwODE1MTMyNVow
+ RjELMAkGA1UEBhMCR0IxDzANBgNVBAgMBkxvbmRvbjESMBAGA1UECgwJQWl3aXAg
+ THRkMRIwEAYDVQQDDAlhaXdpcC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ ggEKAoIBAQDW6jJEpL8vmaLnf8npBWtft8THcVkhJSGWyHkKlRxIKeiXc3PeN+O0
+ uxqaLq4D+ffRm2uXxtDF8bkpCmrqMujAMgUdYxpXh3La9OOHjirY3f4XnA0+lEoe
+ xN0v8n9eHdf8pGXxCRR9q1VR9izbo8yRexxMlAk6WnRRYIKTaDFRAEhqIgeto+qd
+ 8rxlzaAIQY6c82wfYoVEUfLcZa09Beo0UxOp8drpCQx4ognawlg1Lt7nXuSagXIq
+ vxXpWb5Gs3M1dDIuVjtVh3SYL2LXlC5g//ZBU/0TadR68MadZxRFlWf7piV/AjBJ
+ 8pI5DGn29F0ENYIol7xxDfmK8qxVlsUZAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
+ YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
+ DgQWBBT4McZ381AJbH3wftoeRd+VmqqA6TAfBgNVHSMEGDAWgBT4McZ381AJbH3w
+ ftoeRd+VmqqA6TANBgkqhkiG9w0BAQsFAAOCAQEARUzxoddJ5qQm2u+pvw6xcaNM
+ 2/cXhVLuSnIDtxZr+xlo3oHbwdIyk5uOiK7ekH8JmPAbs0sUpuk6K4WXIFK+wRlF
+ fwsZ2MRujTbtg3ttpI4xMVgvO6s2vSAzoy0ibuRos0Mfokmsd9Z22N//jeJrzdQx
+ PmhaExV64i5NSTAMulG7j7MsF08Rv1lylG3ZbaVOVCMctweQaUysiLwHPvlX6VU1
+ qgXfL+JQhd70ZZyylbpqEbfl0JlZz/bGOYuF5meBhfy3BDj8zYjPZycwEuSZ+slY
+ yb9mD1eP67TQAaShznHlfwmsTquWKUVdCwSUAd+oYzFj1w9lebTT4awLFP7EpQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aiwip.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aiwip.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aiwip.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aiwip.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aiwip.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aiwip.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aiwip.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aiwip.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aiwip.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aiwip.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aiwip.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Aiwip Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Aiwip</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://aiwip.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Ruslan</GivenName>
+ <SurName>Khazarchiev</SurName>
+ <EmailAddress>mailto:ruslan@aiwip.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Ruslan</GivenName>
+ <SurName>Khazarchiev</SurName>
+ <EmailAddress>mailto:ruslan@aiwip.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml b/swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml
index ef1d6109..eb154fc9 100644
--- a/swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml
@@ -77,13 +77,11 @@
<OrganizationURL xml:lang="en">http://corp.credoreference.com/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Michael</GivenName>
- <SurName>McFarland</SurName>
- <EmailAddress>mailto:Michael.mcfarland@credoreference.com</EmailAddress>
+ <GivenName>Support</GivenName>
+ <EmailAddress>mailto:support@credoreference.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Michael</GivenName>
- <SurName>McFarland</SurName>
- <EmailAddress>mailto:Michael.mcfarland@credoreference.com</EmailAddress>
+ <GivenName>Support</GivenName>
+ <EmailAddress>mailto:support@credoreference.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml b/swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml
index 53e5342b..df37afad 100644
--- a/swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml
@@ -76,12 +76,11 @@
<OrganizationURL xml:lang="en">http://corp.credoreference.com/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Credo Reference Support</GivenName>
+ <GivenName>Support</GivenName>
<EmailAddress>mailto:support@credoreference.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Michael</GivenName>
- <SurName>McFarland</SurName>
- <EmailAddress>mailto:michael.mcfarland@credoreference.com</EmailAddress>
+ <GivenName>Support</GivenName>
+ <EmailAddress>mailto:support@credoreference.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml b/swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml
index 8a28ea5d..bc9c90e4 100644
--- a/swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml
@@ -76,12 +76,11 @@
<OrganizationURL xml:lang="en">http://corp.credoreference.com/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Credo Reference Support</GivenName>
+ <GivenName>Support</GivenName>
<EmailAddress>mailto:support@credoreference.com</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Michael</GivenName>
- <SurName>McFarland</SurName>
- <EmailAddress>mailto:michael.mcfarland@credoreference.com</EmailAddress>
+ <GivenName>Support</GivenName>
+ <EmailAddress>mailto:support@credoreference.com</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml b/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml
index 7a329001..91361416 100644
--- a/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eu-decide.eu/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eu-decide.eu/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
diff --git a/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml b/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml
index 425757f6..91f8bf1c 100644
--- a/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eumedgrid.eu/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eumedgrid.eu/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
diff --git a/swamid-interfederations-2.0/ashiok.ufpe.br-idp-shibboleth.xml b/swamid-interfederations-2.0/ashiok.ufpe.br-idp-shibboleth.xml
new file mode 100644
index 00000000..c87a05ea
--- /dev/null
+++ b/swamid-interfederations-2.0/ashiok.ufpe.br-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ashiok.ufpe.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufpe.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UFPE - Universidade Federal de Pernambuco</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ufpe.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ufpe.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEKjCCAxICAQAwDQYJKoZIhvcNAQEFBQAwgdoxMTAvBgNVBAoTKFVGUEUgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBQZXJubWJ1Y28xNTAzBgNVBAsULE5USSAt
+IE7DumNsZW8gZGUgVGVjb25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSIwIAYJKoZI
+hvcNAQkBFhNhbG1pci5waXJlc0B1ZnBlLmJyMQ8wDQYDVQQHEwZSZWNpZmUxEzAR
+BgNVBAgTClBlcm5hbWJ1Y28xCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5hc2hpb2su
+dWZwZS5icjAeFw0xNTA3MDgxNTE3MDBaFw0xODA3MDcxNTE3MDBaMIHaMTEwLwYD
+VQQKEyhVRlBFIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVybm1idWNvMTUw
+MwYDVQQLFCxOVEkgLSBOw7pjbGVvIGRlIFRlY29ub2xvZ2lhIGRhIEluZm9ybWHD
+p8OjbzEiMCAGCSqGSIb3DQEJARYTYWxtaXIucGlyZXNAdWZwZS5icjEPMA0GA1UE
+BxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEXMBUG
+A1UEAxMOYXNoaW9rLnVmcGUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCpJtnXex0EfajEm2mxs7SbI095tfMKoBYKm+oX2Rh0LG9Dqv2tkz8zlrGz
+65MX7J0T83f2XXCtwn8+QeFWIPjZeCrhXqiV+cd/8zT48mat8jjvlPXQUBT9l7CF
+ui7Ck3nKgAuyRmLZS0VRWa5Fe7jQVenb0ukfWjlkqA0HA3aG76d/5/Re/JHCuhoX
+J/B8Hk3r4RnUqAR5v9p+wvVlIfuMgZ2PoMpOEFnLRST/IAYYu6sfNF+/OGYnNOVt
+HaodpJiODntW7N58a7LUvmMDQcuZNk/gEFFa7lpc1lUxZ21/xjzt8hoM5JaKalRp
+WvoGp7ebIAjU5XAAB9D617WrhRaHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAB7u
+ICGu5gqybOHxpZOVMhL7Vc5ZkHKk07gFzlMeDcrm4FEi9NSC+ACSZOw4Y65hzlML
+3Mqvwa27U2Uf9+g8cXKvmjEImZTX+1DpWcgfslS6ZZlXPX751+c+0G5HCMvHQotT
+eouE1EENazDBi7+JHPH0dVX5EQwo/TghbjWwZn0XauScEQQSfcb5ncHWV62IlpjP
+HRjJA1oHM/BcHqi1Gld3QuKZ6Mz0AWAjsXlbwvcOUNjtPdgghHZzL/2PZQwErMw3
+3p9yrXX8gzzfzibmLwq3vu7eqXmz40Q1GyzzFVBcHdOTYRKON7g0Gj7rYzPVzw6m
+gJlqm/h9oLN/JBPHKNI=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ashiok.ufpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ashiok.ufpe.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ashiok.ufpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ashiok.ufpe.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ashiok.ufpe.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ashiok.ufpe.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufpe.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEKjCCAxICAQAwDQYJKoZIhvcNAQEFBQAwgdoxMTAvBgNVBAoTKFVGUEUgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBQZXJubWJ1Y28xNTAzBgNVBAsULE5USSAt
+IE7DumNsZW8gZGUgVGVjb25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSIwIAYJKoZI
+hvcNAQkBFhNhbG1pci5waXJlc0B1ZnBlLmJyMQ8wDQYDVQQHEwZSZWNpZmUxEzAR
+BgNVBAgTClBlcm5hbWJ1Y28xCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5hc2hpb2su
+dWZwZS5icjAeFw0xNTA3MDgxNTE3MDBaFw0xODA3MDcxNTE3MDBaMIHaMTEwLwYD
+VQQKEyhVRlBFIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVybm1idWNvMTUw
+MwYDVQQLFCxOVEkgLSBOw7pjbGVvIGRlIFRlY29ub2xvZ2lhIGRhIEluZm9ybWHD
+p8OjbzEiMCAGCSqGSIb3DQEJARYTYWxtaXIucGlyZXNAdWZwZS5icjEPMA0GA1UE
+BxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEXMBUG
+A1UEAxMOYXNoaW9rLnVmcGUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCpJtnXex0EfajEm2mxs7SbI095tfMKoBYKm+oX2Rh0LG9Dqv2tkz8zlrGz
+65MX7J0T83f2XXCtwn8+QeFWIPjZeCrhXqiV+cd/8zT48mat8jjvlPXQUBT9l7CF
+ui7Ck3nKgAuyRmLZS0VRWa5Fe7jQVenb0ukfWjlkqA0HA3aG76d/5/Re/JHCuhoX
+J/B8Hk3r4RnUqAR5v9p+wvVlIfuMgZ2PoMpOEFnLRST/IAYYu6sfNF+/OGYnNOVt
+HaodpJiODntW7N58a7LUvmMDQcuZNk/gEFFa7lpc1lUxZ21/xjzt8hoM5JaKalRp
+WvoGp7ebIAjU5XAAB9D617WrhRaHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAB7u
+ICGu5gqybOHxpZOVMhL7Vc5ZkHKk07gFzlMeDcrm4FEi9NSC+ACSZOw4Y65hzlML
+3Mqvwa27U2Uf9+g8cXKvmjEImZTX+1DpWcgfslS6ZZlXPX751+c+0G5HCMvHQotT
+eouE1EENazDBi7+JHPH0dVX5EQwo/TghbjWwZn0XauScEQQSfcb5ncHWV62IlpjP
+HRjJA1oHM/BcHqi1Gld3QuKZ6Mz0AWAjsXlbwvcOUNjtPdgghHZzL/2PZQwErMw3
+3p9yrXX8gzzfzibmLwq3vu7eqXmz40Q1GyzzFVBcHdOTYRKON7g0Gj7rYzPVzw6m
+gJlqm/h9oLN/JBPHKNI=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ashiok.ufpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ashiok.ufpe.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">UFPE - Universidade Federal de Pernambuco</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ufpe.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.ufpe.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Fabio Chicout</md:SurName>
+ <md:EmailAddress>fabio.chicout@ufpe.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/atlas.sciencespo-lille.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/atlas.sciencespo-lille.eu-idp-shibboleth.xml
new file mode 100644
index 00000000..dbbaf560
--- /dev/null
+++ b/swamid-interfederations-2.0/atlas.sciencespo-lille.eu-idp-shibboleth.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://atlas.sciencespo-lille.eu/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-05-13T13:23:27Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo-lille.eu</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Sciences Po Lille</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="fr">http://www.sciencespo-lille.eu</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Students Teachers personals</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Sciences Po Lille</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Etudiants professeurs personnels</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDTzCCAjegAwIBAgIUGuZxVz1Bu+epmwWqUK/URnWK7hIwDQYJKoZIhvcNAQEF
+BQAwJDEiMCAGA1UEAwwZYXRsYXMuc2NpZW5jZXNwby1saWxsZS5ldTAeFw0xNTEx
+MTIxMzE0NDdaFw0zNTExMTIxMzE0NDdaMCQxIjAgBgNVBAMMGWF0bGFzLnNjaWVu
+Y2VzcG8tbGlsbGUuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw
+gDqC8d06qD0uaiYmgTaIPvq7OGMzdvEK23FT2rXNmD46EsL+0fDmz1Ar6A2YMe/c
+CAWcxNWdl1l81Y4Zq9CYFOHESYmJa0VbDiXKUm9uZ7gExCTpgs95aln7FKdhxH70
+cvkjbsP/ysR8pWIZyF2dNiwCOUzoE6X6/ubR5gBPNFRjeXOaW07kaciXUQWQ46rV
+95aU1ub6m6DoY0iE+2f6VczyeH3dvY2vwUnlv4iyzGdbxy2/0sYp/MRhyV2DSU2X
+pH0OAW2b5Pd8GjjGRc2edRHV2nAzyxbgsLVHcs6BzoDWAGzQMh1LBtM3N8rA0yFU
+/rqOufiuPYKcwz+P8CCvAgMBAAGjeTB3MB0GA1UdDgQWBBSrw58/CJGCUJ8MPUxN
+hWlZJI1sbTBWBgNVHREETzBNghlhdGxhcy5zY2llbmNlc3BvLWxpbGxlLmV1hjBo
+dHRwczovL2F0bGFzLnNjaWVuY2VzcG8tbGlsbGUuZXUvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQEFBQADggEBAF3JLrl6A+5QxHkQo+HCpW9NL6aBdTq5YwzL6erj
+19thGmKsnQqNXciF6cNnLmdfFkvRgAzCOGDRiaCp8c5LsL9uJMdh0nUfHMEMnA8W
+lCFPOng5QZSsrSnqDtJCmgQMWjn4Y/lyHZvLEeEmAl+fU06EzsV+Se2stt4VixZO
+U6Du0lDqi/MoimHux0PPUD2efRHRGrs77E1NSq9Q8jdVC4GBBvaIbqr2yCq9k0jR
+YS0hp+6TuMBb4zuEDByqoDE4JwtkYAZOHSoSFa6O259tu7X9ANQDpNAthjl8KpiI
+kh+YDh3r2c1z2DXiAjWLKaHE+yDmAhbUvJsrS5vL9oQL6nQ=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlas.sciencespo-lille.eu/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atlas.sciencespo-lille.eu/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://atlas.sciencespo-lille.eu/idp/profile/Shibboleth/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Sciences Po Lille</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Sciences Po Lille</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.sciencespo-lille.eu</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Laurent Marescaux</md:SurName>
+ <md:EmailAddress>laurent.marescaux@sciencespo-lille.eu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Olivier Dilly</md:SurName>
+ <md:EmailAddress>olivier.dilly@sciencespo-lille.eu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml
index 06a99567..ae93b6cb 100644
--- a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml
+++ b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://attribute-viewer.aai.switch.ch/interfederation-test/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-12-23T09:55:00Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-11-23T07:39:52Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -71,6 +71,7 @@ jCyyjtF4f+udUgUZm2Jt
<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="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<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="true"/>
diff --git a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml
index a7d727c6..6bfe7640 100644
--- a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml
+++ b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://attribute-viewer.aai.switch.ch/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-08-21T10:35:34Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-11-20T07:40:54Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -27,13 +27,13 @@
<mdui:Description xml:lang="it">Ha tutti gli attributi di un utente per testare e per ottenere informazioni.</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:InformationURL xml:lang="it">https://attribute-viewer.aai.switch.ch/?lang=it</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">https://attribute-viewer.aai.switch.ch/</mdui:InformationURL>
<mdui:InformationURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/?lang=fr</mdui:InformationURL>
- <mdui:InformationURL xml:lang="it">https://attribute-viewer.aai.switch.ch/?lang=it</mdui:InformationURL>
<mdui:InformationURL xml:lang="de">https://attribute-viewer.aai.switch.ch/?lang=de</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://attribute-viewer.aai.switch.ch/privacy_statement.php</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="it">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=it</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=fr</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://attribute-viewer.aai.switch.ch/privacy_statement.php</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="de">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=de</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
@@ -107,7 +107,6 @@ UDgBXcQzpXHOg7ks4xbcEPCe0gaQhOKyWjMDALDCmiA7f7/Rnam3CA==
<md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="isMemberOf" Name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="primaryGroupID" Name="urn:oid:1.3.6.1.4.1.7165.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
diff --git a/swamid-interfederations-2.0/auth.asiaportal.info.xml b/swamid-interfederations-2.0/auth.asiaportal.info.xml
index 6e95aec4..6d3cb360 100644
--- a/swamid-interfederations-2.0/auth.asiaportal.info.xml
+++ b/swamid-interfederations-2.0/auth.asiaportal.info.xml
@@ -45,6 +45,6 @@
</md:SPSSODescriptor>
<md:ContactPerson contactType="technical">
<md:GivenName>Administrator</md:GivenName>
- <md:EmailAddress>bib@nias.ku.dk</md:EmailAddress>
+ <md:EmailAddress>mailto:bib@nias.ku.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..d7075552
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.ut.ee/idp/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIID8TCCAtmgAwIBAgIJAP1X3BCDhbbMMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MRwwGgYDVQQKDBNVbml2ZXJzaXR5IG9mIFRhcnR1MQwwCgYDVQQLDANJVE8xEzARBgNVBAMMCmF1dGgudXQuZWUxGzAZBgkqhkiG9w0BCQEWDG9yYWNsZUB1dC5lZTAeFw0xMjA3MjMwODQ0NTJaFw0yMjA3MjMwODQ0NTJaMIGOMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MRwwGgYDVQQKDBNVbml2ZXJzaXR5IG9mIFRhcnR1MQwwCgYDVQQLDANJVE8xEzARBgNVBAMMCmF1dGgudXQuZWUxGzAZBgkqhkiG9w0BCQEWDG9yYWNsZUB1dC5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV0zsQmByi15Xzv2E+0u/4TNX0QeLJ70UR9iE/5UXkf0EDOILckbGuqlmSLPu35T23K1RSLfRwisxmN9i588yJ0MLfsWXXg4Z9w7dI7mWLKIblniulKUliRqRVP4ejz02mvqtffFyXWltNvog5BVTWM+by15q0CjM6YLRcSyg7f7MaZ3+ev2TiJXzFKmj6Ft8coYabjlRmPyGOu09YNQ7PTShR9wBtF34mFbsowkQagFGChPGnGp2wW6R/7aF6s7bFxmDAqsHSOg0Du1ueRMdSgX19EmSnxGzv4JUvM6L4ulPTKJpZwwjO4xk2emhH71RvVRIdKBuvnZDSphZTEsnUCAwEAAaNQME4wHQYDVR0OBBYEFJyiwO9YOOL2PfeMu+xxoURr1K0WMB8GA1UdIwQYMBaAFJyiwO9YOOL2PfeMu+xxoURr1K0WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEYRgnUl6VrftEH/HCp1G2tSdyz1D2jDLuyWcirFAX+ifPiMSTISJbC7tyvS4GdZqpU3zJpEIqWDt7/193wo6H0FGjzsBdFJhZrm6yFKncuhyKuysmMFtWwwURBWCrqjh5rdg3rcPQIIM8me3WVUpIIbHk1fWyypVH2ZgdyiM8Q7AkBtNidlbLzChrLgqnXRiTegxXUBERGdgKl90CBfI0BpY72CgKenHa8knPNkDJgIrU/jQrpxOdXtv5pxzHSWa0YJXCNHhzBxYARrgXiXdz0uaiNkXhTGoWlklKVakbMXfqBuE+xJfGZ05k9trc+74V30c4ZSpAcKjHd6A9eEFhw=</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>MIID8TCCAtmgAwIBAgIJAP1X3BCDhbbMMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MRwwGgYDVQQKDBNVbml2ZXJzaXR5IG9mIFRhcnR1MQwwCgYDVQQLDANJVE8xEzARBgNVBAMMCmF1dGgudXQuZWUxGzAZBgkqhkiG9w0BCQEWDG9yYWNsZUB1dC5lZTAeFw0xMjA3MjMwODQ0NTJaFw0yMjA3MjMwODQ0NTJaMIGOMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MRwwGgYDVQQKDBNVbml2ZXJzaXR5IG9mIFRhcnR1MQwwCgYDVQQLDANJVE8xEzARBgNVBAMMCmF1dGgudXQuZWUxGzAZBgkqhkiG9w0BCQEWDG9yYWNsZUB1dC5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV0zsQmByi15Xzv2E+0u/4TNX0QeLJ70UR9iE/5UXkf0EDOILckbGuqlmSLPu35T23K1RSLfRwisxmN9i588yJ0MLfsWXXg4Z9w7dI7mWLKIblniulKUliRqRVP4ejz02mvqtffFyXWltNvog5BVTWM+by15q0CjM6YLRcSyg7f7MaZ3+ev2TiJXzFKmj6Ft8coYabjlRmPyGOu09YNQ7PTShR9wBtF34mFbsowkQagFGChPGnGp2wW6R/7aF6s7bFxmDAqsHSOg0Du1ueRMdSgX19EmSnxGzv4JUvM6L4ulPTKJpZwwjO4xk2emhH71RvVRIdKBuvnZDSphZTEsnUCAwEAAaNQME4wHQYDVR0OBBYEFJyiwO9YOOL2PfeMu+xxoURr1K0WMB8GA1UdIwQYMBaAFJyiwO9YOOL2PfeMu+xxoURr1K0WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEYRgnUl6VrftEH/HCp1G2tSdyz1D2jDLuyWcirFAX+ifPiMSTISJbC7tyvS4GdZqpU3zJpEIqWDt7/193wo6H0FGjzsBdFJhZrm6yFKncuhyKuysmMFtWwwURBWCrqjh5rdg3rcPQIIM8me3WVUpIIbHk1fWyypVH2ZgdyiM8Q7AkBtNidlbLzChrLgqnXRiTegxXUBERGdgKl90CBfI0BpY72CgKenHa8knPNkDJgIrU/jQrpxOdXtv5pxzHSWa0YJXCNHhzBxYARrgXiXdz0uaiNkXhTGoWlklKVakbMXfqBuE+xJfGZ05k9trc+74V30c4ZSpAcKjHd6A9eEFhw=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.ut.ee/idp/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://auth.ut.ee/idp/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="et">Tartu Ülikool</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University of Tartu</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="ru">Тартуский университет</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fi">Tarton yliopisto</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="et">Tartu Ülikool</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Tartu</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="et">http://www.ut.ee/et/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.ut.ee/en/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>TAAT</md:GivenName>
+ <md:SurName>Operations</md:SurName>
+ <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml b/swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml
new file mode 100644
index 00000000..cf50473f
--- /dev/null
+++ b/swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://averell.unimes.fr/authsaml2/metadata">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-08T14:00:47Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>https://federation.renater.fr/category/wifi</saml:AttributeValue>
+ <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Eduspot - Nimes University</mdui:DisplayName>
+ <mdui:Logo height="151" width="147">https://www.unimes.fr/skins/Univ-Nimes/resources/img/logo-unimes.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="fr">https://averell.unimes.fr</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Eduspot - Nimes University</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Portail Captif Univnautes - Université de Nîmes</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Portail captif Univnautes - Université de Nîmes</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEUTCCAzmgAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJGUjEN
+MAsGA1UECBMER2FyZDEOMAwGA1UEBxMFTmltZXMxDzANBgNVBAoTBlVuaW1lczEo
+MCYGCSqGSIb3DQEJARYZb2xpdmllci5mYWx6b25lQHVuaW1lcy5mcjEUMBIGA1UE
+AxMLaW50ZXJuYWwtY2EwHhcNMTMwNzA4MTExMTU0WhcNMjMwNzA2MTExMTU0WjB9
+MQswCQYDVQQGEwJGUjENMAsGA1UECBMER2FyZDEOMAwGA1UEBxMFTmltZXMxDzAN
+BgNVBAoTBlVuaW1lczEoMCYGCSqGSIb3DQEJARYZb2xpdmllci5mYWx6b25lQHVu
+aW1lcy5mcjEUMBIGA1UEAxMLaW50ZXJuYWwtY2EwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDE+lfDp2RWVlMLP3x8TW02kx6ctJvtLoaz+qJzz7m5/a/a
+2OLO9/qGF5mFNlkGuo9Jc1nU+dyldBZhc2AFVZBZ8gXKay4gIvXfuKFLgPBIDO4r
+g6UhPYrKnVLsu2ubZNOpuGV6U5C9Fn+0ujtjmCqDyO7WVOmk3cnd1v0OYBMM+FQu
+acqKQU2hM+7Z3pAZ5vmarofS7ruI1lL4cPthXhUWC94cGCewlixYIX8AVEOXhrx8
+ugGr4Yc/+scusm2opSfYOO44SONJpd2UAWHEKuLAkMhdT6j1kIzo2fvw7oT4c6j/
+VRGL6bVZNyYO8RohuCdfrs7fW/CItv1VDQwIyN/1AgMBAAGjgdswgdgwHQYDVR0O
+BBYEFEGc2vp8DvLW7KwnfwLGZQ7VmuNXMIGoBgNVHSMEgaAwgZ2AFEGc2vp8DvLW
+7KwnfwLGZQ7VmuNXoYGBpH8wfTELMAkGA1UEBhMCRlIxDTALBgNVBAgTBEdhcmQx
+DjAMBgNVBAcTBU5pbWVzMQ8wDQYDVQQKEwZVbmltZXMxKDAmBgkqhkiG9w0BCQEW
+GW9saXZpZXIuZmFsem9uZUB1bmltZXMuZnIxFDASBgNVBAMTC2ludGVybmFsLWNh
+ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAC1stNrPLwVX5HKT
+A8zdX1CIqPxdaLPIgCqDqteResAAP2OjqBV7Scb9CAXsltwEanIPLOP2ynstERCw
+CnRWWwltWn2jIf1JWBVMGJKwN7YOQGZogABAsbuTlWQo/bIeFEkkLSaqlICQhEvM
+HJ6AKj0GUxyDr3VLSgCa9g4pj1gBINst/mKj0mPSGL+fHvzbFlEjGSnthIdcPqQG
+CqjOMoX6iPj3vvAXSo++WFj+VYDOq/DSdZq2z1mwUZ78qpiQJ+KT7FOkurZjaOsy
+eVfJ8kjDRKJ3wAixUi1+wFuVdpGnUbFLYhMQZdnXblhMzFE3uzni83QirSmLOemI
+KLb8WUE=
+ </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>
+ MIIEUTCCAzmgAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJGUjEN
+MAsGA1UECBMER2FyZDEOMAwGA1UEBxMFTmltZXMxDzANBgNVBAoTBlVuaW1lczEo
+MCYGCSqGSIb3DQEJARYZb2xpdmllci5mYWx6b25lQHVuaW1lcy5mcjEUMBIGA1UE
+AxMLaW50ZXJuYWwtY2EwHhcNMTMwNzA4MTExMTU0WhcNMjMwNzA2MTExMTU0WjB9
+MQswCQYDVQQGEwJGUjENMAsGA1UECBMER2FyZDEOMAwGA1UEBxMFTmltZXMxDzAN
+BgNVBAoTBlVuaW1lczEoMCYGCSqGSIb3DQEJARYZb2xpdmllci5mYWx6b25lQHVu
+aW1lcy5mcjEUMBIGA1UEAxMLaW50ZXJuYWwtY2EwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDE+lfDp2RWVlMLP3x8TW02kx6ctJvtLoaz+qJzz7m5/a/a
+2OLO9/qGF5mFNlkGuo9Jc1nU+dyldBZhc2AFVZBZ8gXKay4gIvXfuKFLgPBIDO4r
+g6UhPYrKnVLsu2ubZNOpuGV6U5C9Fn+0ujtjmCqDyO7WVOmk3cnd1v0OYBMM+FQu
+acqKQU2hM+7Z3pAZ5vmarofS7ruI1lL4cPthXhUWC94cGCewlixYIX8AVEOXhrx8
+ugGr4Yc/+scusm2opSfYOO44SONJpd2UAWHEKuLAkMhdT6j1kIzo2fvw7oT4c6j/
+VRGL6bVZNyYO8RohuCdfrs7fW/CItv1VDQwIyN/1AgMBAAGjgdswgdgwHQYDVR0O
+BBYEFEGc2vp8DvLW7KwnfwLGZQ7VmuNXMIGoBgNVHSMEgaAwgZ2AFEGc2vp8DvLW
+7KwnfwLGZQ7VmuNXoYGBpH8wfTELMAkGA1UEBhMCRlIxDTALBgNVBAgTBEdhcmQx
+DjAMBgNVBAcTBU5pbWVzMQ8wDQYDVQQKEwZVbmltZXMxKDAmBgkqhkiG9w0BCQEW
+GW9saXZpZXIuZmFsem9uZUB1bmltZXMuZnIxFDASBgNVBAMTC2ludGVybmFsLWNh
+ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAC1stNrPLwVX5HKT
+A8zdX1CIqPxdaLPIgCqDqteResAAP2OjqBV7Scb9CAXsltwEanIPLOP2ynstERCw
+CnRWWwltWn2jIf1JWBVMGJKwN7YOQGZogABAsbuTlWQo/bIeFEkkLSaqlICQhEvM
+HJ6AKj0GUxyDr3VLSgCa9g4pj1gBINst/mKj0mPSGL+fHvzbFlEjGSnthIdcPqQG
+CqjOMoX6iPj3vvAXSo++WFj+VYDOq/DSdZq2z1mwUZ78qpiQJ+KT7FOkurZjaOsy
+eVfJ8kjDRKJ3wAixUi1+wFuVdpGnUbFLYhMQZdnXblhMzFE3uzni83QirSmLOemI
+KLb8WUE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://averell.unimes.fr/authsaml2/singleSignOnPost" index="0"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="fr">Portail Captif Univnautes - Université de Nîmes</md:ServiceName>
+ <md:ServiceName xml:lang="en">Eduspot - Nimes University</md:ServiceName>
+ <md:ServiceDescription xml:lang="fr">Portail captif Univnautes - Université de Nîmes</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">Eduspot - Nimes University</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Université de Nimes</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Université de Nimes</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.unimes.fr</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Olivier FALZONE</md:SurName>
+ <md:EmailAddress>olivier.falzone@unimes.fr</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Florence VERSE</md:SurName>
+ <md:EmailAddress>florence.verse@unimes.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/b2access.eudat.eu-8443-unitygw-saml-sp-metadata.xml b/swamid-interfederations-2.0/b2access.eudat.eu-8443-unitygw-saml-sp-metadata.xml
new file mode 100644
index 00000000..3410d0b8
--- /dev/null
+++ b/swamid-interfederations-2.0/b2access.eudat.eu-8443-unitygw-saml-sp-metadata.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://b2access.eudat.eu:8443/unitygw/saml-sp-metadata">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-22T13:13:53Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <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="de">EUDAT B2ACCESS</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">EUDAT B2ACCESS</mdui:DisplayName>
+ <mdui:Description xml:lang="de">AAI für EUDAT B2-Services</mdui:Description>
+ <mdui:Description xml:lang="en">AAI for EUDAT B2-Services</mdui:Description>
+ <mdui:Logo height="16" width="16">https://b2access.eudat.eu/files/logo-small.png</mdui:Logo>
+ <mdui:Logo height="146" width="146">https://b2access.eudat.eu/files/logo-huge.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">https://b2access.eudat.eu/files/about-b2access.html</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://b2access.eudat.eu/files/data-privacy-statement.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>b2access.eudat.eu</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=b2access.eudat.eu,O=CSC - Tieteen tietotekniikan keskus Oy,L=Espoo,ST=Uusimaa,C=FI</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGLDCCBRSgAwIBAgIQAeV/HfOyLr/KjB6ZHxlt7zANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNTA3MjgwMDAwMDBaFw0xODA4MDExMjAwMDBaMHwxCzAJBgNVBAYT
+AkZJMRAwDgYDVQQIEwdVdXNpbWFhMQ4wDAYDVQQHEwVFc3BvbzEvMC0GA1UEChMm
+Q1NDIC0gVGlldGVlbiB0aWV0b3Rla25paWthbiBrZXNrdXMgT3kxGjAYBgNVBAMT
+EWIyYWNjZXNzLmV1ZGF0LmV1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEAx2MMPwzn2ZcCXkBhqcP+/1//FKvonZ3F6NZ2gmas2SIgpTDC1IGQZLnJHteX
+lEJlDGD94t5tT12U12ckYNstQxdYZM+MC09t0dd841AU7jP1m/ZAmRfUA8JuwFxb
+tZJ1scqRatuJYF5qkpMJgfDmv5mfRIHldvbN9l7iGSdNFOHUTvC5o9nMe8yK5ygI
+bUsoXWRlvMIMaVMGECBmCtONfBJcJZyWXt1SLnA8k+CQHFq5Csf9go2e4MEB7lmd
+zQ3UcBlZ11yo/IY1z8g3TGc2KiYm5FL6Upq9XJWEEZIW2yaskx4FIavPkrvOshIW
+Q41kRuZVtXxZHhCbyEDdcDvDbDLEXIAXHevgMLohrA4WmGvmMY+hOpJSuPg7wFli
+wRWAxhzY3+wocCJUxkbY5BP5T7HxH85by+9Q6dRl5ZyapkSz4BSvK6WqYOk4ISE3
+3nxZqzoA+dimm72CkIXPeTckkGG9p4ebA8kZ2XWZyRs2xzst5B+b3duOGFJri3RS
+j1GBrptRubBGehHud9ZUykQGpMgFsvzXqT+vtxtU925jGx2aMcORWxUmexFG+3s1
+WGPB8oVIbwGIiGIlM7NZeaPkKGiliTqmk8Rr13GceVPODDoamC+jWwC/wHPm64Ca
+FUvVRzTAapTxh4LEe1ezwc0mXqXtH8MeHKvF/dehnW1jdscCAwEAAaOCAcAwggG8
+MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBRO9sfn
+4u/PACd1SCppYjInd8sGqjAcBgNVHREEFTATghFiMmFjY2Vzcy5ldWRhdC5ldTAO
+BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsG
+A1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFT
+U0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5B
+U1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIB
+FhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAk
+BggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAC
+hixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAM
+BgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQDFJgsh1k075HMtP2Vd5SBS
+ijrUCSxqqQ7p3xMeZ+gwdUK1INbmWOP6Xnr4bJowpsaCxowe/eNEI9NJgjxyUQaJ
+45cLfv645xQdChwUCoF0hGpKsPbYVjGAw3/krllIMUArTNu+XUcJ2XCYpKYoWkdd
+5GDykXfzenBxSpelvZ7eIwrN0TdZMhvI7zZ2Bxteyy+dB56Gk9JKpDfxMzx2zk9W
+iIKIWMqetWvib7JrgE4JjPZ0DXSnRnF2AsxqxIpMqf4GRf88YJTb2iePHcdNeqTo
+P2a4gOzCz0LX9+FJKl/jUVG4WXDtsmzA3hsFLqb2xFB8HePayCrABngz1gmEZvNV
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://b2access.eudat.eu:8443/unitygw/spSAMLResponseConsumer" index="1"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="de">EUDAT B2ACCESS</md:ServiceName>
+ <md:ServiceName xml:lang="en">EUDAT B2ACCESS</md:ServiceName>
+ <md:ServiceDescription xml:lang="de">AAI für EUDAT B2-Services</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">AAI for EUDAT B2-Services</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e234</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e234</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.fz-juelich.de</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.fz-juelich.de</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>B2ACCESS</md:GivenName>
+ <md:SurName>Technical</md:SurName>
+ <md:EmailAddress>mailto:b2access@fz-juelich.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>B2ACCESS</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>mailto:b2access@fz-juelich.de</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bath-test.topdesk.net-tas-public-login-verify.xml b/swamid-interfederations-2.0/bath-test.topdesk.net-tas-public-login-verify.xml
new file mode 100644
index 00000000..45db8ae2
--- /dev/null
+++ b/swamid-interfederations-2.0/bath-test.topdesk.net-tas-public-login-verify.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bath-test.topdesk.net/tas/public/login/verify">
+ <!--
+ This is a "TOPdesk (test)" TOPdesk SP for the University of Bath.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-18T13:16:40Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of Bath: TOPdesk (test)</mdui:DisplayName>
+ <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDfzCCAmegAwIBAgIJAMZFjLdaD8wQMA0GCSqGSIb3DQEBCwUAMDMxETAPBgNV
+ BAMTCGJhdGh0ZXN0MREwDwYDVQQKEwhiYXRodGVzdDELMAkGA1UEBhMCVUswHhcN
+ MTUxMTEzMTQ0OTI5WhcNMjUxMTEwMTQ0OTI5WjAzMREwDwYDVQQDEwhiYXRodGVz
+ dDERMA8GA1UEChMIYmF0aHRlc3QxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEA2eOkEdenoY3OwPOZZU1DtIMo16b64qnpkdoXXnLe
+ OKS50XKF+6LJWm28XxDBGGbQzXTby5X368RJ+B4q6Ji11Zw4EJ+fM0y9ovspEJR8
+ LpMkmzPIQS70B+7gCnAVmxm5St+oxfYuBsJMB3a5HlPn/4g/wJwjQvZhQ3BZHvHN
+ zhJPv7ksxTsZX4jGbD68LzpdSgY+8S0c/v3oUig2PdGsvXZquLFwpMC+iQPJoK34
+ HeUkG+2/qsZUpgT3mEGDZsEE68weU93LZWfvn6pepRnaIUjZ2wrMl135SgabQEfc
+ 7sm3aB33DjMu+IhrNwZrMyvhW+fYKYGDONgKlr/W5E+RtQIDAQABo4GVMIGSMB0G
+ A1UdDgQWBBT1y7zA1qIDRDT+FdYJRTFWvgHWDzBjBgNVHSMEXDBagBT1y7zA1qID
+ RDT+FdYJRTFWvgHWD6E3pDUwMzERMA8GA1UEAxMIYmF0aHRlc3QxETAPBgNVBAoT
+ CGJhdGh0ZXN0MQswCQYDVQQGEwJVS4IJAMZFjLdaD8wQMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBABqS87n8Qycc2qXzFbMHkFoYxNT8+Y9MI63giai5
+ r33rbnfAY3P9+TN3KGTvZnjE8pgiy4HEZ0C1R95izlGcgFR4k/ksymgFRH4+/rDX
+ Mxq9xCcijwj+V1RQYbA9U4poKeXbv6dBosnk/GGgFDPDeK97HK7xwZ3Mq9d2bQ2v
+ 7hXQ+vgQFZp6OX+Iteh1/xMG8BgTNUOmlLb1xVlfecfULpptEvmnW/aQpqTqJQPj
+ nMK3+jbybpCqVJ+zUbHvaENv7FV629EFZrXBHdVG7DVQyMZlKtAzmal8ifenH/sb
+ oSq/hb5S3hmWKzG5Z1crLVsWOwpD1aVjD0sjz25jJU8NKUs=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDfzCCAmegAwIBAgIJAMZFjLdaD8wQMA0GCSqGSIb3DQEBCwUAMDMxETAPBgNV
+ BAMTCGJhdGh0ZXN0MREwDwYDVQQKEwhiYXRodGVzdDELMAkGA1UEBhMCVUswHhcN
+ MTUxMTEzMTQ0OTI5WhcNMjUxMTEwMTQ0OTI5WjAzMREwDwYDVQQDEwhiYXRodGVz
+ dDERMA8GA1UEChMIYmF0aHRlc3QxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEA2eOkEdenoY3OwPOZZU1DtIMo16b64qnpkdoXXnLe
+ OKS50XKF+6LJWm28XxDBGGbQzXTby5X368RJ+B4q6Ji11Zw4EJ+fM0y9ovspEJR8
+ LpMkmzPIQS70B+7gCnAVmxm5St+oxfYuBsJMB3a5HlPn/4g/wJwjQvZhQ3BZHvHN
+ zhJPv7ksxTsZX4jGbD68LzpdSgY+8S0c/v3oUig2PdGsvXZquLFwpMC+iQPJoK34
+ HeUkG+2/qsZUpgT3mEGDZsEE68weU93LZWfvn6pepRnaIUjZ2wrMl135SgabQEfc
+ 7sm3aB33DjMu+IhrNwZrMyvhW+fYKYGDONgKlr/W5E+RtQIDAQABo4GVMIGSMB0G
+ A1UdDgQWBBT1y7zA1qIDRDT+FdYJRTFWvgHWDzBjBgNVHSMEXDBagBT1y7zA1qID
+ RDT+FdYJRTFWvgHWD6E3pDUwMzERMA8GA1UEAxMIYmF0aHRlc3QxETAPBgNVBAoT
+ CGJhdGh0ZXN0MQswCQYDVQQGEwJVS4IJAMZFjLdaD8wQMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBABqS87n8Qycc2qXzFbMHkFoYxNT8+Y9MI63giai5
+ r33rbnfAY3P9+TN3KGTvZnjE8pgiy4HEZ0C1R95izlGcgFR4k/ksymgFRH4+/rDX
+ Mxq9xCcijwj+V1RQYbA9U4poKeXbv6dBosnk/GGgFDPDeK97HK7xwZ3Mq9d2bQ2v
+ 7hXQ+vgQFZp6OX+Iteh1/xMG8BgTNUOmlLb1xVlfecfULpptEvmnW/aQpqTqJQPj
+ nMK3+jbybpCqVJ+zUbHvaENv7FV629EFZrXBHdVG7DVQyMZlKtAzmal8ifenH/sb
+ oSq/hb5S3hmWKzG5Z1crLVsWOwpD1aVjD0sjz25jJU8NKUs=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bath-test.topdesk.net/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Bath</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University of Bath: TOPdesk (test)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://bath.topdesk.net/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Webmaster</GivenName>
+ <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Richard</GivenName>
+ <SurName>Phillips</SurName>
+ <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.xml b/swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.xml
new file mode 100644
index 00000000..e7aac76d
--- /dev/null
+++ b/swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bath-test.topdesk.net/tas/secure/login/verify">
+ <!--
+ This is a "TOPdesk (test)" TOPdesk SP for the University of Bath.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-18T13:18:10Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of Bath: TOPdesk (test)</mdui:DisplayName>
+ <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDfzCCAmegAwIBAgIJAOFdmodszT1AMA0GCSqGSIb3DQEBCwUAMDMxETAPBgNV
+ BAMTCGJhdGh0ZXN0MREwDwYDVQQKEwhiYXRodGVzdDELMAkGA1UEBhMCVUswHhcN
+ MTUxMTEzMTQ0OTMwWhcNMjUxMTEwMTQ0OTMwWjAzMREwDwYDVQQDEwhiYXRodGVz
+ dDERMA8GA1UEChMIYmF0aHRlc3QxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEA2EyNZlxxLwQ8q4v1K58xvsz9XMJU/eBXEEBIxi/K
+ nQH5i4UIirWsDfUq4ZZuQS6y1AG260n/1Q0zEABQ1F1XjKOxlaNlZSfWRXSVjIy6
+ CD1faxqaWtmFKLhqOwbSampxM9ykoucDetj9TjBOxPodd2ddRlT6mDUs/ILZmlVu
+ YU8DZ858mI9SQGIvtdux8WB9T6RAjBQhi5GjIstUOK74+70AQ0FnBm5YEd9t4Tl+
+ k0Zu/FKvgjxxDCUy7vFDUy4bCXcYBEya9ue0NK6UbmK0GgiYn4O6e0jJfVCdkK/c
+ 2QflHWuUxa583Q1aUFvkUPuT8Wpegus4Jh5wmkIkdM6V/wIDAQABo4GVMIGSMB0G
+ A1UdDgQWBBQE2/JgQm/vp+Ni21Voe5PbfvKPlTBjBgNVHSMEXDBagBQE2/JgQm/v
+ p+Ni21Voe5PbfvKPlaE3pDUwMzERMA8GA1UEAxMIYmF0aHRlc3QxETAPBgNVBAoT
+ CGJhdGh0ZXN0MQswCQYDVQQGEwJVS4IJAOFdmodszT1AMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBAK/KFlbDqcbXDGYcU9VkhEWJtJ1ozW+l0FlAbbVG
+ ACa4wn0l4CNcuJCt6B1UR6548nQLZh9KttcyCJLo+CPUGylCC44ubB8SY8ViRDfu
+ A7+uIPCXcPglRXvFsWbh7//SkvBUbG9MPiZOYO64jWO24KOZg2/ETcrqbhKIUzmw
+ N9tzXCG29q9pToWS1YqWNl4GrflNC0XpIwXeLgCmZpp55QUPLzXxQZ/MeJa9fepH
+ OJzl5HphWOr/DgZdxRLl9MZcByEuK/lEO8p2HOn7C8PvrWu6SpWwWObfzn10malB
+ BYSdBJ8B23JgWfhPEwjSYSDHfr8fD+058j6U00yvfdqsvg4=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDfzCCAmegAwIBAgIJAOFdmodszT1AMA0GCSqGSIb3DQEBCwUAMDMxETAPBgNV
+ BAMTCGJhdGh0ZXN0MREwDwYDVQQKEwhiYXRodGVzdDELMAkGA1UEBhMCVUswHhcN
+ MTUxMTEzMTQ0OTMwWhcNMjUxMTEwMTQ0OTMwWjAzMREwDwYDVQQDEwhiYXRodGVz
+ dDERMA8GA1UEChMIYmF0aHRlc3QxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEA2EyNZlxxLwQ8q4v1K58xvsz9XMJU/eBXEEBIxi/K
+ nQH5i4UIirWsDfUq4ZZuQS6y1AG260n/1Q0zEABQ1F1XjKOxlaNlZSfWRXSVjIy6
+ CD1faxqaWtmFKLhqOwbSampxM9ykoucDetj9TjBOxPodd2ddRlT6mDUs/ILZmlVu
+ YU8DZ858mI9SQGIvtdux8WB9T6RAjBQhi5GjIstUOK74+70AQ0FnBm5YEd9t4Tl+
+ k0Zu/FKvgjxxDCUy7vFDUy4bCXcYBEya9ue0NK6UbmK0GgiYn4O6e0jJfVCdkK/c
+ 2QflHWuUxa583Q1aUFvkUPuT8Wpegus4Jh5wmkIkdM6V/wIDAQABo4GVMIGSMB0G
+ A1UdDgQWBBQE2/JgQm/vp+Ni21Voe5PbfvKPlTBjBgNVHSMEXDBagBQE2/JgQm/v
+ p+Ni21Voe5PbfvKPlaE3pDUwMzERMA8GA1UEAxMIYmF0aHRlc3QxETAPBgNVBAoT
+ CGJhdGh0ZXN0MQswCQYDVQQGEwJVS4IJAOFdmodszT1AMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBAK/KFlbDqcbXDGYcU9VkhEWJtJ1ozW+l0FlAbbVG
+ ACa4wn0l4CNcuJCt6B1UR6548nQLZh9KttcyCJLo+CPUGylCC44ubB8SY8ViRDfu
+ A7+uIPCXcPglRXvFsWbh7//SkvBUbG9MPiZOYO64jWO24KOZg2/ETcrqbhKIUzmw
+ N9tzXCG29q9pToWS1YqWNl4GrflNC0XpIwXeLgCmZpp55QUPLzXxQZ/MeJa9fepH
+ OJzl5HphWOr/DgZdxRLl9MZcByEuK/lEO8p2HOn7C8PvrWu6SpWwWObfzn10malB
+ BYSdBJ8B23JgWfhPEwjSYSDHfr8fD+058j6U00yvfdqsvg4=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bath-test.topdesk.net/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Bath</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University of Bath: TOPdesk (test)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://bath.topdesk.net/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Webmaster</GivenName>
+ <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Richard</GivenName>
+ <SurName>Phillips</SurName>
+ <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml
index 15c1972f..fc691d6d 100644
--- a/swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml
@@ -27,6 +27,7 @@
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/WAYF"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/Login"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
index 8ad19b81..36947b9a 100644
--- a/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://biblio.bo.cnr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://biblio.bo.cnr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml
index 8b941862..54aaf35b 100644
--- a/swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml
@@ -37,22 +37,22 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIC3DCCAcSgAwIBAgIJAPW1weKk2LPuMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
- BAMTB2FpbzAwMzcwHhcNMTUwNjI1MDkwOTI1WhcNMjUwNjIyMDkwOTI1WjASMRAw
+ MIIC3DCCAcSgAwIBAgIJAOZSwyuu1CqhMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+ BAMTB2FpbzAwMzcwHhcNMTUwNjMwMTA1NTM0WhcNMjUwNjI3MTA1NTM0WjASMRAw
DgYDVQQDEwdhaW8wMDM3MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
- 4OyEUM9PIiw3w5E/VQVy9TlGjObizfrnjZktkJxa5gJlmZI41QgIZm3BqGcr7fxw
- AwiRkrl1cZiW6SV4C2k4zHJLkucLsLh8XOUr/YsQspK36pd1W1QFkGHaImIuiSZx
- ZM+OpzIEbggkjEj7rvUoBP5/YhaZglHvgnU6+95NgEAPd5hEbYiyAmcSM2zWBZvq
- MfNNr0A/vbPhtyAimhmgjsIznQr5iT5j2RGkEJB1cWqTIFFTnPWb9ag4rY4a3bbC
- J89j4vE9H/cd5xydrgi2MJ2xmnTCcyg3yf4G2mDMP3XL0vkq8zE4hOHXjnTra/eV
- dAj25z0tfDKa4Sbp06AYewIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDM3MB0G
- A1UdDgQWBBQFtsCJqNZbYuFUKYf0mIb30EK8DzANBgkqhkiG9w0BAQUFAAOCAQEA
- kS6ViNGwL/K/pvYuBKgv1zr+KGPw4qjMcHCpZGTERhOcXrHmdgSSXkms+9XOrtN+
- o8U7spXF83OZEPLx8C3pkkIgMbCA9yePhM5175EAMoB7Yqoe45zRAXt112M9Koel
- tUZI9vCbwHJuKBz+hB5RR1anFvaaQvqukiW08iBrrmFqgOeLixtzBY3vgBg4hM6j
- Tu90u2zzpg8DEm3j/6q1dwTNvAntWVJWfJh2NWEMYv6wWocXyB96PnLp/mGOc11/
- cFv1BanrUtOQqfotY7y6yO0YBR18xdMx9XrZWOsqicX1CZu4y9QulFGO0TEfp/rT
- kFk/UhEstMy9v4cZQSpXIQ==
+ usry3ZvAanlgA68B6Yvxcy8l5E8HmFEQD5S2oCA494AOQySUJpkCzzs93g23O1Cm
+ j1yLQyy3yqvtIn5ONZmJ5R29GbwfTZv0vzGu+V0D28KFMb6wR6kH5iKrrE3D37A7
+ abCseX4rmf8Lw3eOn79/Kjct8qb4EZadYXrsSTd12/9RhHKwLfOTDBV9yj3EUUqt
+ 0+rsSulfJoztB0t9SDImLtO4PM+p418PjeR3JWW73LRfHZ7SzU9buz2flNNn8e2C
+ G0ITXFgVNWdDa5PlnTEyZAf/ccIcvA2DawdMbtjNig+6Bg7yj8QooNjf/g6Kq8G1
+ cB8BiFrqz26J+7E8iaZLZQIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDM3MB0G
+ A1UdDgQWBBQPCuFc7OkX0mQek4Bejrfa37rqjzANBgkqhkiG9w0BAQUFAAOCAQEA
+ TgoIXbhWwAbDb76D5iZCUHVFjvQjnERpp3jlfrKY3C9LjzPYc3twFvPG4w7MGRbD
+ czej5XbWS1N+Vmt5J+IYAuixsjN0R3gX1qH/IWQqNHOHXvFgYFiKQo7H1jFUvkjb
+ bqL9G+f0JpLatyfPh8u0S3fGRR0jBlu675wsfg8qYJxUrbrM8/DW7Wz3dUzjLabX
+ MGaxx53SXzMEMV7RVALiL/WqFnBNMMhVMGN27yzdxwgqce4hhpcvLPYNo4PArJQa
+ gDW+va8wE5WWvSEvJWFKXohCGuDoye6fuPZTDSL9xiiSdRaXomq36ryBKJUr9Fj/
+ EQZPbfR3TWxmQ1uuBBFT6A==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
new file mode 100644
index 00000000..f81b7e00
--- /dev/null
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/fs.dskd.dk/adfs/services/trust">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-05-27T15:12:32Z" registrationAuthority="https://www.wayf.dk">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dskd.dk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="da">Designskolen Kolding</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Design School Kolding</mdui:DisplayName>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>dskd.dk</mdui:DomainHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL2Zz
+LmRza2QuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
+NTEyMzEyMzU5NTlaMDAxLjAsBgNVBAMMJWh0dHA6Ly9mcy5kc2tkLmRrL2FkZnMv
+c2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH
+iAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZ
+hrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSV
+jp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+
+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BH
+OZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joF
+cy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAi+Kah5zSB6
+KbsrjzAP15Lemsnnlfm01DTYdSnq0DvR8xtuZqg1OrU7jEQuD4aYAK8nyoLtPxmk
+6jPI6CCNAa/MvSgwxivD2hFR7ynKJrbI65DPP7Wo/6GRSr4vMD3xhKFNGS2061M1
+8majtXtIhwqhbEgmq5EAKeTQiUZM9GcJh86+r7Td9aJxiAa2jdn3UnTEfc5pDr71
+Wks1+XvQCZCvDytO08HrCK+2n42p5qVxKX2amKpWDuseBmpuTC9uTFbP2pJuJssN
+VOvL3ykvu7uuZW0/HdBtWE/eVi8dAKE/eV5SDo6p0QUF2GK2fT7a6Mlwl5tyYAoU
+dPcr9FHbXBQ=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/fs.dskd.dk/adfs/ls/"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="da">Designskolen Kolding</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Design School Kolding</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="da">Designskolen Kolding</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Design School Kolding</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="da">http://www.designskolenkolding.dk</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">https://www.designskolenkolding.dk/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>WAYF</md:GivenName>
+ <md:SurName>Operations</md:SurName>
+ <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bismarck.nyme.hu-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/bismarck.nyme.hu-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..75ae3a03
--- /dev/null
+++ b/swamid-interfederations-2.0/bismarck.nyme.hu-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bismarck.nyme.hu/simplesaml/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>href</saml:AttributeValue>
+ <saml:AttributeValue>href-edugain</saml:AttributeValue>
+ <saml:AttributeValue>nyme</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+ <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="hu">Nyugat-magyarországi Egyetem</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">The University of West Hungary (Sopron), Hungary</mdui:DisplayName>
+ <mdui:Description xml:lang="hu">Nyugat-magyarországi Egyetem</mdui:Description>
+ <mdui:Description xml:lang="en">The University of West Hungary (Sopron), Hungary</mdui:Description>
+ <mdui:InformationURL xml:lang="hu">http://www.nyme.hu</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="hu">http://www.nyme.hu/fileadmin/dokumentumok/rektori/szmszm/adatvedelmi_adatkezelesi_szab_20150128.pdf</mdui:PrivacyStatementURL>
+ <mdui:Logo height="145" width="143">https://bismarck.nyme.hu/simplesaml/black_on_white.png</mdui:Logo>
+ </mdui:UIInfo>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nyme.hu</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eik.nyme.hu</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFcTCCBFmgAwIBAgIJAKBNphZ7hjc7MA0GCSqGSIb3DQEBCwUAMIHVMQswCQYDVQQGEwJIVTEaMBgGA1UECBMRR3lvci1Nb3Nvbi1Tb3Byb24xDzANBgNVBAcTBlNvcHJvbjEnMCUGA1UEChMeVGhlIFVuaXZlcnNpdHkgb2YgV2VzdCBIdW5nYXJ5MTcwNQYDVQQLEy5EZXBhcnRtZW50IG9mIEluZm9ybWF0aW9uIFN5c3RlbXMgYW5kIFNlcnZpY2VzMRkwFwYDVQQDExBiaXNtYXJjay5ueW1lLmh1MRwwGgYJKoZIhvcNAQkBFg1hZG1pbkBueW1lLmh1MB4XDTE0MDUyOTExNTQyMloXDTI0MDUyODExNTQyMlowgdUxCzAJBgNVBAYTAkhVMRowGAYDVQQIExFHeW9yLU1vc29uLVNvcHJvbjEPMA0GA1UEBxMGU29wcm9uMScwJQYDVQQKEx5UaGUgVW5pdmVyc2l0eSBvZiBXZXN0IEh1bmdhcnkxNzA1BgNVBAsTLkRlcGFydG1lbnQgb2YgSW5mb3JtYXRpb24gU3lzdGVtcyBhbmQgU2VydmljZXMxGTAXBgNVBAMTEGJpc21hcmNrLm55bWUuaHUxHDAaBgkqhkiG9w0BCQEWDWFkbWluQG55bWUuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC15ZMAePJn6n30uTqOILsewup8QM52/8oNiphDFjWHiZT2/06rAeFK+nAMz06Jn3Q+Thu9fjr5o/ZCY6v2v+ivjLvAd66jH0EGQwNUsHuGP/vWt2BGP2p5tAn7lX3O7oxdZYBEWgB0j+e7hqaDZ7C6ckDCsH7221IgvClo4G78Y9SnrDqlLGhmju+wZINAwQAvtwchF1ffxZFUwVZ/Zm9+nHw4ilxrK0vcKc/PfoNFrSqxOs2GFz5kDz99NBKpc9Np+xBqMNl6QV49VULN1ooZHzO/G52KcAYTEIBUQwGkKFyAmN2jDpOr56cmTJaRI+P9aT60YUBMfhxczKa9KJM1AgMBAAGjggFAMIIBPDAdBgNVHQ4EFgQUJNKwaCbN3djK5kT8wEq72IhGxgAwggELBgNVHSMEggECMIH/gBQk0rBoJs3d2MrmRPzASrvYiEbGAKGB26SB2DCB1TELMAkGA1UEBhMCSFUxGjAYBgNVBAgTEUd5b3ItTW9zb24tU29wcm9uMQ8wDQYDVQQHEwZTb3Byb24xJzAlBgNVBAoTHlRoZSBVbml2ZXJzaXR5IG9mIFdlc3QgSHVuZ2FyeTE3MDUGA1UECxMuRGVwYXJ0bWVudCBvZiBJbmZvcm1hdGlvbiBTeXN0ZW1zIGFuZCBTZXJ2aWNlczEZMBcGA1UEAxMQYmlzbWFyY2subnltZS5odTEcMBoGCSqGSIb3DQEJARYNYWRtaW5AbnltZS5odYIJAKBNphZ7hjc7MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHvCr7f69ZP77xevakfeh2Kg/Q4OjT4mAYTVahI6ayGGgLvKDzXBxAKNX1gUyH6RNbT4NUQVPXa4jQzrrQC0WDr6lb8zejIyetkat91gkYAisUvFZSWHaTB/wOk9WSnw6spJb/4kCNEqnEMB/RwG2vATDzcfDdqRNkcjy/2qlD8Cj3KkH4joUgmJH925dC8B2c+LtggGNvqHds9JXLhbmj5cw6wRQk0B+1W1IVjEmhCZmHjtltop5pka2cgJ2qqkEnQnjwh4aBIUlk7G6P4x6xElT+jOQEzMyfVGsJ18a3FhXcL2zjoLu2g6buTMGQo/JIcWEEUWvb3QvmGEDjkewto=</ds:X509Certificate>
+ </ds:X509Data>
+ <ds:KeyName>bismarck.nyme.hu</ds:KeyName>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bismarck.nyme.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bismarck.nyme.hu/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="hu">Nyugat-magyarországi Egyetem</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">The University of West Hungary (Sopron), Hungary</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="hu">Nyugat-magyarországi Egyetem</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">The University of West Hungary (Sopron), Hungary</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="hu">http://www.nyme.hu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.uniwest.hu</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Nemeth Tamas</md:SurName>
+ <md:EmailAddress>mailto:tamas.nemeth.net@eik.nyme.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:SurName>Nemeth Tamas</md:SurName>
+ <md:EmailAddress>mailto:tamas.nemeth.net@eik.nyme.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:SurName>Nemeth Tamas</md:SurName>
+ <md:EmailAddress>mailto:tamas.nemeth.net@eik.nyme.hu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index c660b898..cacc0312 100644
--- a/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -67,6 +67,6 @@
<md:ContactPerson contactType="technical">
<md:GivenName>NORDUNet</md:GivenName>
<md:SurName>NOC</md:SurName>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/brain.lab.vvc.niif.hu-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/brain.lab.vvc.niif.hu-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..43f863af
--- /dev/null
+++ b/swamid-interfederations-2.0/brain.lab.vvc.niif.hu-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://brain.lab.vvc.niif.hu/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>niifi</saml:AttributeValue>
+ <saml:AttributeValue>href</saml:AttributeValue>
+ <saml:AttributeValue>href-edugain</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+ <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">SA8T2 STUN/TURN pilot service</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SA8T2 STUN/TURN pilot service</mdui:DisplayName>
+ <mdui:Description xml:lang="hu">NIIF &amp; GÉANT4 SA8T2 STUN/TURN pilot service</mdui:Description>
+ <mdui:Description xml:lang="en">NIIF &amp; GÉANT4 SA8T2 STUN/TURN pilot service</mdui:Description>
+ <mdui:InformationURL xml:lang="hu">https://brain.lab.vvc.niif.hu</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="hu">https://brain.lab.vvc.niif.hu/privacy.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIID8zCCAtugAwIBAgIJAOEmrKCwwgFGMA0GCSqGSIb3DQEBCwUAMIGPMQswCQYDVQQGEwJIVTEQMA4GA1UECAwHSHVuZ2FyeTERMA8GA1UEBwwIQnVkYXBlc3QxFzAVBgNVBAoMDk5JSUYgSW5zdGl0dXRlMR4wHAYDVQQDDBVicmFpbi5sYWIudnZjLm5paWYuaHUxIjAgBgkqhkiG9w0BCQEWE3ZpZGVvLWFkbWluQG5paWYuaHUwHhcNMTUxMTE4MTAwMDE5WhcNMjUxMTE3MTAwMDE5WjCBjzELMAkGA1UEBhMCSFUxEDAOBgNVBAgMB0h1bmdhcnkxETAPBgNVBAcMCEJ1ZGFwZXN0MRcwFQYDVQQKDA5OSUlGIEluc3RpdHV0ZTEeMBwGA1UEAwwVYnJhaW4ubGFiLnZ2Yy5uaWlmLmh1MSIwIAYJKoZIhvcNAQkBFhN2aWRlby1hZG1pbkBuaWlmLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2EmyGJJKf81jOZT+vURk31LCQKV3W6FaeSS0gwTKEAnGB4t+YmQtpBPO0CSD0pbYBDAo1O4uMy55bXqwRjJnShqC1NKBHvf8dwQsSf5ri32wiuCMqDJ2HXijVHLqcWP3eHcHJ+KViIk1HdMS26E8jWl9jL1SJMiKLr7x90hiyvt/7qxajNnc7uiISKX757wMrhMf/MI4fTz1+ZnI8BZOa9pTE4l5m7B37se2M5E366vcIdOPRGTgHYiuJaqPt1IkJ14xvcuOI+YiCk424pOuOTh/WgDUGvNV2SZmmeHQGsfkL5ZLlni1amXHbqNn0/mQ6sTsrR+AnJREmgNXlCCZhwIDAQABo1AwTjAdBgNVHQ4EFgQUrti4QDbl9FCPz4JnSHF43rsVRM4wHwYDVR0jBBgwFoAUrti4QDbl9FCPz4JnSHF43rsVRM4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAdFXN/U/sPXfhWvPMmDaI9cMfi7PdT7Mp8qH7D5lI90Y98/nnjYun6Df4tHbyChnLw6k7GQ1XfTd8ClQOU409IMtJFDln3LdGhaNuVt9zLaV0KX5wNnUNoHE+hEh9kg2cz56ixyIJj/cEkg6b3FaUAnu9DDD8+gWKMtIGvqQAUlfy4Hk/lacvaXstUu/Vb8xuolfIM2Sc1z4U649dSvcu7QIA//pgFlOEPQ0kYIn675petzKRiJPdbEvfgHPGMmYgkssK6bJCyedk8SxBboiDkromhRH69EwXBP8Tei06EgMgsC6x/jZ+FhZ6dU/kzBwsf3s4cNt+grDGvV+VSOdUGA==</ds:X509Certificate>
+ </ds:X509Data>
+ <ds:KeyName>brain.lab.vvc.niif.hu</ds:KeyName>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://brain.lab.vvc.niif.hu/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://brain.lab.vvc.niif.hu/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://brain.lab.vvc.niif.hu/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://brain.lab.vvc.niif.hu/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://brain.lab.vvc.niif.hu/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="4"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="hu">SA8T2 STUN/TURN pilot service</md:ServiceName>
+ <md:ServiceName xml:lang="en">SA8T2 STUN/TURN pilot service</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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" 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:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:SurName>Meszaros</md:SurName>
+ <md:EmailAddress>mailto:misi@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Meszaros</md:SurName>
+ <md:EmailAddress>mailto:misi@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:SurName>Meszaros</md:SurName>
+ <md:EmailAddress>mailto:misi@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bureau.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/bureau.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml
index 4cc7c922..5a1714de 100644
--- a/swamid-interfederations-2.0/bureau.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/bureau.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml
@@ -7,12 +7,13 @@
</md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knaw.nl</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="nl">Bureau (KNAW)</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Bureau (KNAW)</mdui:DisplayName>
<mdui:Description xml:lang="nl">Bureau (KNAW)</mdui:Description>
<mdui:Description xml:lang="en">Bureau (KNAW)</mdui:Description>
- <mdui:Logo height="48" width="48">https://static.surfconext.nl/media/idp/knaw.png</mdui:Logo>
+ <mdui:Logo height="48" width="48">https://static.surfconext.nl/logos/idp/knaw.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Bureau (KNAW)</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Bureau (KNAW)</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/cafe.cnen.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.cnen.gov.br-idp-shibboleth.xml
new file mode 100644
index 00000000..1d4fc354
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.cnen.gov.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.cnen.gov.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">CNEN - Comissao Nacional de Energia Nuclear</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">CNEN - Comissao Nacional de Energia Nuclear</mdui:DisplayName>
+ <mdui:Description xml:lang="en">CNEN - Comissao Nacional de Energia Nuclear</mdui:Description>
+ <mdui:Description xml:lang="pt-br">CNEN - Comissao Nacional de Energia Nuclear</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.cnen.gov.br</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.cnen.gov.br</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEFjCCAv4CAQAwDQYJKoZIhvcNAQEFBQAwgdAxNTAzBgNVBAoULENORU4gLSBD
+b21pc3PDo28gTmFjaW9uYWwgZGUgRW5lcmdpYSBOdWNsZWFyMQ0wCwYDVQQLEwRD
+R1RJMSIwIAYJKoZIhvcNAQkBFhNlbWVyc29uQGNuZW4uZ292LmJyMRcwFQYDVQQH
+Ew5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJBgNV
+BAYTAkJSMSUwIwYDVQQDExxjYWZlLmNuZW4uZ292LmJyLmNuZW4uZ292LmJyMB4X
+DTE1MTAyMDE2MzYyNFoXDTE4MTAxOTE2MzYyNFowgdAxNTAzBgNVBAoULENORU4g
+LSBDb21pc3PDo28gTmFjaW9uYWwgZGUgRW5lcmdpYSBOdWNsZWFyMQ0wCwYDVQQL
+EwRDR1RJMSIwIAYJKoZIhvcNAQkBFhNlbWVyc29uQGNuZW4uZ292LmJyMRcwFQYD
+VQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJ
+BgNVBAYTAkJSMSUwIwYDVQQDExxjYWZlLmNuZW4uZ292LmJyLmNuZW4uZ292LmJy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7jpAzHc6YPI8OlzUZ0K
+QupnUGDgg6XDAHhyO34gr0RVw23wA23comT1INiM0aBbnbs30pZlVm1EVyqI4Mrs
+qS5pkBd6GuZRFpwvFvC0kNY2nSDFgrB4CjZANiz6x1l/WdgyoJOQXEzCY+r2gb5E
+czsubWdjJtmIgQte81lPJ8eGRCEfCqBWWZZRnso3LSfdiBft8Zd2islKgsd6Kodm
+B+2pVyOsWPstUYctSn8DIufRHyqserTR6nHU1Y/uZJt09GMjStcCVJsbiMkCwaP3
+F7hYUU1MpK/V0DwyCTbnq1q3cYD28czgRZ52yL9CNbCjhW9IIIUGgu/ZjMF1MzRi
+fQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBmsSusVoImAwRu8SWZQ2XD5YUxEqkj
+w3eLnxE94kp8buhgS478XKJELNFwDXAQfW6AzNkMgZF9KETYIGb2IEqb0MdFarjY
+rhT4PqEv2xZa/k2QUrYjEaJ+4uwIQStU0fx+2L//iVjApjeMhSf1RImzrkKyLLjc
+O3sWxrQWMNaoZnpLTfWuLPz+GKCSySo0dMYlmrUfXKhKx1LBpFl4LVv/BEfHRJoF
+ek7juaxmfEIX/q2uIto6gIJLYwW/s6zkfJlD3sIVeP5EqcwheuZhmKNiFoaCtw6R
+LDx/9w6rhEYQbiIsW6NDa4Si/8p6x6UuG6zPFJ8uOIjD2yvEd0ap3S9+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.cnen.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.cnen.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.cnen.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.cnen.gov.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.cnen.gov.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.cnen.gov.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEFjCCAv4CAQAwDQYJKoZIhvcNAQEFBQAwgdAxNTAzBgNVBAoULENORU4gLSBD
+b21pc3PDo28gTmFjaW9uYWwgZGUgRW5lcmdpYSBOdWNsZWFyMQ0wCwYDVQQLEwRD
+R1RJMSIwIAYJKoZIhvcNAQkBFhNlbWVyc29uQGNuZW4uZ292LmJyMRcwFQYDVQQH
+Ew5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJBgNV
+BAYTAkJSMSUwIwYDVQQDExxjYWZlLmNuZW4uZ292LmJyLmNuZW4uZ292LmJyMB4X
+DTE1MTAyMDE2MzYyNFoXDTE4MTAxOTE2MzYyNFowgdAxNTAzBgNVBAoULENORU4g
+LSBDb21pc3PDo28gTmFjaW9uYWwgZGUgRW5lcmdpYSBOdWNsZWFyMQ0wCwYDVQQL
+EwRDR1RJMSIwIAYJKoZIhvcNAQkBFhNlbWVyc29uQGNuZW4uZ292LmJyMRcwFQYD
+VQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJ
+BgNVBAYTAkJSMSUwIwYDVQQDExxjYWZlLmNuZW4uZ292LmJyLmNuZW4uZ292LmJy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7jpAzHc6YPI8OlzUZ0K
+QupnUGDgg6XDAHhyO34gr0RVw23wA23comT1INiM0aBbnbs30pZlVm1EVyqI4Mrs
+qS5pkBd6GuZRFpwvFvC0kNY2nSDFgrB4CjZANiz6x1l/WdgyoJOQXEzCY+r2gb5E
+czsubWdjJtmIgQte81lPJ8eGRCEfCqBWWZZRnso3LSfdiBft8Zd2islKgsd6Kodm
+B+2pVyOsWPstUYctSn8DIufRHyqserTR6nHU1Y/uZJt09GMjStcCVJsbiMkCwaP3
+F7hYUU1MpK/V0DwyCTbnq1q3cYD28czgRZ52yL9CNbCjhW9IIIUGgu/ZjMF1MzRi
+fQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBmsSusVoImAwRu8SWZQ2XD5YUxEqkj
+w3eLnxE94kp8buhgS478XKJELNFwDXAQfW6AzNkMgZF9KETYIGb2IEqb0MdFarjY
+rhT4PqEv2xZa/k2QUrYjEaJ+4uwIQStU0fx+2L//iVjApjeMhSf1RImzrkKyLLjc
+O3sWxrQWMNaoZnpLTfWuLPz+GKCSySo0dMYlmrUfXKhKx1LBpFl4LVv/BEfHRJoF
+ek7juaxmfEIX/q2uIto6gIJLYwW/s6zkfJlD3sIVeP5EqcwheuZhmKNiFoaCtw6R
+LDx/9w6rhEYQbiIsW6NDa4Si/8p6x6UuG6zPFJ8uOIjD2yvEd0ap3S9+
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.cnen.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.cnen.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">CNEN - Comissao Nacional de Energia Nuclear</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">CNEN - Comissao Nacional de Energia Nuclear</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">CNEN - Comissao Nacional de Energia Nuclear</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">CNEN - Comissao Nacional de Energia Nuclear</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.cnen.gov.br</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.cnen.gov.br</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Emerson Antunes Coimbra</md:SurName>
+ <md:EmailAddress>emerson@cnen.gov.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.cp2.g12.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.cp2.g12.br-idp-shibboleth.xml
new file mode 100644
index 00000000..cdcd6643
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.cp2.g12.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.cp2.g12.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">g12.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">CPII - Colegio Pedro II</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">CPII - Colegio Pedro II</mdui:DisplayName>
+ <mdui:Description xml:lang="en">CPII - Colegio Pedro II</mdui:Description>
+ <mdui:Description xml:lang="pt-br">CPII - Colegio Pedro II</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.cp2.g12.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.cp2.g12.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxGTAXBgNVBAoTEENvbGVnaW8g
+UGVkcm8gSUkxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG9w0BCQEWFHRtYW5kcmFk
+ZUBjcDIuZzEyLmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMO
+UmlvIGRlIEphbmVpcm8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmNwMi5n
+MTIuYnIwHhcNMTUxMDEzMTUxNjEzWhcNMTgxMDEyMTUxNjEzWjCBqDEZMBcGA1UE
+ChMQQ29sZWdpbyBQZWRybyBJSTENMAsGA1UECxMEQ0dUSTEjMCEGCSqGSIb3DQEJ
+ARYUdG1hbmRyYWRlQGNwMi5nMTIuYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJv
+MRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxGDAWBgNVBAMT
+D2NhZmUuY3AyLmcxMi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALnKYArbfo0YXJcA6c5Dh9JzpT1GQA4Qzpr2iMu1UCdyZcpaVhDxRst0kHwh/J71
+tC47rG6LaS9PHY/3Fxseg5VRipynBEqOwFUUkwfafF+SykHV4GEIdZFX+QmQuybk
+6rRrvm23Xub9rSlrLC6ej+1gVPlhKGlAj+ac/WRiOZNt5ePbobpQlRTxP+jdnKy9
+a0zVNl7+wuCDnc2dOq9u3waV/LtFng1fBcwMeMBrJp7E6bACkU1mZSFjtofsumvO
+CQKoN2KMmtNOuXyVYbVFqH/tWX/0EYlIjdV9owBZpZJQaD1x/JsXA7sSFpWS7KLG
+wVe3saPRZEtnMKYv/ODdvxcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM12r7Z21
+ZFfp7cJJsyFvsmo7I/Ng8ZOK3jK2fNbi/sbfxwrRA+DBar/eoLnaOZ9GNNHzP7xY
+ad+NbbMQbsiILmWQ/E03ZFKVXvkPAzD21B/wP0yNp0MeDwNtFkyntTUMOHtg/Ajl
+zOTY1QnpSocfP4cAv8e/DhqAkQNtF15/pnL/Vzubq6cainqsNhxhPNaUjtq/GwTq
+9KHAXiNyQSp3YXLGxLPRQEDj0PGhbWZA+sA18EEhJ197VLPhmP41e0a178saGWHF
+5toYGF6QnUUB/ejEaYt37HDl8hHAus4UfQLymdWQG/qtzlz9JBlHP92cBbh85eR1
+dmdFrk2HS2kCqA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.cp2.g12.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.cp2.g12.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.cp2.g12.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.cp2.g12.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.cp2.g12.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.cp2.g12.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">g12.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxGTAXBgNVBAoTEENvbGVnaW8g
+UGVkcm8gSUkxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG9w0BCQEWFHRtYW5kcmFk
+ZUBjcDIuZzEyLmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMO
+UmlvIGRlIEphbmVpcm8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmNwMi5n
+MTIuYnIwHhcNMTUxMDEzMTUxNjEzWhcNMTgxMDEyMTUxNjEzWjCBqDEZMBcGA1UE
+ChMQQ29sZWdpbyBQZWRybyBJSTENMAsGA1UECxMEQ0dUSTEjMCEGCSqGSIb3DQEJ
+ARYUdG1hbmRyYWRlQGNwMi5nMTIuYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJv
+MRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxGDAWBgNVBAMT
+D2NhZmUuY3AyLmcxMi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALnKYArbfo0YXJcA6c5Dh9JzpT1GQA4Qzpr2iMu1UCdyZcpaVhDxRst0kHwh/J71
+tC47rG6LaS9PHY/3Fxseg5VRipynBEqOwFUUkwfafF+SykHV4GEIdZFX+QmQuybk
+6rRrvm23Xub9rSlrLC6ej+1gVPlhKGlAj+ac/WRiOZNt5ePbobpQlRTxP+jdnKy9
+a0zVNl7+wuCDnc2dOq9u3waV/LtFng1fBcwMeMBrJp7E6bACkU1mZSFjtofsumvO
+CQKoN2KMmtNOuXyVYbVFqH/tWX/0EYlIjdV9owBZpZJQaD1x/JsXA7sSFpWS7KLG
+wVe3saPRZEtnMKYv/ODdvxcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM12r7Z21
+ZFfp7cJJsyFvsmo7I/Ng8ZOK3jK2fNbi/sbfxwrRA+DBar/eoLnaOZ9GNNHzP7xY
+ad+NbbMQbsiILmWQ/E03ZFKVXvkPAzD21B/wP0yNp0MeDwNtFkyntTUMOHtg/Ajl
+zOTY1QnpSocfP4cAv8e/DhqAkQNtF15/pnL/Vzubq6cainqsNhxhPNaUjtq/GwTq
+9KHAXiNyQSp3YXLGxLPRQEDj0PGhbWZA+sA18EEhJ197VLPhmP41e0a178saGWHF
+5toYGF6QnUUB/ejEaYt37HDl8hHAus4UfQLymdWQG/qtzlz9JBlHP92cBbh85eR1
+dmdFrk2HS2kCqA==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.cp2.g12.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.cp2.g12.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">CPII - Colegio Pedro II</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">CPII - Colegio Pedro II</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">CPII - Colegio Pedro II</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">CPII - Colegio Pedro II</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.cp2.g12.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.cp2.g12.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Thiago Martorelli</md:SurName>
+ <md:EmailAddress>tmandrade@cp2.g12.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ibict.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ibict.br-idp-shibboleth.xml
new file mode 100644
index 00000000..e8e9501c
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ibict.br-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ibict.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibict.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ibict.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ibict.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIECDCCAvACAQAwDQYJKoZIhvcNAQEFBQAwgckxQzBBBgNVBAoUOkluc3RpdHV0
+byBCcmFzaWxlaXJvIGRlIEluZm9ybWHn428gZW0gQ2nqbmNpYSBlIFRlY25vbG9n
+aWExDjAMBgNVBAsTBUlCSUNUMR8wHQYJKoZIhvcNAQkBFhBiZW5pY2lvQGliaWN0
+LmJyMREwDwYDVQQHEwhCcmFzaWxpYTEZMBcGA1UECBMQRGlzdHJpdG8gRmVkZXJh
+bDELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUuaWJpY3QuYnIwHhcNMTUwNDMw
+MTMyOTQ3WhcNMTgwNDI5MTMyOTQ3WjCByTFDMEEGA1UEChQ6SW5zdGl0dXRvIEJy
+YXNpbGVpcm8gZGUgSW5mb3JtYefjbyBlbSBDaepuY2lhIGUgVGVjbm9sb2dpYTEO
+MAwGA1UECxMFSUJJQ1QxHzAdBgkqhkiG9w0BCQEWEGJlbmljaW9AaWJpY3QuYnIx
+ETAPBgNVBAcTCEJyYXNpbGlhMRkwFwYDVQQIExBEaXN0cml0byBGZWRlcmFsMQsw
+CQYDVQQGEwJCUjEWMBQGA1UEAxMNY2FmZS5pYmljdC5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMvLiN/XFBLhWCbglIa/z8fiSgxxLl6cCq6RSPp2
+1a6YP7FOa6Yr27oI+qsMy4ppGM6brlI1jqbFjeHjidlM8vesPRX4ZTMdM/t5eT11
+45OY7vGTibAL/gcvtg/5NX3xVWEzaStCoeXIQo+ExvbdiIqbp/BgQ+WPSC7MSHJO
+OWhIDGYZlI6icmpO2+VDfIqbUuhCHhj1AUxFNyMofKl8gsicofnzqkSCiaf6gPp+
+/LqKTStwdyWV91W3MBZVUxnFRyUoiOElj7XakskECxXlvYkGvIXW2M293YAfWE1z
+9gKJeUYvhSu4Jr0icKhSAX/fsMGkUOuu13Tpdnol1dETpI8CAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEATeHDBnb6qsxkiTAt1j56dvsM+YSlxSJ3hkJjAilnIZovT+3V
+w2zDeTa0zBkXHTeD0BUYD4ycCUq3P7hEEJgjWddIdVEPeEptDwXHdtWl37W5KSHR
+2gTsYUcn+R7g5K388uJtP/9m5YZQAs2EmDHkX6U5DUI9MJq2NYGTuAA34UgFvUnF
+hmM7+xoVBLARfBd5RW32TC6zPQHE085tkEpwdrt0gpJomuDSH4xN9Cg/mpYjGu3b
+MCjWyXkvx5MWwLEhWX2wfb1OW1njrrXJED5/lfU/VXBBbIBuPYrXssrean5rsqGD
+sFFBp3cAD9Mu3T9VuMY1GztDz1PPfkSsDlsEdg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ibict.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ibict.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.ibict.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ibict.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ibict.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ibict.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibict.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIECDCCAvACAQAwDQYJKoZIhvcNAQEFBQAwgckxQzBBBgNVBAoUOkluc3RpdHV0
+byBCcmFzaWxlaXJvIGRlIEluZm9ybWHn428gZW0gQ2nqbmNpYSBlIFRlY25vbG9n
+aWExDjAMBgNVBAsTBUlCSUNUMR8wHQYJKoZIhvcNAQkBFhBiZW5pY2lvQGliaWN0
+LmJyMREwDwYDVQQHEwhCcmFzaWxpYTEZMBcGA1UECBMQRGlzdHJpdG8gRmVkZXJh
+bDELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUuaWJpY3QuYnIwHhcNMTUwNDMw
+MTMyOTQ3WhcNMTgwNDI5MTMyOTQ3WjCByTFDMEEGA1UEChQ6SW5zdGl0dXRvIEJy
+YXNpbGVpcm8gZGUgSW5mb3JtYefjbyBlbSBDaepuY2lhIGUgVGVjbm9sb2dpYTEO
+MAwGA1UECxMFSUJJQ1QxHzAdBgkqhkiG9w0BCQEWEGJlbmljaW9AaWJpY3QuYnIx
+ETAPBgNVBAcTCEJyYXNpbGlhMRkwFwYDVQQIExBEaXN0cml0byBGZWRlcmFsMQsw
+CQYDVQQGEwJCUjEWMBQGA1UEAxMNY2FmZS5pYmljdC5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMvLiN/XFBLhWCbglIa/z8fiSgxxLl6cCq6RSPp2
+1a6YP7FOa6Yr27oI+qsMy4ppGM6brlI1jqbFjeHjidlM8vesPRX4ZTMdM/t5eT11
+45OY7vGTibAL/gcvtg/5NX3xVWEzaStCoeXIQo+ExvbdiIqbp/BgQ+WPSC7MSHJO
+OWhIDGYZlI6icmpO2+VDfIqbUuhCHhj1AUxFNyMofKl8gsicofnzqkSCiaf6gPp+
+/LqKTStwdyWV91W3MBZVUxnFRyUoiOElj7XakskECxXlvYkGvIXW2M293YAfWE1z
+9gKJeUYvhSu4Jr0icKhSAX/fsMGkUOuu13Tpdnol1dETpI8CAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEATeHDBnb6qsxkiTAt1j56dvsM+YSlxSJ3hkJjAilnIZovT+3V
+w2zDeTa0zBkXHTeD0BUYD4ycCUq3P7hEEJgjWddIdVEPeEptDwXHdtWl37W5KSHR
+2gTsYUcn+R7g5K388uJtP/9m5YZQAs2EmDHkX6U5DUI9MJq2NYGTuAA34UgFvUnF
+hmM7+xoVBLARfBd5RW32TC6zPQHE085tkEpwdrt0gpJomuDSH4xN9Cg/mpYjGu3b
+MCjWyXkvx5MWwLEhWX2wfb1OW1njrrXJED5/lfU/VXBBbIBuPYrXssrean5rsqGD
+sFFBp3cAD9Mu3T9VuMY1GztDz1PPfkSsDlsEdg==
+
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ibict.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ibict.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ibict.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.ibict.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Benicio Mendes</md:SurName>
+ <md:EmailAddress>benicio@ibict.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml
index 6d24622f..5f75c49a 100644
--- a/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml
@@ -11,10 +11,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">IFRO</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">IFRO</mdui:DisplayName>
- <mdui:Description xml:lang="en">IFRO</mdui:Description>
- <mdui:Description xml:lang="pt-br">IFRO</mdui:Description>
+ <mdui:DisplayName xml:lang="en">IFRO - Instituto Federal de Rondonia</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IFRO - Instituto Federal de Rondonia</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IFRO - Instituto Federal de Rondonia</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IFRO - Instituto Federal de Rondonia</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.ifro.edu.br</mdui:InformationURL>
<mdui:InformationURL xml:lang="pt-br">http://www.ifro.edu.br</mdui:InformationURL>
</mdui:UIInfo>
@@ -86,10 +86,10 @@ zDUAzBmzpM9dLuP2WBQkKjZNg6PwOzmIF0JRBaGx4PaRAha3GWG91vo5zI+lVg==
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">IFRO</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">IFRO</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">IFRO</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">IFRO</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">IFRO - Instituto Federal de Rondonia</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">IFRO - Instituto Federal de Rondonia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">IFRO - Instituto Federal de Rondonia</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">IFRO - Instituto Federal de Rondonia</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.ifro.edu.br</md:OrganizationURL>
<md:OrganizationURL xml:lang="pt-br">http://www.ifro.edu.br</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/cafe.int.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.int.gov.br-idp-shibboleth.xml
new file mode 100644
index 00000000..214070d5
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.int.gov.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.int.gov.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">INT - Instituto Nacional de Tecnologia</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">INT - Instituto Nacional de Tecnologia</mdui:DisplayName>
+ <mdui:Description xml:lang="en">INT - Instituto Nacional de Tecnologia</mdui:Description>
+ <mdui:Description xml:lang="pt-br">INT - Instituto Nacional de Tecnologia</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.int.gov.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.int.gov.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLzAtBgNVBAoTJklOVCAtIElu
+c3RpdHV0byBOYWNpb25hbCBkZSBUZWNub2xvZ2lhMTYwNAYDVQQLFC1ESVRJIC0g
+RGl2aXPDo28gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xFzAVBgNVBAcT
+DlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UE
+BhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTUxMDE0MTgwMTA4WhcNMTgxMDEzMTgw
+MTA4WjCBtzEvMC0GA1UEChMmSU5UIC0gSW5zdGl0dXRvIE5hY2lvbmFsIGRlIFRl
+Y25vbG9naWExNjA0BgNVBAsULURJVEkgLSBEaXZpc8OjbyBkZSBUZWNub2xvZ2lh
+IGRhIEluZm9ybWHDp8OjbzEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8xFzAVBgNV
+BAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2FmZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbrN61tI2RxMGEdoG7iFhjJ
+DBBdNhVUJl2p3SSuczWTa+HvbKWx7cF38QVnjBcxMaHZFbRNTwq/UCxHssMAzMVq
+zdOep2qwQ+u4cpkNijUG/u/hEWGUaTtMt2ClO+ONqcWN/sqE7ekCyAfBhEz60VXg
+YrDdEUe1+cpGEjdDlfMy0kOpP7mXya34hKkqyJH106YmjVyOlP8UEzH04K3rXPNp
+NZjwbzztaq9xYmYgta199vSCdmh04gAbJzWS+wABoNeDHYxoCao4gTJ8CmKPab1P
+/0tJ+WsSQ1/+g2O8FXkYCbCIt0E2aWE8V0eUf3SPGJEl/5+0WR4/3EtUqtPi/jMC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAo92UA4/rxqefToQnm3ZlVJNgCYsjltwE
+HZAwm16mUAXjFljaqvDsysc2cvlsYKEvSUPwqcpa3k05L3hdW3dBE1l/AMoKuiTc
+km2xRZq6zhG2D4YHPEpcH4/PVLMNYfTTN+Pie9wsugM3IgqagUXUdtS4eI8t3x0X
++l8GAGHKRRDHjHBb+93iQJGITFNg0CJFaCvAa8kBBn2P5gbKohLhIHGfShG8719b
+0oRJ5a6b2L3wcMipz8W+tMc7Wi4o5QcW0WQvPyJl9B9KqzGthQOJIYigPx4iV2Va
+yhRwKkLgaS4ooMcUPBLDYoD7F3Yx2zKh9DiSWJBqj39lAR/+Bl00cA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.int.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.int.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.int.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.int.gov.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.int.gov.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.int.gov.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLzAtBgNVBAoTJklOVCAtIElu
+c3RpdHV0byBOYWNpb25hbCBkZSBUZWNub2xvZ2lhMTYwNAYDVQQLFC1ESVRJIC0g
+RGl2aXPDo28gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xFzAVBgNVBAcT
+DlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UE
+BhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTUxMDE0MTgwMTA4WhcNMTgxMDEzMTgw
+MTA4WjCBtzEvMC0GA1UEChMmSU5UIC0gSW5zdGl0dXRvIE5hY2lvbmFsIGRlIFRl
+Y25vbG9naWExNjA0BgNVBAsULURJVEkgLSBEaXZpc8OjbyBkZSBUZWNub2xvZ2lh
+IGRhIEluZm9ybWHDp8OjbzEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8xFzAVBgNV
+BAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2FmZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbrN61tI2RxMGEdoG7iFhjJ
+DBBdNhVUJl2p3SSuczWTa+HvbKWx7cF38QVnjBcxMaHZFbRNTwq/UCxHssMAzMVq
+zdOep2qwQ+u4cpkNijUG/u/hEWGUaTtMt2ClO+ONqcWN/sqE7ekCyAfBhEz60VXg
+YrDdEUe1+cpGEjdDlfMy0kOpP7mXya34hKkqyJH106YmjVyOlP8UEzH04K3rXPNp
+NZjwbzztaq9xYmYgta199vSCdmh04gAbJzWS+wABoNeDHYxoCao4gTJ8CmKPab1P
+/0tJ+WsSQ1/+g2O8FXkYCbCIt0E2aWE8V0eUf3SPGJEl/5+0WR4/3EtUqtPi/jMC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAo92UA4/rxqefToQnm3ZlVJNgCYsjltwE
+HZAwm16mUAXjFljaqvDsysc2cvlsYKEvSUPwqcpa3k05L3hdW3dBE1l/AMoKuiTc
+km2xRZq6zhG2D4YHPEpcH4/PVLMNYfTTN+Pie9wsugM3IgqagUXUdtS4eI8t3x0X
++l8GAGHKRRDHjHBb+93iQJGITFNg0CJFaCvAa8kBBn2P5gbKohLhIHGfShG8719b
+0oRJ5a6b2L3wcMipz8W+tMc7Wi4o5QcW0WQvPyJl9B9KqzGthQOJIYigPx4iV2Va
+yhRwKkLgaS4ooMcUPBLDYoD7F3Yx2zKh9DiSWJBqj39lAR/+Bl00cA==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.int.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.int.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">INT - Instituto Nacional de Tecnologia</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">INT - Instituto Nacional de Tecnologia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">INT - Instituto Nacional de Tecnologia</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">INT - Instituto Nacional de Tecnologia</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.int.gov.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.int.gov.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Luiz Dias</md:SurName>
+ <md:EmailAddress>luiz.dias@int.gov.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.mcti.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.mcti.gov.br-idp-shibboleth.xml
new file mode 100644
index 00000000..dade1d86
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.mcti.gov.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.mcti.gov.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcti.gov.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</mdui:DisplayName>
+ <mdui:Description xml:lang="en">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</mdui:Description>
+ <mdui:Description xml:lang="pt-br">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.mcti.gov.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.mcti.gov.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID4DCCAsgCAQAwDQYJKoZIhvcNAQEFBQAwgbUxNTAzBgNVBAoULE1JTklTVMlS
+SU8gREEgQ0nKTkNJQSwgVEVDTk9MT0dJQSBFIElOT1ZBx8NPMQ0wCwYDVQQLEwRD
+R1RJMR8wHQYJKoZIhvcNAQkBFhBjZ3RpQG1jdGkuZ292LmJyMREwDwYDVQQHFAhC
+cmFz7WxpYTELMAkGA1UECBMCREYxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZzaGli
+Ym9sZXRoLm1jdC5nb3YuYnIgMB4XDTE1MTAwMjE5MDM1MloXDTE4MTAwMTE5MDM1
+MlowgbUxNTAzBgNVBAoULE1JTklTVMlSSU8gREEgQ0nKTkNJQSwgVEVDTk9MT0dJ
+QSBFIElOT1ZBx8NPMQ0wCwYDVQQLEwRDR1RJMR8wHQYJKoZIhvcNAQkBFhBjZ3Rp
+QG1jdGkuZ292LmJyMREwDwYDVQQHFAhCcmFz7WxpYTELMAkGA1UECBMCREYxCzAJ
+BgNVBAYTAkJSMR8wHQYDVQQDExZzaGliYm9sZXRoLm1jdC5nb3YuYnIgMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxNWc4sXlHfFx8K5z3tFp1qxqrjb3
+wcUnkt+WUAWDU329b0PzpRnojFW6V/NGvifpgb0omA1iKbM9HBJnLgAhQeVaB1Fa
+1qxN0tfaaQQQu3uC4Ge6jxJWnrZtbmC9Qfw/+yEoP+iN4PQKw7bhTQJDBD+i3Hlh
+67UBZ/uMOs8rEZJDbzocsGISikZfuwDmtflTlpf/DXfqnrQhzMhpEfegC8afzcA8
+O3ZDBrXBov4MdTKfPjtrtbIpdpU6OV/G8vIC+eEImvTbkHmKA3I3qOChTK4pj4Ck
+B7RGzE6Clalm+R1FVnPFgvO16lcS/KlL12jB1/vXAomGHThOj7M1LRI34wIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQA58CiJc5O6Hq8ITWADFxM+BV97OzaQSkXsOF7e
+NnHva3kG6XJsc8CS2oYxWcGI6NRGDjLBK9phqjWQXm33yMZZTwNbzp8FdOfIYZYN
+Zi5M0a/qtF5hF1ku7iD8q9ZGdZvaxHe5OKKooqJiqdX2GyGpSLKLi4oEzw/BQwZY
+0rshZowIsAKJFEVyVloAjTgNEBN8DqGIqFrwgjOYu/7JL/+lWQF2wxXRTJcEq+q4
+aWfQR54+AvG5WzOajAhQSGTGXkMumQrnFAgJSi4r7S7T5zF6ynGalfRuqDG5xGih
+H4iAdWwzMf9pmj/5YnWSqe28vEbeEyPeX/4e53os0oM9raJN
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.mcti.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.mcti.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.mcti.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.mcti.gov.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.mcti.gov.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.mcti.gov.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcti.gov.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIID4DCCAsgCAQAwDQYJKoZIhvcNAQEFBQAwgbUxNTAzBgNVBAoULE1JTklTVMlS
+SU8gREEgQ0nKTkNJQSwgVEVDTk9MT0dJQSBFIElOT1ZBx8NPMQ0wCwYDVQQLEwRD
+R1RJMR8wHQYJKoZIhvcNAQkBFhBjZ3RpQG1jdGkuZ292LmJyMREwDwYDVQQHFAhC
+cmFz7WxpYTELMAkGA1UECBMCREYxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZzaGli
+Ym9sZXRoLm1jdC5nb3YuYnIgMB4XDTE1MTAwMjE5MDM1MloXDTE4MTAwMTE5MDM1
+MlowgbUxNTAzBgNVBAoULE1JTklTVMlSSU8gREEgQ0nKTkNJQSwgVEVDTk9MT0dJ
+QSBFIElOT1ZBx8NPMQ0wCwYDVQQLEwRDR1RJMR8wHQYJKoZIhvcNAQkBFhBjZ3Rp
+QG1jdGkuZ292LmJyMREwDwYDVQQHFAhCcmFz7WxpYTELMAkGA1UECBMCREYxCzAJ
+BgNVBAYTAkJSMR8wHQYDVQQDExZzaGliYm9sZXRoLm1jdC5nb3YuYnIgMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxNWc4sXlHfFx8K5z3tFp1qxqrjb3
+wcUnkt+WUAWDU329b0PzpRnojFW6V/NGvifpgb0omA1iKbM9HBJnLgAhQeVaB1Fa
+1qxN0tfaaQQQu3uC4Ge6jxJWnrZtbmC9Qfw/+yEoP+iN4PQKw7bhTQJDBD+i3Hlh
+67UBZ/uMOs8rEZJDbzocsGISikZfuwDmtflTlpf/DXfqnrQhzMhpEfegC8afzcA8
+O3ZDBrXBov4MdTKfPjtrtbIpdpU6OV/G8vIC+eEImvTbkHmKA3I3qOChTK4pj4Ck
+B7RGzE6Clalm+R1FVnPFgvO16lcS/KlL12jB1/vXAomGHThOj7M1LRI34wIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQA58CiJc5O6Hq8ITWADFxM+BV97OzaQSkXsOF7e
+NnHva3kG6XJsc8CS2oYxWcGI6NRGDjLBK9phqjWQXm33yMZZTwNbzp8FdOfIYZYN
+Zi5M0a/qtF5hF1ku7iD8q9ZGdZvaxHe5OKKooqJiqdX2GyGpSLKLi4oEzw/BQwZY
+0rshZowIsAKJFEVyVloAjTgNEBN8DqGIqFrwgjOYu/7JL/+lWQF2wxXRTJcEq+q4
+aWfQR54+AvG5WzOajAhQSGTGXkMumQrnFAgJSi4r7S7T5zF6ynGalfRuqDG5xGih
+H4iAdWwzMf9pmj/5YnWSqe28vEbeEyPeX/4e53os0oM9raJN
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.mcti.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.mcti.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.mcti.gov.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.mcti.gov.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Daniel Souza</md:SurName>
+ <md:EmailAddress>cgti@mcti.gov.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.pucgoias.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.pucgoias.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..e8f17882
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.pucgoias.edu.br-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.pucgoias.edu.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">PUCGOIAS - Pontificia Universidade Catolica de Goias</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">PUCGOIAS - Pontificia Universidade Catolica de Goias</mdui:DisplayName>
+ <mdui:Description xml:lang="en">PUCGOIAS - Pontificia Universidade Catolica de Goias</mdui:Description>
+ <mdui:Description xml:lang="pt-br">PUCGOIAS - Pontificia Universidade Catolica de Goias</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://sites.pucgoias.edu.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://sites.pucgoias.edu.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxPTA7BgNVBAoTNFBVQ0dPSUFT
+IC0gUG9udGlmaWNpYSBVbml2ZXJzaWRhZGUgQ2F0b2xpY2EgZGUgR29pYXMxDDAK
+BgNVBAsTA0NQRDEmMCQGCSqGSIb3DQEJARYXYWRyaWFub0BwdWNnb2lhcy5lZHUu
+YnIxEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNVBAgTBUdvaWFzMQswCQYDVQQGEwJC
+UjEiMCAGA1UEAxMZY2FmZWNhcGVzLnB1Y2dvaWFzLmVkdS5icjAeFw0xNTEwMDcx
+NDQ1NDNaFw0xODEwMDYxNDQ1NDNaMIHIMT0wOwYDVQQKEzRQVUNHT0lBUyAtIFBv
+bnRpZmljaWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRlIEdvaWFzMQwwCgYDVQQL
+EwNDUEQxJjAkBgkqhkiG9w0BCQEWF2Fkcmlhbm9AcHVjZ29pYXMuZWR1LmJyMRAw
+DgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lhczELMAkGA1UEBhMCQlIxIjAg
+BgNVBAMTGWNhZmVjYXBlcy5wdWNnb2lhcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDwPfgR6s32/B0GorTYORl59Lm6wl/OxPr77AZ7unP6
+jJGEhAUlbAeKRUnhNG2cItt8qVgp0AGGAQUFUVjQ75qxIsPlqrQTP/MJ9/bQKKIf
+5rA1jZeYOq2cG0ZTA+pwYQ5m9VrQH7VAWmtHWkI8SJf/JBKgvEABmzRLOD7GCBMx
+cVtI0yeMWfUV4i4v33lGSAVze5SYadcmdXLCZOsyWMFvEcxnyc+q7q/NKn8pP84a
+U0aRoARh6hb720js3bnjUiwLZzHVnQTa3bWyU1gYXQCqJGbZwkBbj1uxHsoZqw4f
+Xnhz/7C3aZhOwS/wjmKQs/mLV2kfg78gLFDp7BTWl9YXAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAFxoHHOQt/1KuE72rnfT5C2q7gmrB65vrMfiD7aanlDtwohUQBfW
+tCm1QTQalo8yj52lCrlti/8NIV1oz2Wm71feNmD3e/VTDFHGykx0ZrbJ0t3yJKCQ
+qr1y7aAa0UdJNgbzib0qd/jjYq5yJcTbro/mFoBj2LI/eeXn5iCXam9VUha4/JWk
+5Y/F3vlKFRyZII1SFjajppwpC+WG+XDvkwB0tzTleOE71wbYsgvPctTakZEJ7A8Z
+n6YTQExANeVgyXDmnXMOWKuqyWevEIWs4SSK6fNnRspHNEXdC1sLgDn4uVQa4W4L
+I1nX7QAxuJ9VL5U4ARrpmnxy7s4+VR2f/n0=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucgoias.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucgoias.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.pucgoias.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.pucgoias.edu.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.pucgoias.edu.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.pucgoias.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxPTA7BgNVBAoTNFBVQ0dPSUFT
+IC0gUG9udGlmaWNpYSBVbml2ZXJzaWRhZGUgQ2F0b2xpY2EgZGUgR29pYXMxDDAK
+BgNVBAsTA0NQRDEmMCQGCSqGSIb3DQEJARYXYWRyaWFub0BwdWNnb2lhcy5lZHUu
+YnIxEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNVBAgTBUdvaWFzMQswCQYDVQQGEwJC
+UjEiMCAGA1UEAxMZY2FmZWNhcGVzLnB1Y2dvaWFzLmVkdS5icjAeFw0xNTEwMDcx
+NDQ1NDNaFw0xODEwMDYxNDQ1NDNaMIHIMT0wOwYDVQQKEzRQVUNHT0lBUyAtIFBv
+bnRpZmljaWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRlIEdvaWFzMQwwCgYDVQQL
+EwNDUEQxJjAkBgkqhkiG9w0BCQEWF2Fkcmlhbm9AcHVjZ29pYXMuZWR1LmJyMRAw
+DgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lhczELMAkGA1UEBhMCQlIxIjAg
+BgNVBAMTGWNhZmVjYXBlcy5wdWNnb2lhcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDwPfgR6s32/B0GorTYORl59Lm6wl/OxPr77AZ7unP6
+jJGEhAUlbAeKRUnhNG2cItt8qVgp0AGGAQUFUVjQ75qxIsPlqrQTP/MJ9/bQKKIf
+5rA1jZeYOq2cG0ZTA+pwYQ5m9VrQH7VAWmtHWkI8SJf/JBKgvEABmzRLOD7GCBMx
+cVtI0yeMWfUV4i4v33lGSAVze5SYadcmdXLCZOsyWMFvEcxnyc+q7q/NKn8pP84a
+U0aRoARh6hb720js3bnjUiwLZzHVnQTa3bWyU1gYXQCqJGbZwkBbj1uxHsoZqw4f
+Xnhz/7C3aZhOwS/wjmKQs/mLV2kfg78gLFDp7BTWl9YXAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAFxoHHOQt/1KuE72rnfT5C2q7gmrB65vrMfiD7aanlDtwohUQBfW
+tCm1QTQalo8yj52lCrlti/8NIV1oz2Wm71feNmD3e/VTDFHGykx0ZrbJ0t3yJKCQ
+qr1y7aAa0UdJNgbzib0qd/jjYq5yJcTbro/mFoBj2LI/eeXn5iCXam9VUha4/JWk
+5Y/F3vlKFRyZII1SFjajppwpC+WG+XDvkwB0tzTleOE71wbYsgvPctTakZEJ7A8Z
+n6YTQExANeVgyXDmnXMOWKuqyWevEIWs4SSK6fNnRspHNEXdC1sLgDn4uVQa4W4L
+I1nX7QAxuJ9VL5U4ARrpmnxy7s4+VR2f/n0=
+
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucgoias.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucgoias.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">PUCGOIAS - Pontificia Universidade Catolica de Goias</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">PUCGOIAS - Pontificia Universidade Catolica de Goias</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">PUCGOIAS - Pontificia Universidade Catolica de Goias</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">PUCGOIAS - Pontificia Universidade Catolica de Goias</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://sites.pucgoias.edu.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://sites.pucgoias.edu.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Adriano Fernandes</md:SurName>
+ <md:EmailAddress>adriano@pucgoias.edu.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml
index 3334d12e..0c7defd4 100644
--- a/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml
@@ -23,25 +23,27 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- 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
+ 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
+If0w9eTfY0ltoPGddjbkgTmrReY9T8zNdQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -64,25 +66,27 @@ yM/4Rp+8JZktR/Az29BLMxaebhQH6kofiy2CD4hFt7+GwwwH
<ds:X509Data>
<ds:X509Certificate>
-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
+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
+If0w9eTfY0ltoPGddjbkgTmrReY9T8zNdQ==
</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-interfederations-2.0/cafe.usf.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.usf.edu.br-idp-shibboleth.xml
index 397dc69d..237f4029 100644
--- a/swamid-interfederations-2.0/cafe.usf.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/cafe.usf.edu.br-idp-shibboleth.xml
@@ -11,10 +11,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">USF - UNIVERSIDADE SAO FRANCISCO</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">USF - UNIVERSIDADE SAO FRANCISCO</mdui:DisplayName>
- <mdui:Description xml:lang="en">USF - UNIVERSIDADE SAO FRANCISCO</mdui:Description>
- <mdui:Description xml:lang="pt-br">USF - UNIVERSIDADE SAO FRANCISCO</mdui:Description>
+ <mdui:DisplayName xml:lang="en">USF - Universidade Sao Francisco</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">USF - Universidade Sao Francisco</mdui:DisplayName>
+ <mdui:Description xml:lang="en">USF - Universidade Sao Francisco</mdui:Description>
+ <mdui:Description xml:lang="pt-br">USF - Universidade Sao Francisco</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.usf.edu.br/</mdui:InformationURL>
<mdui:InformationURL xml:lang="pt-br">http://www.usf.edu.br/</mdui:InformationURL>
</mdui:UIInfo>
@@ -23,27 +23,28 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJDAiBgNVBAoUG1VuaXZlcnNp
-ZGFkZSBTw6NvIEZyYW5jaXNjbzEMMAoGA1UECxMDQ1BEMSIwIAYJKoZIhvcNAQkB
-FhN0aS5yZWRlc0B1c2YuZWR1LmJyMRIwEAYDVQQHEwlTYW8gUGF1bG8xEjAQBgNV
-BAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxHjAcBgNVBAMTFXNoaWJib2xldGgu
-dXNmLmVkdS5icjAeFw0xNTA1MjIxNzA1MzJaFw0xODA1MjExNzA1MzJaMIGtMSQw
-IgYDVQQKFBtVbml2ZXJzaWRhZGUgU8OjbyBGcmFuY2lzY28xDDAKBgNVBAsTA0NQ
-RDEiMCAGCSqGSIb3DQEJARYTdGkucmVkZXNAdXNmLmVkdS5icjESMBAGA1UEBxMJ
-U2FvIFBhdWxvMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJSMR4wHAYD
-VQQDExVzaGliYm9sZXRoLnVzZi5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC869OrghlsB5YMNE76g0zDRXFhVZnqBXKEo3J2biMthwV1BVSR
-tL8Sm9eNPYj0zqHDu1rP/zP+QMV16KFMhFE9kEmGnOWwZBEqjbqLex11rWzM5roq
-yiuxkbplP70MxxIdehR136uLzv2g8gg3KwX3aWjtwGwxEtQ6ouiDFFQSOqfBZZU1
-zr1V8yI1NCzFH4QlD42wCaXmhZN4WwocfsBI+CXFS9vyA3mjVb1eRkJtWMQRLuWv
-/O0O+6rRY9YuPQkcKhdcNbs5iVC3Kz+z5nSDRGKE8+0+HD+JirWDBak0etMElgdJ
-6llpV47YGfrzUrDAZx53uKBI3zZcEXauJ6wzAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAHhExG6XwnKwgd9xyV88eCnec99iKfzWQOE9+vAj/14TAlc88ejR4xymGs6z
-q6irhLoSNcl12wdqkmfMYO+YQDIHy6KtJ7NAtdlBoLjjal2COBX7wCopdV1R8kbI
-JHBQMP6zh4i939yJjcz5Yt38OebvGlkYb78lkbE9wL9ZYkMdb8+K8+EK83xPzNoj
-TziOWlMp2Dq1ehnnPlMQ7TyOYpgyC2ApCgf8+EQIEdiTmlc41DuSgA2dxGkBXjUq
-Dw2IGSPRm85XDKAirTE5I7qut5fv8QDwHN+ZV+M9kUkcsiJv6GY2a+n4Hha/MNKC
-IIJV9ksOPNjX5DKvTFFtFv5xL50=
+ MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxKjAoBgNVBAoUIVVTRiAtIFVu
+aXZlcnNpZGFkZSBTw6NvIEZyYW5jaXNjbzELMAkGA1UECxMCVEkxKDAmBgkqhkiG
+9w0BCQEWGWpvc2UuZ29uY2FsdmVzQHVzZi5lZHUuYnIxGzAZBgNVBAcUEkJyYWdh
+bsOnYSBQYXVsaXN0YTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMCQlIx
+GDAWBgNVBAMTD2NhZmUudXNmLmVkdS5icjAeFw0xNTA5MzAxNzIyMjRaFw0xODA5
+MjkxNzIyMjRaMIG8MSowKAYDVQQKFCFVU0YgLSBVbml2ZXJzaWRhZGUgU8OjbyBG
+cmFuY2lzY28xCzAJBgNVBAsTAlRJMSgwJgYJKoZIhvcNAQkBFhlqb3NlLmdvbmNh
+bHZlc0B1c2YuZWR1LmJyMRswGQYDVQQHFBJCcmFnYW7Dp2EgUGF1bGlzdGExEzAR
+BgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVz
+Zi5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD2ylg01o7h
+2ql3tCcMIym2xD373BCc9k1ndxmwJ3IE3cuEIQR8tOO5zrVt42yslb0Cm6DpXNHK
+cYxms2OI9DYS1SkGeJyXDMe7tPy4IE4b3RYprbRwTOaQLlePt5MgIhiAek8oPzuh
+C3LxgPqdtzd7aBxq8fu++fYdrTESBa8bCmcqdnU9jmob5jDnxDcDkQ1ertxhlOtn
+sD7iEeoZGWGaIqYlH11+b+UlyYKSqNtKVnqcDWMaRuxYwbe4xUmx2E8LJt+jHQn5
+XyFDkDcwfxetj0FIlhe9umg9vk1L+hCiynyFSXFBgXqUvz0rIIui6yYmAOWrboCY
+YM97hwpC4v2TAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGnkYSv7gZYAbJ2cUUFM
+0Nbd6h77Riukwdw3tL8goc30ats4zwnh8EbDXtAWAQ8dFy8fcGdmLOi7Vq1CmNP2
+zWYqpxIQbPTxJ4PznnzrlxOyfwHROAe52Go0ceFtMd51GUueFV2jioLjn5TaJgey
+AgVlrHPQaJCNPEYFf8tNjgurj6NRtabPpMW8ogr/pX5AJv3xE9OuwCPJ34HO+o7O
+n4OS2VjKptCeJrfZN/7Km5tHaS/xjH5WJkKsZlubo2PrxlgSy1gt11wAhucqWB7v
+Hd/uhgyrVLEXYsMoXfEW2SZCuF4wHOX5RQds9Kmh/F8N9iVjElM3co5gHufh5cxx
+8IY=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -66,28 +67,29 @@ IIJV9ksOPNjX5DKvTFFtFv5xL50=
<ds:X509Data>
<ds:X509Certificate>
-MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJDAiBgNVBAoUG1VuaXZlcnNp
-ZGFkZSBTw6NvIEZyYW5jaXNjbzEMMAoGA1UECxMDQ1BEMSIwIAYJKoZIhvcNAQkB
-FhN0aS5yZWRlc0B1c2YuZWR1LmJyMRIwEAYDVQQHEwlTYW8gUGF1bG8xEjAQBgNV
-BAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxHjAcBgNVBAMTFXNoaWJib2xldGgu
-dXNmLmVkdS5icjAeFw0xNTA1MjIxNzA1MzJaFw0xODA1MjExNzA1MzJaMIGtMSQw
-IgYDVQQKFBtVbml2ZXJzaWRhZGUgU8OjbyBGcmFuY2lzY28xDDAKBgNVBAsTA0NQ
-RDEiMCAGCSqGSIb3DQEJARYTdGkucmVkZXNAdXNmLmVkdS5icjESMBAGA1UEBxMJ
-U2FvIFBhdWxvMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJSMR4wHAYD
-VQQDExVzaGliYm9sZXRoLnVzZi5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC869OrghlsB5YMNE76g0zDRXFhVZnqBXKEo3J2biMthwV1BVSR
-tL8Sm9eNPYj0zqHDu1rP/zP+QMV16KFMhFE9kEmGnOWwZBEqjbqLex11rWzM5roq
-yiuxkbplP70MxxIdehR136uLzv2g8gg3KwX3aWjtwGwxEtQ6ouiDFFQSOqfBZZU1
-zr1V8yI1NCzFH4QlD42wCaXmhZN4WwocfsBI+CXFS9vyA3mjVb1eRkJtWMQRLuWv
-/O0O+6rRY9YuPQkcKhdcNbs5iVC3Kz+z5nSDRGKE8+0+HD+JirWDBak0etMElgdJ
-6llpV47YGfrzUrDAZx53uKBI3zZcEXauJ6wzAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAHhExG6XwnKwgd9xyV88eCnec99iKfzWQOE9+vAj/14TAlc88ejR4xymGs6z
-q6irhLoSNcl12wdqkmfMYO+YQDIHy6KtJ7NAtdlBoLjjal2COBX7wCopdV1R8kbI
-JHBQMP6zh4i939yJjcz5Yt38OebvGlkYb78lkbE9wL9ZYkMdb8+K8+EK83xPzNoj
-TziOWlMp2Dq1ehnnPlMQ7TyOYpgyC2ApCgf8+EQIEdiTmlc41DuSgA2dxGkBXjUq
-Dw2IGSPRm85XDKAirTE5I7qut5fv8QDwHN+ZV+M9kUkcsiJv6GY2a+n4Hha/MNKC
-IIJV9ksOPNjX5DKvTFFtFv5xL50=
-
+MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxKjAoBgNVBAoUIVVTRiAtIFVu
+aXZlcnNpZGFkZSBTw6NvIEZyYW5jaXNjbzELMAkGA1UECxMCVEkxKDAmBgkqhkiG
+9w0BCQEWGWpvc2UuZ29uY2FsdmVzQHVzZi5lZHUuYnIxGzAZBgNVBAcUEkJyYWdh
+bsOnYSBQYXVsaXN0YTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMCQlIx
+GDAWBgNVBAMTD2NhZmUudXNmLmVkdS5icjAeFw0xNTA5MzAxNzIyMjRaFw0xODA5
+MjkxNzIyMjRaMIG8MSowKAYDVQQKFCFVU0YgLSBVbml2ZXJzaWRhZGUgU8OjbyBG
+cmFuY2lzY28xCzAJBgNVBAsTAlRJMSgwJgYJKoZIhvcNAQkBFhlqb3NlLmdvbmNh
+bHZlc0B1c2YuZWR1LmJyMRswGQYDVQQHFBJCcmFnYW7Dp2EgUGF1bGlzdGExEzAR
+BgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVz
+Zi5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD2ylg01o7h
+2ql3tCcMIym2xD373BCc9k1ndxmwJ3IE3cuEIQR8tOO5zrVt42yslb0Cm6DpXNHK
+cYxms2OI9DYS1SkGeJyXDMe7tPy4IE4b3RYprbRwTOaQLlePt5MgIhiAek8oPzuh
+C3LxgPqdtzd7aBxq8fu++fYdrTESBa8bCmcqdnU9jmob5jDnxDcDkQ1ertxhlOtn
+sD7iEeoZGWGaIqYlH11+b+UlyYKSqNtKVnqcDWMaRuxYwbe4xUmx2E8LJt+jHQn5
+XyFDkDcwfxetj0FIlhe9umg9vk1L+hCiynyFSXFBgXqUvz0rIIui6yYmAOWrboCY
+YM97hwpC4v2TAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGnkYSv7gZYAbJ2cUUFM
+0Nbd6h77Riukwdw3tL8goc30ats4zwnh8EbDXtAWAQ8dFy8fcGdmLOi7Vq1CmNP2
+zWYqpxIQbPTxJ4PznnzrlxOyfwHROAe52Go0ceFtMd51GUueFV2jioLjn5TaJgey
+AgVlrHPQaJCNPEYFf8tNjgurj6NRtabPpMW8ogr/pX5AJv3xE9OuwCPJ34HO+o7O
+n4OS2VjKptCeJrfZN/7Km5tHaS/xjH5WJkKsZlubo2PrxlgSy1gt11wAhucqWB7v
+Hd/uhgyrVLEXYsMoXfEW2SZCuF4wHOX5RQds9Kmh/F8N9iVjElM3co5gHufh5cxx
+8IY=
+
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -98,15 +100,15 @@ IIJV9ksOPNjX5DKvTFFtFv5xL50=
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">USF - UNIVERSIDADE SAO FRANCISCO</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">USF - UNIVERSIDADE SAO FRANCISCO</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">USF - UNIVERSIDADE SAO FRANCISCO</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">USF - UNIVERSIDADE SAO FRANCISCO</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">USF - Universidade Sao Francisco</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">USF - Universidade Sao Francisco</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">USF - Universidade Sao Francisco</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">USF - Universidade Sao Francisco</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.usf.edu.br/</md:OrganizationURL>
<md:OrganizationURL xml:lang="pt-br">http://www.usf.edu.br/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Tecnologia da Informacao</md:SurName>
- <md:EmailAddress>ti.redes@usf.edu.br</md:EmailAddress>
+ <md:SurName>Eduardo Souza</md:SurName>
+ <md:EmailAddress>jose.goncalves@usf.edu.br</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml
index 299b8be8..d1b9ee1f 100644
--- a/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml
@@ -11,10 +11,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicamp.br</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:DisplayName>
- <mdui:Description xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:Description>
- <mdui:Description xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:Description>
+ <mdui:DisplayName xml:lang="en">UNICAMP - Universidade Estadual de Campinas</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UNICAMP - Universidade Estadual de Campinas</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UNICAMP - Universidade Estadual de Campinas</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UNICAMP - Universidade Estadual de Campinas</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.unicamp.br/</mdui:InformationURL>
<mdui:InformationURL xml:lang="pt-br">http://www.unicamp.br/</mdui:InformationURL>
</mdui:UIInfo>
@@ -100,10 +100,10 @@ FB2LP25VwJA=
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">UNICAMP - Universidade Estadual de Campinas</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">UNICAMP - Universidade Estadual de Campinas</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">UNICAMP - Universidade Estadual de Campinas</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">UNICAMP - Universidade Estadual de Campinas</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.unicamp.br/</md:OrganizationURL>
<md:OrganizationURL xml:lang="pt-br">http://www.unicamp.br/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
index 719e3c85..20256ac4 100644
--- a/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
@@ -10,7 +10,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-lyon.fr</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">CROUS de Lyon-Personnel</mdui:DisplayName>
- <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABrElEQVQoz32SzUtUYRTGn/N+3Ll35jYjY9AsmqRVCEbUgJDVIooIQRctIvpX+n9aFQhBWNJKqUjSVTnVIrRNatxyLun9eN9zWphZeqezPJzfOc95zqF7D1ZRGSJacrArJIAJNP1OGwwJz3Ja1s/ZT999vFL2xDaJ5L+A54ng3UzrUcmBJO6Nu26tBqCGARb5mN1o641TQX8qehvyQIChgAhG1beu/SI+ANfaetCiHZHhO7DwhH3fMV8JIQAhEAoWKKqaIIK6JFejV5HaA9cg5ED+oHUF4L3vqdVx81F5QHlAdnwzlZF9Z48CjtGRz9P1FwZ7gAIVAz65kl3K9AgdB1igih+zjWdna/39aki4uHt52U8aoyokcZnPxvPX6i+VaJEGtF3Lzz/5Oe1M8+DQf7nkXXkrfHr3xJwCbxVdS7Kdtx6mM4np/vmLQ0B8cSNYuN+cSznqZ+O5bxSil/LeB7qo1T8qDAD2blK/vhM/Xy/G5tMrm9wOlduUMwl1tNZHXDGefczbbZM8Tm8vZxe2ZDQyIGUIRpMcN934MtuVYKG46XRdBSo+lFtRDeAXugW7/bbDFGQAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDC1da7rAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMwKzAyOjAwxCgWVwAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAACMuAAAjLgAAAAAAAAAAAAAAAAAAAAAAABMG4wATBuMHEwbjShMG46oTBuPmEwbj/BMG4/0TBuPmEwbjqxMG40sTBuMHEwbjAAAAAAAAAAAAEwbjABMG4wATBuMZEwbjlBMG4+8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuPwEwbjlRMG4xkTBuMAEwbjABMG4wATBuMZEwbjshMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuOzEwbjGhMG4wATBuMGEwbjkxMG4/8TBuP/Ewbj/xMG4/8TBuP/EgXj/xEE4/8SBeP/EgXj/xMG4/8TBuP/Ewbj/xMG45QTBuMGEwbjShMG4+4TBuP/Ewbj/xMG4/8TBuP/Ewbj/xwP5P81Kuf/KB3m/x4S5P8TBuP/Ewbj/xMG4/8TBuPuEwbjTBMG46gTBuP/Ewbj/xMG4/8TBuP/Ewbj/xIF4/8xJuf/WlLs/1xU7P9DOen/EQTj/xIF4/8QA+P/EQTj/xAD46oTBuPkEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/OC7n/zsw6P8rIOb/Ihbl/z406P8lGeX/PTPo/ywg5v9COOnlEwbj+xMG4/8TBuP/Ewbj/xMG4/8RBOP/LiLm/3Rt7/9RSOr/bmfu/2Rc7f+OifL/fHXv/4uG8f55cu//nJfz+xMG4/sTBuP/Ewbj/xMG4/8TBuP/EgTj/ywg5v91bu//VUzr/0k/6f9PRur/ZFvt/0pA6v9GPOn+TEPq/2tk7vwTBuPkEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/MSXn/zUq5/8TBuP/EgXj/xIF4/8RBOP/EgXj/xEE4/8SBePlEwbjqBMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xEE4/8RBOP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/EwbjqRMG40oTBuPtEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj7hMG40sTBuMGEwbjkhMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG45QTBuMGEwbjABMG4xgTBuOxEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG47ITBuMZEwbjABMG4wATBuMAEwbjGBMG45ITBuPvEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj7xMG45MTBuMZEwbjABMG4wAAAAAAAAAAABMG4wATBuMHEwbjSRMG46gTBuPkEwbj/BMG4/wTBuPlEwbjqRMG40oTBuMHEwbjAAAAAAAAAAAA4AcAAMADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAA==</mdui:Logo>
<mdui:InformationURL xml:lang="fr">http://www.crous-lyon.fr</mdui:InformationURL>
<mdui:Description xml:lang="en">personnel</mdui:Description>
<mdui:DisplayName xml:lang="fr">CROUS de Lyon-Personnel</mdui:DisplayName>
@@ -21,30 +21,25 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEazCCA1OgAwIBAgIQD/r9mkyd7FHhm+Vn+HXu9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQyMzAwMDAwMFoXDTE2MDUxNDIzNTk1OVowPTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDFA8qLmNyb3VzLWx5
-b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUOIWis87bcAu0
-3sB8o4vXr6O54YuPdJM1wwn5uwyLl1BEXx4CytKCUAiNz4uNmVihqfxJo7inPsd/
-uysY1gqBoc7XDn8F3pbQUAOBGjyiGxNjgoo0a6d+8x48sOdC4kRgij+amXI0Y43J
-97x4UAVxjseFA/8vKnMt+sCVdHwrE5nHZuO4x4FkL3Y7Asg7ErEuXkyyUcGtpwk4
-t2mUw5GtZiUCT7V/Y5tmQAc9VeenXQWDouGLuJAoqa+3lPSOs6hNE/bFoxnKMNfI
-oThE10jbIyVJt3SxYMYvlYwFLAICjdgVoJo/8dsqSYsSz7rIzBoKnoRcdcQi4Q3h
-nhlCyMdfAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUtZ9U7PnM4ivE9Akwvduvc11ew0owDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCDyouY3JvdXMtbHlvbi5mcjANBgkq
-hkiG9w0BAQUFAAOCAQEAXsM+FOuM52ITtsVPjcayktwJxdMf+rF10sniHA9/q/7Q
-UXroyYOBXnDheMdvYu+CLjQDWRAaMek6oS1vQNJ4fNiRdlmvMFz1EGqPp2wTIUn7
-xx+NsR8asSFGRzdzmgzjQq/KyQRjXndfJLh+Lcw4WVRCSdQx12zo2XGoRWjKPMBx
-Olm9t5o1HQY/jMoFY86UBrph2N/3JZfSsOM/ZMWv+fvTy9ctSWvurG5GPlqL6s9Y
-wnk2bbaPLI1Ph9DUkTrS0hRDCo6BkiEzzEkHAXWHIeKaibJgcqMLQWk6eU468EbX
-h7cEmTn+zP3Mcv2/sPPJum0wXY7GawIUe3rgFBenoA==
+ MIIDjDCCAnQCCQCGEZBF73r8IDANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+RlIxFDASBgNVBAgMC1JIT05FLUFMUEVTMQ0wCwYDVQQHDARMWU9OMRMwEQYDVQQK
+DApDUk9VUyBMWU9OMRowGAYDVQQDDBFjYXMuY3JvdXMtbHlvbi5mcjEiMCAGCSqG
+SIb3DQEJARYTc2luZm9AY3JvdXMtbHlvbi5mcjAeFw0xNTEwMjgxNTQ1MzZaFw0y
+NTEwMjUxNTQ1MzZaMIGHMQswCQYDVQQGEwJGUjEUMBIGA1UECAwLUkhPTkUtQUxQ
+RVMxDTALBgNVBAcMBExZT04xEzARBgNVBAoMCkNST1VTIExZT04xGjAYBgNVBAMM
+EWNhcy5jcm91cy1seW9uLmZyMSIwIAYJKoZIhvcNAQkBFhNzaW5mb0Bjcm91cy1s
+eW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqvcFcCtV1M60
+Y7y/q2KPw/SxJ88NV76E0uQTJ68wwTLqgu09yqM1+LTUI6DoY8MfZQTLE/LS+amX
+AbrDNNAb2wsvFs5LnsJToy0oFOHqkxRDWuOn0bCAWW/Ug48LNriODP+bwzGZGjhG
+TWUXFPnIcFcaVXvaLfWbwnTodRoC2agtRBKBJVpk4k7yQxtCWVtgU0MLW6nTtIoW
+KagyVFcaSqgGK3rz7oWfENM574x8RFyGS5klrPoc7S6mph84XSzcRnnB2wHm0v7W
+var85+Erha9wL9V+ThcH+bskJzDQHBVK86lPeDKM+cmVMK6DcqgWnqCByO6H4DP8
+uRDugNJMAQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCmriKSevyXfwn101JFqbTj
+xxBjqstWPpNs0h9sX3Gu9E1TC8I7lEscvP3EOxwGTrS28kM0gSjYUUYiB5tN91Yh
+A9kaXAiftgZ2V0M37LWutNm0Ail/BP0qfJrHBv5Q4RixVG5f7+48RbK3wexlw0/b
+rmaYO6QZ8rEHempWBfGnwY8dBT6FlGAAXxfx5U98ol/sP/wSgKUi0+o88Syhe+4o
+aXHTe0kbLH8HKskUOpzXXuEDr9U/J1UUqX7BuHaJFrJvPxl9+Ln8f+snfqfD1lan
+uRFWPZDMY1xgKw50XyW/PKjnsWjCitM05Mem2pjkZj0nurjPOrIwlJetip5QFwfg
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -63,30 +58,25 @@ h7cEmTn+zP3Mcv2/sPPJum0wXY7GawIUe3rgFBenoA==
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEazCCA1OgAwIBAgIQD/r9mkyd7FHhm+Vn+HXu9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQyMzAwMDAwMFoXDTE2MDUxNDIzNTk1OVowPTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDFA8qLmNyb3VzLWx5
-b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUOIWis87bcAu0
-3sB8o4vXr6O54YuPdJM1wwn5uwyLl1BEXx4CytKCUAiNz4uNmVihqfxJo7inPsd/
-uysY1gqBoc7XDn8F3pbQUAOBGjyiGxNjgoo0a6d+8x48sOdC4kRgij+amXI0Y43J
-97x4UAVxjseFA/8vKnMt+sCVdHwrE5nHZuO4x4FkL3Y7Asg7ErEuXkyyUcGtpwk4
-t2mUw5GtZiUCT7V/Y5tmQAc9VeenXQWDouGLuJAoqa+3lPSOs6hNE/bFoxnKMNfI
-oThE10jbIyVJt3SxYMYvlYwFLAICjdgVoJo/8dsqSYsSz7rIzBoKnoRcdcQi4Q3h
-nhlCyMdfAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUtZ9U7PnM4ivE9Akwvduvc11ew0owDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCDyouY3JvdXMtbHlvbi5mcjANBgkq
-hkiG9w0BAQUFAAOCAQEAXsM+FOuM52ITtsVPjcayktwJxdMf+rF10sniHA9/q/7Q
-UXroyYOBXnDheMdvYu+CLjQDWRAaMek6oS1vQNJ4fNiRdlmvMFz1EGqPp2wTIUn7
-xx+NsR8asSFGRzdzmgzjQq/KyQRjXndfJLh+Lcw4WVRCSdQx12zo2XGoRWjKPMBx
-Olm9t5o1HQY/jMoFY86UBrph2N/3JZfSsOM/ZMWv+fvTy9ctSWvurG5GPlqL6s9Y
-wnk2bbaPLI1Ph9DUkTrS0hRDCo6BkiEzzEkHAXWHIeKaibJgcqMLQWk6eU468EbX
-h7cEmTn+zP3Mcv2/sPPJum0wXY7GawIUe3rgFBenoA==
+ MIIDjDCCAnQCCQCGEZBF73r8IDANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+RlIxFDASBgNVBAgMC1JIT05FLUFMUEVTMQ0wCwYDVQQHDARMWU9OMRMwEQYDVQQK
+DApDUk9VUyBMWU9OMRowGAYDVQQDDBFjYXMuY3JvdXMtbHlvbi5mcjEiMCAGCSqG
+SIb3DQEJARYTc2luZm9AY3JvdXMtbHlvbi5mcjAeFw0xNTEwMjgxNTQ1MzZaFw0y
+NTEwMjUxNTQ1MzZaMIGHMQswCQYDVQQGEwJGUjEUMBIGA1UECAwLUkhPTkUtQUxQ
+RVMxDTALBgNVBAcMBExZT04xEzARBgNVBAoMCkNST1VTIExZT04xGjAYBgNVBAMM
+EWNhcy5jcm91cy1seW9uLmZyMSIwIAYJKoZIhvcNAQkBFhNzaW5mb0Bjcm91cy1s
+eW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqvcFcCtV1M60
+Y7y/q2KPw/SxJ88NV76E0uQTJ68wwTLqgu09yqM1+LTUI6DoY8MfZQTLE/LS+amX
+AbrDNNAb2wsvFs5LnsJToy0oFOHqkxRDWuOn0bCAWW/Ug48LNriODP+bwzGZGjhG
+TWUXFPnIcFcaVXvaLfWbwnTodRoC2agtRBKBJVpk4k7yQxtCWVtgU0MLW6nTtIoW
+KagyVFcaSqgGK3rz7oWfENM574x8RFyGS5klrPoc7S6mph84XSzcRnnB2wHm0v7W
+var85+Erha9wL9V+ThcH+bskJzDQHBVK86lPeDKM+cmVMK6DcqgWnqCByO6H4DP8
+uRDugNJMAQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCmriKSevyXfwn101JFqbTj
+xxBjqstWPpNs0h9sX3Gu9E1TC8I7lEscvP3EOxwGTrS28kM0gSjYUUYiB5tN91Yh
+A9kaXAiftgZ2V0M37LWutNm0Ail/BP0qfJrHBv5Q4RixVG5f7+48RbK3wexlw0/b
+rmaYO6QZ8rEHempWBfGnwY8dBT6FlGAAXxfx5U98ol/sP/wSgKUi0+o88Syhe+4o
+aXHTe0kbLH8HKskUOpzXXuEDr9U/J1UUqX7BuHaJFrJvPxl9+Ln8f+snfqfD1lan
+uRFWPZDMY1xgKw50XyW/PKjnsWjCitM05Mem2pjkZj0nurjPOrIwlJetip5QFwfg
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/ccm.copac.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ccm.copac.jisc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ad778417
--- /dev/null
+++ b/swamid-interfederations-2.0/ccm.copac.jisc.ac.uk-shibboleth.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ccm.copac.jisc.ac.uk/shibboleth">
+ <!--
+ This is a "Copac Collection Management" Shibboleth SP for Jisc.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-30T15:08:18Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID/zCCAuegAwIBAgIJAIacduR/myAPMA0GCSqGSIb3DQEBBQUAMHUxCzAJBgNV
+ BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
+ MQ0wCwYDVQQKEwRKaXNjMQ4wDAYDVQQLEwVNaW1hczEdMBsGA1UEAxMUY2NtLmNv
+ cGFjLmppc2MuYWMudWswHhcNMTUxMDA2MDkyODE3WhcNMjUxMDAzMDkyODE3WjB1
+ MQswCQYDVQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFu
+ Y2hlc3RlcjENMAsGA1UEChMESmlzYzEOMAwGA1UECxMFTWltYXMxHTAbBgNVBAMT
+ FGNjbS5jb3BhYy5qaXNjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEApIKiUbQ1UcbvNo+b6XCsSe9s3WiZ9heGvdvFrQHn0U/YsR1k1oMd+2tX
+ N9vEse6KYOs6M9ecw/U6e98xkWaFQnhLogxlwmsQNllnN1h3SM9Tk7KBQzUdeqQ2
+ iGSeX1gjd11HSaevSLzt9NstipOvWh9Ur/bPbLtjQJVLbwhCgCSqjBHY9oPgfich
+ bvfOp9Ahp0ckszpQC8osM5Q+gdsyxtlGmYsqm9eHiKXCWo3/2BnDmqxfWrVBLcyf
+ 8EEC4qN+FSQJl/qo1EHYGsvpxbXdvo7w7AZNV0AacmRT3Hs5Oosgpdj3SDSxBi7Q
+ 9vXc8u5pMUuCoFaFq+pV5aJrkZ515wIDAQABo4GRMIGOMAkGA1UdEwQCMAAwCwYD
+ VR0PBAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHREE
+ GDAWghRjY20uY29wYWMuamlzYy5hYy51azA0BgNVHRIELTArgSltaW1hcy1zaGli
+ LXRlY2hAbGlzdHNlcnYubWFuY2hlc3Rlci5hYy51azANBgkqhkiG9w0BAQUFAAOC
+ AQEAdiuss1LqfQjW3b+p1udno7kpGrNMy7njdR6+kzAZhLMZosnXzC40myLD8QIO
+ toESjy3njFKjn39koYfWKPOcUPlHhOMDXZ/l1uyeyjYpNjGNyYSE/noHEh+Dq8La
+ Ev1APgkhr2szIY0n0j9TdaFZAOIsaOsZvWsnK3n3zr7LbduLPUR46Kq6kC3c7nQX
+ n1Ig511IcUV8B/hysTz2xC1SQOYIz+jexv3/2jy/MaPdgenuoB86eFZzquKe5kJx
+ ofe54k1GZFVi8fyZYgs7M4qoMOhaUtjnTQoSnonVnL7rRNERcIB40oCdaoSEENoF
+ 6hbD0ku+eQC/qqz1h3WEtOymjg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Jisc</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Copac Collection Management</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://jisc.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Copac Helpdesk</GivenName>
+ <EmailAddress>mailto:help.copac@jisc.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Mimas Technical Support</GivenName>
+ <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cgticafe.fiocruz.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cgticafe.fiocruz.br-idp-shibboleth.xml
new file mode 100644
index 00000000..12c54ead
--- /dev/null
+++ b/swamid-interfederations-2.0/cgticafe.fiocruz.br-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cgticafe.fiocruz.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fiocruz.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">FIOCRUZ - FUNDACAO OSWALDO CRUZ</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">FIOCRUZ - FUNDACAO OSWALDO CRUZ</mdui:DisplayName>
+ <mdui:Description xml:lang="en">FIOCRUZ - FUNDACAO OSWALDO CRUZ</mdui:Description>
+ <mdui:Description xml:lang="pt-br">FIOCRUZ - FUNDACAO OSWALDO CRUZ</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://portal.fiocruz.br/pt-br</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://portal.fiocruz.br/pt-br</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID7DCCAtQCAQAwDQYJKoZIhvcNAQEFBQAwgbsxKDAmBgNVBAoTH0ZJT0NSVVog
+LSBGVU5EQUNBTyBPU1dBTERPIENSVVoxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG
+9w0BCQEWFGluZnJhY2d0aUBmaW9jcnV6LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFu
+ZWlybzEXMBUGA1UECBMOUmlvIGRlIGphbmVpcm8xCzAJBgNVBAYTAkJSMRwwGgYD
+VQQDExNjZ3RpY2FmZS5maW9jcnV6LmJyMB4XDTE1MDkyMTE2NTYwNloXDTE4MDky
+MDE2NTYwNlowgbsxKDAmBgNVBAoTH0ZJT0NSVVogLSBGVU5EQUNBTyBPU1dBTERP
+IENSVVoxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG9w0BCQEWFGluZnJhY2d0aUBm
+aW9jcnV6LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlv
+IGRlIGphbmVpcm8xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNjZ3RpY2FmZS5maW9j
+cnV6LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyWG4cgj+Osnf
+kt3wuPV8OPuOK3ImAzHCL9yXvspZxASSmIZ+F6TOQ7r7YfDEHhEx9YgLGoSc5pQ8
+85hDKOSdwcej/1B9NDyBIl++bT0yD6p6JOVtC8z/D8/JqdH+uWgbyRpofRMhPsBM
+7AfBRZ6ar9M5qxJUx5NQU7j0qkKmBiI442qxhuIXscnU6zdokCLkbioUny7d0J/m
+9YmWvv0DGgLIUltMveJyqIuJtYIw6FFRbxwjqp0biDe0FxvCgq7h2PsZ7+r6N43A
+eoNPJnByFGv45iu727WS3oKLTsCvTamyBKuX+1b2vH9nDqqRbM1SmKwoEi6vUaFt
+NpuWv33tPQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAQ0jXA8TKDFUzsDX63gqbB
+T+noOyQ5rdk1ao95pWBdquaTfmq0kybYW155UA1CGzxXNf6hWu3PBQZKiy/2rkty
+e5ml0b0s1/V57JtvtB/E6NuqoitAXq8O1okiy7RS93Fo3dz8sDSoAOK2/slGJwBO
+PrqsMoYTjfhSVUa2wiXre89eMsIy0UV1ifEtEOLU5dPI3cgabJsQC+PAZS7J60mb
+GjIjFTwcQ4eHU3fB2d3tswTCZpcOxdEvrXCvXmca//R5ilUoHq45Ne3yShxE8ivm
+m6PLcFE3BHA2WBnbwZt8ylTcHvJxL0Fafywu71AusQcAJz1p7NScH6wuCxqdiuN+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cgticafe.fiocruz.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cgticafe.fiocruz.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cgticafe.fiocruz.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cgticafe.fiocruz.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cgticafe.fiocruz.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cgticafe.fiocruz.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fiocruz.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIID7DCCAtQCAQAwDQYJKoZIhvcNAQEFBQAwgbsxKDAmBgNVBAoTH0ZJT0NSVVog
+LSBGVU5EQUNBTyBPU1dBTERPIENSVVoxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG
+9w0BCQEWFGluZnJhY2d0aUBmaW9jcnV6LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFu
+ZWlybzEXMBUGA1UECBMOUmlvIGRlIGphbmVpcm8xCzAJBgNVBAYTAkJSMRwwGgYD
+VQQDExNjZ3RpY2FmZS5maW9jcnV6LmJyMB4XDTE1MDkyMTE2NTYwNloXDTE4MDky
+MDE2NTYwNlowgbsxKDAmBgNVBAoTH0ZJT0NSVVogLSBGVU5EQUNBTyBPU1dBTERP
+IENSVVoxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG9w0BCQEWFGluZnJhY2d0aUBm
+aW9jcnV6LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlv
+IGRlIGphbmVpcm8xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNjZ3RpY2FmZS5maW9j
+cnV6LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyWG4cgj+Osnf
+kt3wuPV8OPuOK3ImAzHCL9yXvspZxASSmIZ+F6TOQ7r7YfDEHhEx9YgLGoSc5pQ8
+85hDKOSdwcej/1B9NDyBIl++bT0yD6p6JOVtC8z/D8/JqdH+uWgbyRpofRMhPsBM
+7AfBRZ6ar9M5qxJUx5NQU7j0qkKmBiI442qxhuIXscnU6zdokCLkbioUny7d0J/m
+9YmWvv0DGgLIUltMveJyqIuJtYIw6FFRbxwjqp0biDe0FxvCgq7h2PsZ7+r6N43A
+eoNPJnByFGv45iu727WS3oKLTsCvTamyBKuX+1b2vH9nDqqRbM1SmKwoEi6vUaFt
+NpuWv33tPQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAQ0jXA8TKDFUzsDX63gqbB
+T+noOyQ5rdk1ao95pWBdquaTfmq0kybYW155UA1CGzxXNf6hWu3PBQZKiy/2rkty
+e5ml0b0s1/V57JtvtB/E6NuqoitAXq8O1okiy7RS93Fo3dz8sDSoAOK2/slGJwBO
+PrqsMoYTjfhSVUa2wiXre89eMsIy0UV1ifEtEOLU5dPI3cgabJsQC+PAZS7J60mb
+GjIjFTwcQ4eHU3fB2d3tswTCZpcOxdEvrXCvXmca//R5ilUoHq45Ne3yShxE8ivm
+m6PLcFE3BHA2WBnbwZt8ylTcHvJxL0Fafywu71AusQcAJz1p7NScH6wuCxqdiuN+
+
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cgticafe.fiocruz.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cgticafe.fiocruz.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">FIOCRUZ - FUNDACAO OSWALDO CRUZ</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">FIOCRUZ - FUNDACAO OSWALDO CRUZ</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">FIOCRUZ - FUNDACAO OSWALDO CRUZ</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">FIOCRUZ - FUNDACAO OSWALDO CRUZ</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://portal.fiocruz.br/pt-br</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://portal.fiocruz.br/pt-br</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>infracgti</md:SurName>
+ <md:EmailAddress>infracgti@fiocruz.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/childcare.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/childcare.uas.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..30567727
--- /dev/null
+++ b/swamid-interfederations-2.0/childcare.uas.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://childcare.uas.ox.ac.uk/shibboleth">
+ <!--
+ This is a "ChildCare Portal" Shibboleth SP for the University of Oxford.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-04T12:12:25Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/Login"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDCTCCAfGgAwIBAgIJANnFKhkCv1e7MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+ BAMTFmNoaWxkY2FyZS51YXMub3guYWMudWswHhcNMTUxMTAyMTUzODE3WhcNMjUx
+ MDMwMTUzODE3WjAhMR8wHQYDVQQDExZjaGlsZGNhcmUudWFzLm94LmFjLnVrMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzDCaP3Q0V2IdOBQURxihDJ3r
+ fgOaOOgaZSehFMDzKUEbZOhCGASNjwaiTKFkYSpV+/3CttYMQbGy12xCxabEv5Qn
+ sffscveJ1zWQeThPkp+Djs743JlWFPnkzxt4i0Q37fzVeMkPPmkYqA4AtqfMFtzi
+ WAIyMoY2eGOIG8tahjGOt7hyQYAC9GWa/Wouc87onKCnY3ZnnkHvB3MUM7lzc8xW
+ nkt1GicChIyCS13YDh1y3AhpTRsMvSyGzfyHVloHwnR1OX3jbFtCLbQHlCDuQFYS
+ ETk4Clgr7REcIAEaXD0PY5KJhgJwyormYV+go0/c0DIYkwD+svX0pTwTPUvP7QID
+ AQABo0QwQjAhBgNVHREEGjAYghZjaGlsZGNhcmUudWFzLm94LmFjLnVrMB0GA1Ud
+ DgQWBBSv7+ruCM5zakyYLDbFv7YQfhgOrDANBgkqhkiG9w0BAQUFAAOCAQEAWum0
+ tyPa1Kk9Y3pQE3CBmq8mpWC0T8TJPqXlP8vgZuKxzmPdGn/Eki6aM6x85njtve9b
+ faDye6QuTPUMcZs/zh0QUTwnFWnM9tkA+eS+VPgtcymh0s6gA8Ib0zUSVsDtPKsY
+ 7IPdC9jZSxiqcYruoTTwnKTfvQTdksWa+jy1B1eM6NvWAYHxdpWVAzb9qK70g/jA
+ NawWWKSieR9RPAikHU+btS7ikxSx1xsRm+l0eTm3Wlsrppbjwt7jHPSzecoww9IN
+ DW+O1RyeuBy4TiG51lRS1mm/nbsd4NN5++Q2ta1iNebgxxzu/pFawTJjVphn3NHZ
+ TqAaVAnA6pWtBzspjg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University of Oxford ChildCare Portal</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Ops Team</GivenName>
+ <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Nick</GivenName>
+ <SurName>Letellier</SurName>
+ <EmailAddress>mailto:nick.letellier@it.ox.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
index 1176c3eb..b70b0e09 100644
--- a/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
+++ b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
@@ -15,10 +15,15 @@
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
</md:Extensions>
@@ -27,11 +32,12 @@
<init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login"/>
<idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login" index="1"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="de">CLARIN Centre Vienna</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">CLARIN Centre Vienna</mdui:DisplayName>
- <mdui:Description xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</mdui:Description>
- <mdui:Description xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</mdui:Description>
- <mdui:InformationURL xml:lang="de">https://clarin.oeaw.ac.at/</mdui:InformationURL>
+ <mdui:DisplayName xml:lang="en">ACDH-AW Services for Digital Humanities</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="de">ACDH-AW Dienste für Digitale Geisteswissenschaften</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Various services provided by the Austrian Centre for Digital Humanities of the Austrian Academy of Sciences (ACDH-AW) (primarily in the context of the CLARIN initiative).</mdui:Description>
+ <mdui:Description xml:lang="de">Verschiedene Dienste des österreichischen Zentrums für Digitale Geisteswissenschaften der Österreichischen Akademie der Wissenschaften (ACDH-AW) (primär im Rahmen der CLARIN-Initiative).</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://acdh.oeaw.ac.at</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="de">http://acdh.oeaw.ac.at</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="en">https://clarin.oeaw.ac.at/privacy</mdui:PrivacyStatementURL>
<mdui:Logo width="55" height="70">https://clarin.oeaw.ac.at/sites/clarin.oeaw.ac.at/files/ccv_logo_v1b.png</mdui:Logo>
</mdui:UIInfo>
@@ -59,6 +65,9 @@ rI8v6OTvibpLrg==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
<md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
<md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
<md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
@@ -71,18 +80,28 @@ rI8v6OTvibpLrg==
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Redirect"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/POST"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Artifact"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/ECP" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML2/POST" index="7"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML2/Artifact" index="9"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML2/ECP" index="10"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML/POST" index="11"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML/Artifact" index="12"/>
<md:AttributeConsumingService index="1">
- <md:ServiceName xml:lang="en">CLARIN Centre Vienna / Language Resources Portal</md:ServiceName>
- <md:ServiceDescription xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</md:ServiceDescription>
- <md:RequestedAttribute isRequired="true" FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute isRequired="false" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:ServiceName xml:lang="en">ACDH-AW Services for Digital Humanities</md:ServiceName>
+ <md:ServiceName xml:lang="de">ACDH-AW Dienste für Digitale Geisteswissenschaften</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Various services provided by the Austrian Centre for Digital Humanities of the Austrian Academy of Sciences (ACDH-AW) (primarily in the context of the CLARIN initiative).</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="de">Verschiedene Dienste des österreichischen Zentrums für Digitale Geisteswissenschaften der Österreichischen Akademie der Wissenschaften (ACDH-AW) (primär im Rahmen der CLARIN-Initiative).</md:ServiceDescription>
+ <md:RequestedAttribute isRequired="true" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute isRequired="false" FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
<md:RequestedAttribute isRequired="false" FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
<md:RequestedAttribute isRequired="false" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
<md:RequestedAttribute isRequired="false" FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
@@ -91,30 +110,35 @@ rI8v6OTvibpLrg==
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="de">Institut für Corpuslinguistik und Texttechnologie, Österreichische Akademie der Wissenschaften</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Institute for Corpus Linguistics und Text Technology, Austrian Academy of Sciences</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="de">Institut für Corpuslinguistik und Texttechnologie</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Institute for Corpus Linguistics und Text Technology</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.oeaw.ac.at/icltt</md:OrganizationURL>
+ <md:OrganizationName xml:lang="de">Österreichische Akademie der Wissenschaften</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Austrian Academy of Sciences</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Österreichisches Zentrum für Digitale Geisteswissenschaften der Österreichischen Akademie der Wissenschaften (ACDH-AW)</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Austrian Centre for Digital Humanities of the Austrian Academy of Sciences (ACDH-AW)</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://acdh.oeaw.ac.at/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
+ <md:GivenName>Mateusz</md:GivenName>
+ <md:SurName>Żółtak</md:SurName>
+ <md:EmailAddress>mailto:mateusz.zoltak@oeaw.ac.at</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
<md:GivenName>Matej</md:GivenName>
<md:SurName>Durco</md:SurName>
- <md:EmailAddress>matej.durco@oeaw.ac.at</md:EmailAddress>
+ <md:EmailAddress>mailto:matej.durco@oeaw.ac.at</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="administrative">
<md:GivenName>Karlheinz</md:GivenName>
<md:SurName>Mörth</md:SurName>
- <md:EmailAddress>karlheinz.moerth@oeaw.ac.at</md:EmailAddress>
+ <md:EmailAddress>mailto:karlheinz.moerth@oeaw.ac.at</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
- <md:GivenName>ICLTT-tech</md:GivenName>
+ <md:GivenName>ACDH</md:GivenName>
<md:SurName>Office</md:SurName>
- <md:EmailAddress>icltt-tech@oeaw.ac.at</md:EmailAddress>
+ <md:EmailAddress>mailto:acdh-tech@oeaw.ac.at</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:GivenName>Akademie-Rechenzentrum</md:GivenName>
<md:SurName>Helpdesk</md:SurName>
- <md:EmailAddress>helpdesk@oeaw.ac.at</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@oeaw.ac.at</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarino.uib.no-.xml b/swamid-interfederations-2.0/clarino.uib.no-.xml
index ae039e92..41c8df75 100644
--- a/swamid-interfederations-2.0/clarino.uib.no-.xml
+++ b/swamid-interfederations-2.0/clarino.uib.no-.xml
@@ -4,6 +4,7 @@
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-08-20T06:55:04Z">
@@ -12,25 +13,28 @@
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://clarino.uib.no/feide/single-login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarino.uib.no/feide/single-login" index="1"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Clarino, UiB</mdui:DisplayName>
<mdui:DisplayName xml:lang="no">Clarino, UiB</mdui:DisplayName>
- <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</mdui:Description>
- <mdui:Description xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</mdui:Description>
+ <mdui:DisplayName xml:lang="de">Clarino, UiB</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Clarino, UiB</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</mdui:Description>
+ <mdui:Description xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til CLARIN-initiativet.</mdui:Description>
+ <mdui:Description xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</mdui:Description>
+ <mdui:Description xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvät CLARIN aloitetta.</mdui:Description>
<mdui:PrivacyStatementURL xml:lang="en">http://clarino.uib.no/iness/page?page-id=privacy_policy</mdui:PrivacyStatementURL>
+ <mdui:Logo width="180" height="64">https://clarino.uib.no/images/clarino_duo-180.png</mdui:Logo>
+ <mdui:Logo width="296" height="106">https://clarino.uib.no/images/clarino_duo-296.png</mdui:Logo>
+ <mdui:Logo width="460" height="165">https://clarino.uib.no/images/clarino_duo-460.png</mdui:Logo>
+ <mdui:Logo width="740" height="231">https://clarino.uib.no/images/clarino_duo-740.png</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
- <md:KeyDescriptor use="signing">
+ <md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg U1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UE CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVp Yi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZ mm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiX DsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15fr hNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WCh sbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDW dy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8R piXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ 47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMC BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au dGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNz LnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx 9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB8 20waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60 Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB 7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7E zRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg U1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UE CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVp Yi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZ mm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiX DsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15fr hNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WCh sbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDW dy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8R piXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ 47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMC BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au dGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNz LnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx 9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB8 20waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60 Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB 7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7E zRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</ds:X509Certificate>
+ <ds:X509Certificate>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVpYi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZmm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiXDsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15frhNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WChsbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDWdy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8RpiXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNzLnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB820waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7EzRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -40,13 +44,18 @@
<md:AttributeConsumingService index="0">
<md:ServiceName xml:lang="en">Clarino, UiB</md:ServiceName>
<md:ServiceName xml:lang="no">Clarino, UiB</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</md:ServiceDescription>
+ <md:ServiceName xml:lang="de">Clarino, UiB</md:ServiceName>
+ <md:ServiceName xml:lang="fi">Clarino, UiB</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til CLARIN-initiativet.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvät CLARIN aloitetta.</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" FriendlyName="eduPersonTargetedID" isRequired="true"/>
<md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
<md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
<md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="false"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
@@ -60,6 +69,16 @@
<md:ContactPerson contactType="technical">
<md:GivenName>Paul</md:GivenName>
<md:SurName>Meurer</md:SurName>
- <md:EmailAddress>paul.meurer@uni.no</md:EmailAddress>
+ <md:EmailAddress>mailto:clarino-tech@uib.no</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Koenraad</md:GivenName>
+ <md:SurName>de Smedt</md:SurName>
+ <md:EmailAddress>mailto:clarino@uib.no</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Paul</md:GivenName>
+ <md:SurName>Meurer</md:SurName>
+ <md:EmailAddress>mailto:clarino-tech@uib.no</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml
index a95280ca..32b9c2bf 100644
--- a/swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml
@@ -30,23 +30,22 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIJAK2qxPW88eF2MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
- BAMTF3Npbmdlci5taXMuc3RyYXRoLmFjLnVrMB4XDTEyMTIwNjExNTQxNloXDTE1
- MTIwNjExNTQxNlowIjEgMB4GA1UEAxMXc2luZ2VyLm1pcy5zdHJhdGguYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVkAcwC1oEymS5IsPvpjnv
- 96EalU7kWFffdyBW2TYL4UmfQ5t6VRBG2nW1bXQvh+Lp94iL3Kt6w5ouOeLKg4bG
- nXJn8DF5aKO7AG4unBo1xP+32E4f3lbGbmmg9a/zdYXeSCtLpIWzKT63yQQJpCYq
- h1we1V/UIdkt+91Q80Y9qHp3Yd+7k3kktmKcjMInXntK5bWCRjXfFmrSBVo9L3sd
- mMtQd5RHYsxTa2DILvw9+7YxWFc+C/H83JYlpuPCQlveQxk683vYZrAGpu3ipTI1
- QMnAeVrsvJaNyQ3prfb3jfCHHUS5owqAFNGbSZadocb60OYrPvR0w5KD9sienZxL
- AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3Npbmdlci5taXMuc3RyYXRoLmFjLnVrMB0G
- A1UdDgQWBBSr6cfR7cxfKoUkqQbi9xAs7hljFjANBgkqhkiG9w0BAQUFAAOCAQEA
- ezHoDWRl7sw+QYrdldktqZQ7PrwGd6eOdfTeEwMR3q4ZvRmchnfU0t98jTI6n6Si
- CoLCsyAhXlFEHSLXmdJWov8KYZ564vWb+oN0LnYthjqEO+8Z4DrWyDIkPyxWandl
- XjxibAu/7RwLmlrzcx/ovaq7pvf9oZsLS8pP3YO4jKcev+650lTEJLXPkBzE4GhC
- WxKdAhVgOZILdYta1Qs5b1y7cfQmO2y1ZhYMfwovKFa59bETKUCcOOVJ+BgFNHIX
- YXiJDYJDXgeCdVWP0hr0LcOhskGfHrWAfef+FE6l5KFcfjxGlGbInQ8rxAoA+n1N
- MEgiyk73ccbgt2MP/StXTg==
+ MIIC8TCCAdmgAwIBAgIJAI/TDhOS3dc1MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+ BAMTDm1vby1jbGFzc2VzLWxiMB4XDTE1MTExMjEwMTQwNloXDTI1MTEwOTEwMTQw
+ NlowGTEXMBUGA1UEAxMObW9vLWNsYXNzZXMtbGIwggEiMA0GCSqGSIb3DQEBAQUA
+ A4IBDwAwggEKAoIBAQCiQjSMU7aYPhkwbkjJ0t8AfNkfeAzgyVe0ZbSpkw4fLqmS
+ ROAXMtdrU6JqQndlMK+RBlSNuKyfHPn2viDddXfqNA1JQWyDeuM62vCulqBsN74C
+ C8uIPFYmnKBQONMVu9GSquZDb5Cdqc/Pud/wAuhAG8oNzwSj3jlekU23jVay8M3C
+ i49Nx+QCq9DuLh7+lkHv5p0EOKJU6tRqP+JAs7kKjx9zDDW1InjeLFfHmNOW3XLp
+ YOLmD5a1yxv8qwFu9DnRO12Erhij9ijDh201sLqqtV/SIBdkmL+kfz2S3b3+knXh
+ 17rqiDr/9b2FwOxL9DYLHiUDOCAiMOWd6C0TD1xLAgMBAAGjPDA6MBkGA1UdEQQS
+ MBCCDm1vby1jbGFzc2VzLWxiMB0GA1UdDgQWBBQ+bhjHHFhU8uMBmalBud5HmLbe
+ TzANBgkqhkiG9w0BAQUFAAOCAQEAStly/iwK52fpJVCSfR0u92+4A/51dVxiEv6P
+ enqNiwujaSxtTQnlH+Y5qwuDjh55b7NgSEFVgsHyLBeM8p7VbsrGqU3v7Yz4x1KR
+ HEvYldz2QVH87unSWfcGyq9Wl4vVDfoJ9vKXyS3aoK7UFTlMtbwExmpPMPo0lU57
+ 6XmMNdAdj29oXQtYoC9VaD12NNM+u+ex/mkgJwzTwlRwrYjAfulEwsSQvVtuttW8
+ 8Qw4P3vEY3d8wyVoFtNST/8PnwpjwEIP5qN6rKdZzLIcd19N2IoJnm6u5yCq1PKQ
+ QXE46akAojltN9BLFBqsWd+YtEdHZF5xbAw5O4zJ5m6SLr0VIg==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/coco.aai.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/coco.aai.niif.hu-shibboleth.xml
new file mode 100644
index 00000000..e543b972
--- /dev/null
+++ b/swamid-interfederations-2.0/coco.aai.niif.hu-shibboleth.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://coco.aai.niif.hu/shibboleth">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>href-test</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </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="hu">SP for eduGAIN attribute release checker - CoCo</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="el">SP for eduGAIN attribute release checker - CoCo</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SP for eduGAIN attribute release checker - CoCo</mdui:DisplayName>
+ <mdui:Description xml:lang="hu">SP for eduGAIN attribute release checker - CoCo</mdui:Description>
+ <mdui:Description xml:lang="en">SP for eduGAIN attribute release checker - CoCo</mdui:Description>
+ <mdui:Description xml:lang="el">SP for eduGAIN attribute release checker - CoCo</mdui:Description>
+ <mdui:InformationURL xml:lang="hu">https://earc.eduid.hu/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://earc.eduid.hu/privacy</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIICwjCCAiugAwIBAgIJANMM+XZzl/bmMA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGTAXBgNVBAMTEGNvY28uYWFpLm5paWYuaHUwHhcNMTUxMTAzMTkwODIwWhcNMjUxMDMxMTkwODIwWjBLMQswCQYDVQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxDjAMBgNVBAoTBU5JSUZJMRkwFwYDVQQDExBjb2NvLmFhaS5uaWlmLmh1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDV7RkLxXksjYxez3dO9M1UL9/0gURNqoRVvNvq9V1suhVrGXY9chcpA9C2dlTQNt9iRL6yR1hRSuPpYDDn1hVh42JAEwThVLcqa0j5KP2LDllJWT3xOzNgt/aECwHPEfcBNsEzoBdJqBehIpR8xvhLNn+oMc8aPh4xodpr9jXvQIDAQABo4GtMIGqMB0GA1UdDgQWBBR2MWXwHsg2Dv9ECmxdP82LFKH59DB7BgNVHSMEdDBygBR2MWXwHsg2Dv9ECmxdP82LFKH59KFPpE0wSzELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MQ4wDAYDVQQKEwVOSUlGSTEZMBcGA1UEAxMQY29jby5hYWkubmlpZi5odYIJANMM+XZzl/bmMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAwQmrknKXTn6jIeUf+5pk8MN689p1FfWL8VS9QjKPHsJ9C8DA/x6KfbD/AS2N7LRNDEGiAE/xeaidm3WplcImXgzkNXz6AhxloqPOKte/f0kF1F4YcCQ6eGS5h76CFpLMmUki3lneb+dAIPSQ1EXI63ClZ1DBRxkgU5530rxSYjQ=</ds:X509Certificate>
+ </ds:X509Data>
+ <ds:KeyName>coco.aai.niif.hu</ds:KeyName>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coco.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coco.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coco.aai.niif.hu/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coco.aai.niif.hu/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coco.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://coco.aai.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coco.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://coco.aai.niif.hu/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="hu">SP for eduGAIN attribute release checker - CoCo</md:ServiceName>
+ <md:ServiceName xml:lang="en">SP for eduGAIN attribute release checker - CoCo</md:ServiceName>
+ <md:ServiceName xml:lang="el">SP for eduGAIN attribute release checker - CoCo</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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/conext.authenticatie.ru.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/conext.authenticatie.ru.nl-simplesaml-saml2-idp-metadata.php.xml
index 66037ec5..f2da9224 100644
--- a/swamid-interfederations-2.0/conext.authenticatie.ru.nl-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/conext.authenticatie.ru.nl-simplesaml-saml2-idp-metadata.php.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Radboud University</mdui:DisplayName>
<mdui:Description xml:lang="nl">An IdP operated by Radboud University Nijmegen</mdui:Description>
<mdui:Description xml:lang="en">An IdP operated by Radboud University Nijmegen</mdui:Description>
- <mdui:Logo height="26" width="120">https://static.surfconext.nl/media/idp/radboudlogo120.png</mdui:Logo>
+ <mdui:Logo height="26" width="120">https://static.surfconext.nl/logos/idp/radboudlogo120.png</mdui:Logo>
<mdui:Keywords xml:lang="en">university nijmegen ru</mdui:Keywords>
<mdui:Keywords xml:lang="nl">universiteit nijmegen ru</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml b/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
index 69293ddb..8d6a8ba4 100644
--- a/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
+++ b/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
@@ -103,6 +103,6 @@ H/AVOR5U++JOt28OOfoi7mtxOFPxkge3AooWLNFOEOGMSF78BG8NCrT0l59OnAtN
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>NORDUnet NOC</md:Company>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/connect.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/connect.ct.infn.it-shibboleth.xml
index 096ee68a..2c51279f 100644
--- a/swamid-interfederations-2.0/connect.ct.infn.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/connect.ct.infn.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.ct.infn.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.ct.infn.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T06:20:52Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml b/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
index 681272e5..1ea24c40 100644
--- a/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
+++ b/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
@@ -106,6 +106,6 @@ bUs=
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>NORDUnet NOC</md:Company>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/courses.sci-gaia.eu-shibboleth.xml b/swamid-interfederations-2.0/courses.sci-gaia.eu-shibboleth.xml
new file mode 100644
index 00000000..b6d90dd2
--- /dev/null
+++ b/swamid-interfederations-2.0/courses.sci-gaia.eu-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://courses.sci-gaia.eu/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-09-11T09:47:08Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://courses.sci-gaia.eu/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://courses.sci-gaia.eu/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Sci-GaIA Online Courses</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">Corsi online del progetto Europeo Sci-GaIA</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Sci-GaIA Online Courses is an e-learning environment where partners' users can find courses that explain the technologies used in the project</mdui:Description>
+ <mdui:Description xml:lang="it">I corsi online del progetto Sci-GaIA sono dei servizi di e-learning dove gli utenti degli enti partner possono apprendere le tecnologie usate nel progetto</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://courses.sci-gaia.eu/about</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://courses.sci-gaia.eu/privacy</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIEoDCCA4igAwIBAgIQGwF3QYiICE7zq1+Nt9wGqDANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNTA2MTcwMDAwMDBaFw0xODA2MTYyMzU5NTlaMEExITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTY291cnNlcy5zY2kt
+Z2FpYS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4lCXNr6Wa2
+7qGn46QSJV6939bVVX/wWLncPuEoJddioKqZpF8E01LS+izmWv85Z0KpeyD3RDx3
++Mrlfs5lGdVHpsKQA1zGR6qRHi/P13XUspk3q5BC0FEhF2pYvQyc54/BqWdjIvZJ
+IalpLdwn/xZ3ERZlE0oKu44dxs1AHEvDRLtB6WSliR6H8CiSE3gDnKT1reQV3enk
+IhJe+bSI3UxuJ+475OmEdWW4FjPTcQe0+14RTAHiFo+SKKPD1LAJbYRgOjSXQYpS
+0Ffs39xDmlZjDaW++TaDZ0RZbrK2R2WUIdB2Y7ZO3+aXmBysDTvqa6eXMxvQ0zZd
+GZISmkPwGDkCAwEAAaOCAW8wggFrMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvh
+hiiw/ba9MB0GA1UdDgQWBBRmh4KfdTq82DONTL864+9HD8KmljAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5j
+cmwwbAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0
+cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29j
+c3AudXNlcnRydXN0LmNvbTAeBgNVHREEFzAVghNjb3Vyc2VzLnNjaS1nYWlhLmV1
+MA0GCSqGSIb3DQEBCwUAA4IBAQBk718ij3B7Tp2/wjtwus0QvG6/tjzaCejSkFm0
+APEOAkbduLYkBldzdeWnZiF497mcviriDGMHS6G7nQSurvO/Z/uzZLEX4BVWAhKM
+rILvvdJe+NLrWUc/RblncN83MTwbMsiHRwhaZftX3mdPTZzxNFINijC2wkv4qP7i
+G5QeNpfgG7xfnsOgfYsTwsuLsTqBuQLWMDyXBUIrL4AOD+IRezFBCaVCtii/sWdb
+o9dq23HNLskw/04BBIzTcUrrRx5+0jImH6nY9d6ZLGNglpZaogQfPtbt2T6/5lrg
+ZmVmVnUteKWWW6Oo6YhuL9+2hwAf62ASzOOl1K9BXieFU0T5
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://courses.sci-gaia.eu/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML2/POST" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML/POST" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML/Artifact" index="5"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">Sci-GaIA Online Courses</md:ServiceName>
+ <md:ServiceName xml:lang="it">Corsi online del progetto Europeo Sci-GaIA</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Sci-GaIA Online Courses is an e-learning environment where partners' users can find courses that explain the technologies used in the project</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="it">I corsi online del progetto Sci-GaIA sono dei servizi di e-learning dove gli utenti degli enti partner possono apprendere le tecnologie usate nel progetto</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="it">Università degli Studi Catania</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University of Catania</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="it">Corsi online del progetto Sci-GaIA erogato dall'Università degli Studi di Catania</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Sci-GaIA Online Courses provided by the University of Catania</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="it">http://www.unict.it/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.unict.it/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Marco</md:GivenName>
+ <md:SurName>Fargetta</md:SurName>
+ <md:EmailAddress>mailto:discourse-support@sci-gaia.eu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Roberto</md:GivenName>
+ <md:SurName>Barbera</md:SurName>
+ <md:EmailAddress>mailto:discourse-support@sci-gaia.eu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml b/swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
index 2175278e..a0c487ae 100644
--- a/swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
+++ b/swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
@@ -88,6 +88,6 @@ D265cqy6Le/toVg=
<md:ContactPerson contactType="technical">
<md:GivenName>Oleg</md:GivenName>
<md:SurName>Mirzov</md:SurName>
- <md:EmailAddress>oleg.mirzov@nateko.lu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:oleg.mirzov@nateko.lu.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml
index 3364a192..58848650 100644
--- a/swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml
@@ -7,14 +7,15 @@
</md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dans.knaw.nl</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="nl">Data Archiving and Networked Services (KNAW)</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Data Archiving and Networked Services (KNAW)</mdui:DisplayName>
<mdui:Description xml:lang="nl">Data Archiving and Networked Services (KNAW)</mdui:Description>
<mdui:Description xml:lang="en">Data Archiving and Networked Services (KNAW)</mdui:Description>
- <mdui:Logo height="38" width="108">https://static.surfconext.nl/media/idp/knaw-dans.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Data Archiving and Networked Services KNAW DANS</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Data Archiving and Networked Services KNAW DANS</mdui:Keywords>
+ <mdui:Logo height="38" width="108">https://static.surfconext.nl/logos/idp/knaw-dans.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Data Archiving and Networked Services KNAW dans</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">Data Archiving and Networked Services KNAW dans</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/demeter.wp.swov.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/demeter.wp.swov.nl-adfs-services-trust.xml
index 0fe8c8b9..814e3605 100644
--- a/swamid-interfederations-2.0/demeter.wp.swov.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/demeter.wp.swov.nl-adfs-services-trust.xml
@@ -14,7 +14,7 @@
<mdui:DisplayName xml:lang="en">SWOV Institute for Road Safety Research</mdui:DisplayName>
<mdui:Description xml:lang="nl">Stichting Wetenschappelijk Onderzoek Verkeersveiligheid SWOV</mdui:Description>
<mdui:Description xml:lang="en">SWOV Institute for Road Safety Research</mdui:Description>
- <mdui:Logo height="118" width="425">https://static.surfconext.nl/media/idp/swov.png</mdui:Logo>
+ <mdui:Logo height="118" width="425">https://static.surfconext.nl/logos/idp/swov.png</mdui:Logo>
<mdui:Keywords xml:lang="en">SWOV Institute for Road Safety Research</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Stichting Wetenschappelijk Onderzoek Verkeersveiligheid SWOV</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/demo.eduopen.org-shibboleth.xml b/swamid-interfederations-2.0/demo.eduopen.org-shibboleth.xml
new file mode 100644
index 00000000..08767375
--- /dev/null
+++ b/swamid-interfederations-2.0/demo.eduopen.org-shibboleth.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://demo.eduopen.org/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-10-09T12:03:03Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.eduopen.org/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.eduopen.org/Shibboleth.sso/Login" index="1"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.eduopen.org/Shibboleth.sso/Login" index="2"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Eduopen Network provided by Unimore</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">Eduopen Network fornito da Unimore</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Test portal for providing demonstration courses for EDUOPEN Network in a federated environment</mdui:Description>
+ <mdui:Description xml:lang="it">Portale di test per l'erogazione dei corsi dimostrativi per la rete EDUOPEN in un ambiente federato</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://demo.eduopen.org/eduopen/information-en.php</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="it">https://demo.eduopen.org/eduopen/information-it.php</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://demo.eduopen.org/eduopen/privacy-en.php</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="it">https://demo.eduopen.org/eduopen/privacy-it.php</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHTCCAgWgAwIBAgIJAKTsiYGHB4eEMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2Rldi5lZHVvcGVuLm9yZzAeFw0xNTEwMDgxOTEyMTJaFw0zNTEwMDMxOTEy
+MTJaMBoxGDAWBgNVBAMTD2Rldi5lZHVvcGVuLm9yZzCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAOLTNa351EGsrWjOLExh1KsdepEkjmLu6Np410xnUW2t
+MRcVOTkAr1bm1rdvGp/7DbdxxQay0jEwYI0AhFW/uPhzaUjKatlZzcy/ApMb8+RQ
+vtyoja86vCMIzQmTCoVZIJY+WKOpqSmx6U+ycZXN17uYLH6v+kAj9C4dFOsiQKP3
+FTsqviTYmYAfXEtmzlQf5ag0UipMlCD3O4M5kY0GJOShDAUcgy4E34xdt0YMvOks
+iLvm8cLqQ7//b3ir2yZ7ldWY9w15CEqXOT/VQmQ18ez7TptlKzviM3oKGLNoiOyT
+Z+t5ZfIvD18NAeS4lPo35VCHr5z/cEVpHL/Cp8VY3QkCAwEAAaNmMGQwQwYDVR0R
+BDwwOoIPZGV2LmVkdW9wZW4ub3JnhidodHRwczovL2Rldi5lZHVvcGVuLm9yZy9h
+dXRoL3NoaWJib2xldGgwHQYDVR0OBBYEFNVJx+JWzWU5V4JnYk/b/tvNpWz7MA0G
+CSqGSIb3DQEBBQUAA4IBAQAZir5mWwsi3FOoi3Tp+OI6umALyvAAihBdrg9hZ6Gn
+Oa3rrgFoOiISpqj5zTjXOGC40ZLOl269VdQzxrMMX5NvO9C9qPOuQ+dEllkQ4bP0
+vHr5XHeCVYW3kpmVXrO+wCX+zMUrTwsOhUP0J7Pxo38+mMT3JLeGXwel5fs8wHEU
+YMaYMWKMN7R5nJxW7LIfJCNFZfgm5pfo2dJs5SGCgmZxw9hrS/26xaKArfPMumls
+zczrSGA9TWebd4JiqYgR++we4HpNTJDoMV4azydOG1GkhGfU3o+V1sZBWrlaJwiy
+umrvPDF3/bdUFQW96kAoCVF7Gj2x+yIy2SK2RTpyELZY
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.eduopen.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.eduopen.org/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.eduopen.org/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.eduopen.org/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.eduopen.org/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.eduopen.org/Shibboleth.sso/SAML2/POST" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.eduopen.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.eduopen.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.eduopen.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.eduopen.org/Shibboleth.sso/SAML/POST" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.eduopen.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">Eduopen Network provided by Unimore</md:ServiceName>
+ <md:ServiceName xml:lang="it">Eduopen Network fornito da Unimore</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Test portal for providing demonstration courses for EDUOPEN Network in a federated environment</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="it">Portale di test per l'erogazione dei corsi dimostrativi per la rete EDUOPEN in un ambiente federato</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" 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="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="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:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="it">Università di Modena e Reggio Emilia</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University of Modena e Reggio Emilia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="it">Eduopen Network fornito da Unimore</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Eduopen Network provided by Unimore</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="it">http://www.eduopen.org</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.eduopen.org</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Tommaso</md:GivenName>
+ <md:SurName>Minerva</md:SurName>
+ <md:EmailAddress>mailto:cea@unimore.it</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.aiwip.com-shibboleth.xml b/swamid-interfederations-2.0/dev.aiwip.com-shibboleth.xml
new file mode 100644
index 00000000..ecc8ddd6
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.aiwip.com-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.aiwip.com/shibboleth">
+ <!--
+ This is a "Aiwip (Beta)" Shibboleth SP for Aiwip Ltd.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-29T11:08:20Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.aiwip.com/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Aiwip (Beta)</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Free printing for University students</mdui:Description>
+ <mdui:Logo height="135" width="90">https://dev.aiwip.com/static/images/logo2-dark.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDkjCCAnqgAwIBAgIJAMhB5Bq2iyR4MA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNV
+ BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xEjAQBgNVBAoMCUFpd2lwIEx0ZDEWMBQG
+ A1UEAwwNZGV2LmFpd2lwLmNvbTAeFw0xNTA5MTExNTE0MDJaFw0yNTA5MDgxNTE0
+ MDJaMEoxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xEjAQBgNVBAoMCUFp
+ d2lwIEx0ZDEWMBQGA1UEAwwNZGV2LmFpd2lwLmNvbTCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBAKeYBNoVDBp6PLICKD/TpMavGRrNFBkgOg2DTwGtEx81
+ KGEzTiaZVHZGZSL1kYJCoNIVeZ9vWgn4HPbiLH7A5sWJ56vKUFV4w/Nik7Ldourm
+ r1NRR2/5v3ZqpypZBlA9zCtnqXQ+b9g/JkmnAvcTv08LCIh/0fMt28KVDPydG06K
+ bFMDHYLDmIvL7m3mkJNM9oVBLeDUmxZD/edcxOz8mOea7fxE9wcHRrBIP2JROoIZ
+ sId6gR8Wd9SPP5L8QtmrDdYhdg60CShag7VmCdiWYUsiK+8WGPTsNgg/HWnm16Qu
+ 7VmftSOXYtzzOqjwbneHOZY61S6MTa5v3+LgGJ3KIikCAwEAAaN7MHkwCQYDVR0T
+ BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh
+ dGUwHQYDVR0OBBYEFPRW8eJscxxfYpnPjyKNcS8EpzbZMB8GA1UdIwQYMBaAFPRW
+ 8eJscxxfYpnPjyKNcS8EpzbZMA0GCSqGSIb3DQEBCwUAA4IBAQAyGtVy8SQjIDzn
+ zMcfUb7lVNQPrllcqZe/3Rw3LNE6ZK4/pa7h0pf3Nxshe9l7/1V3ltwmW7tNfIxI
+ OBay2iKDqNvXiIzSESOuvtuUhx+QOk54VnDZNyZTIxG/oNGodsEb+DlCawzWEVou
+ NIiLvKtWqOCmH3lSVbwoNafgEtR0kLXiIF8kc39SmoZkQbuXv/vn1HuaZGx/qyzq
+ evUZK4V2B1H8xkcj+PuVjnq7yo59Z2hxBCrzdmtS4Ctuxr49OP5mjRobc+XAvtZG
+ DfqRJcZIQ0IF5Fm5VTiWawxRo9AKLCLgeGnE9qoFUzkrdGRvWvPSbN09FPw64gAk
+ ZGK4Vav2
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.aiwip.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.aiwip.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.aiwip.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.aiwip.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.aiwip.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.aiwip.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.aiwip.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.aiwip.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.aiwip.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.aiwip.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.aiwip.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Aiwip Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Aiwip (Beta)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://dev.aiwip.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Ruslan</GivenName>
+ <SurName>Khazarchiev</SurName>
+ <EmailAddress>mailto:ruslan@aiwip.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Ruslan</GivenName>
+ <SurName>Khazarchiev</SurName>
+ <EmailAddress>mailto:ruslan@aiwip.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.clarin.nl-shibboleth.xml b/swamid-interfederations-2.0/dev.clarin.nl-shibboleth.xml
index bd2dbcb8..0e5d58ab 100644
--- a/swamid-interfederations-2.0/dev.clarin.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/dev.clarin.nl-shibboleth.xml
@@ -5,6 +5,11 @@
<mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
@@ -14,6 +19,7 @@
<mdui:Description xml:lang="de">Das Web Portal der niederländischen CLARIN Projekt</mdui:Description>
<mdui:Description xml:lang="en">The Web Portal of the Dutch CLARIN Project</mdui:Description>
<mdui:Logo height="102" width="169">https://dev.clarin.nl/sites/default/files/clarin-nl_logo_169x102.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">https://dev.clarin.nl/</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="en">http://dev.clarin.nl/privacy%20policy</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
diff --git a/swamid-interfederations-2.0/dev.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/dev.niif.hu-shibboleth.xml
new file mode 100644
index 00000000..cc35a354
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.niif.hu-shibboleth.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.niif.hu/shibboleth">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>href</saml:AttributeValue>
+ <saml:AttributeValue>href-edugain</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+ <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">dev.niif.hu - NIIF Gitlab</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">dev.niif.hu - NIIF Gitlab</mdui:DisplayName>
+ <mdui:Description xml:lang="hu">Közös fejlesztést támogató környezet</mdui:Description>
+ <mdui:Description xml:lang="en">Development support platform</mdui:Description>
+ <mdui:InformationURL xml:lang="hu">https://dev.niif.hu/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="hu">http://www.eduid.hu/dev-niif-hu-adatkezelesi-szabalyzat/</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDyzCCArOgAwIBAgIJAMz5rXxV5LhzMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNVBAYTAkhVMQowCAYDVQQIDAEgMREwDwYDVQQHDAhCdWRhcGVzdDEOMAwGA1UECgwFTklJRkkxDDAKBgNVBAsMA0FBSTEUMBIGA1UEAwwLZGV2Lm5paWYuaHUxGjAYBgkqhkiG9w0BCQEWC2FhaUBuaWlmLmh1MB4XDTEzMDkxOTE0Mzg0OVoXDTMyMTExODE0Mzg0OVowfDELMAkGA1UEBhMCSFUxCjAIBgNVBAgMASAxETAPBgNVBAcMCEJ1ZGFwZXN0MQ4wDAYDVQQKDAVOSUlGSTEMMAoGA1UECwwDQUFJMRQwEgYDVQQDDAtkZXYubmlpZi5odTEaMBgGCSqGSIb3DQEJARYLYWFpQG5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA5lcu5S0Deqp1Fdg4W5adlKozHOdiZG1CIz/860gilZzTfZ3ASn6uGhgedVnstsSPoy3tPYTSt9Ojm093RW5AB2lPHMjcwALcalNj088x6thyw02g3X0ikh6O40asFgqMMJSbTT5zIGxtSCssD8nsTbk93pfWpOeQ2nCWFy15Jox6JxRtMTONp6jaNQbJX5XCanuqszC2b0V/EnrQm8Wmh1FPig5fT5/Mtit2r8pD7xqqM8VT9k3A2jp4o2p3RCyQGPs4+VbhQnlFFoxuO5O+e9bwgRPry5ZhmdtgeWQ0JjTAY/dIMxBKWl7P4AwDIsWUTmPYJwpnmm+4ezC0MnxdAgMBAAGjUDBOMB0GA1UdDgQWBBQDEfDpSNqtjMt5HWjQYIEl135g1DAfBgNVHSMEGDAWgBQDEfDpSNqtjMt5HWjQYIEl135g1DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCBgWzMbo0jQP7NDKhGQS6p0ekaTRE6V/laes6rc6dH2TBO/kRjSn25qu4r5Ym7A2hnHTOd/nTgeHuPhK7l+tQnMpU1hq8K3ykAlUSl2iKqt0zXXX80YvCeJEww4lXPyl03S4WkJR//BfMYiencaxB2oqIzt8WkBTe2BvsK1Jeql7AVy3OEQKk3SVYgOWa2+vjLduaxjKjX1HySfNiKTwQjtdfmtsMYRRyjz87m3AjY8F8niBs4Q/POA/JWCQ35XG3k1InCQIkV0ReYelgmelRerHPe1Qs7y1fw989/mSf/WTGM90AL/CRb4S9qIpSx4eYXLPGeTiEf1sOixRwwwIbb</ds:X509Certificate>
+ </ds:X509Data>
+ <ds:KeyName>dev.niif.hu</ds:KeyName>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.niif.hu/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-Artifact" Location="https://dev.niif.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.niif.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="hu">dev.niif.hu - NIIF Gitlab</md:ServiceName>
+ <md:ServiceName xml:lang="en">dev.niif.hu - NIIF Gitlab</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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.scotlandonscreen.org.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.scotlandonscreen.org.uk-shibboleth.xml
new file mode 100644
index 00000000..9f0d2491
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.scotlandonscreen.org.uk-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.scotlandonscreen.org.uk/shibboleth">
+ <!--
+ This is a "Scotland on Screen" Shibboleth SP for Scottish Film Ltd.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-01T10:38:26Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/Login" index="1"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC4jCCAcqgAwIBAgIJAMoIPyead1FcMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+ BAMTCWxvY2FsaG9zdDAeFw0xNTExMjYxNTAyMDBaFw0yNTExMjMxNTAyMDBaMBQx
+ EjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ ggEBAL6bGN3E7+FUnXfWtXr35qVdDYbJFVgCLVPQJTTtFuRqJ3NtzJuDoPWAGCFD
+ Rg7DBd9nq9sC88lxPBEklJxKeFqdtc6Q+dtFwI/mM2fCZ5jqBBfzuclk0EfY0NNx
+ hjGnk/q0mDoKdq4QixpzXlvNRIuau5RTWMleneQz2I9NHzykEX73a1StLPcQVISl
+ h7fyA/R8FixICFaMpBX+j1y+w0ki7jiasoB0rJiJ8/S7QuTsg5Bc5mm9e5RFnlxz
+ VaSqMXWNLONFfKmeN2yzsQ97aQEC5zKyto8oOSZOXkBZWKOoIhKP64MYYCYs2lNX
+ ug5AmX9beNWZgqZ/uAA2IxoE64cCAwEAAaM3MDUwFAYDVR0RBA0wC4IJbG9jYWxo
+ b3N0MB0GA1UdDgQWBBR5XvLNMnGYP5gYfxxMe2W9eqb+HjANBgkqhkiG9w0BAQUF
+ AAOCAQEAJhaMd23dCDOQt+uSvDWYhnd0EBItLYeHw20BP5mSFckz4YIIxqO6BFAe
+ Whsbm6jKe0EegUTKPQbsDQH5i+vL0nJgqcPiIbSOiIXokqV7LKdb6Sg5ss4w/KLI
+ zvHHRxniCW24EVUKFykFy2tTZeWwzgbeN5pB9gqBunXAZXr3YwkbF9Pi7U4tUczv
+ P8oOzdM2c6tjngfcu1aWKTQfj6Ym3PXI1fBbXpZrGu9+vIFvisbbSxkBnoMxeqD8
+ qHVPP72/RXmeMTBNTd4d5+gkkmGwenQomAkpJIySuQKAHymRIZeAX0vAMQx6iML+
+ BIf+7Kb/szjKXzFq16l3ybndViMrnQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Scottish Film Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Scotland on Screen</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://dev.scotlandonscreen.org.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Paolo</GivenName>
+ <SurName>Ciarrocca</SurName>
+ <EmailAddress>mailto:web@scottishfilm.scot</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Paolo</GivenName>
+ <SurName>Ciarrocca</SurName>
+ <EmailAddress>mailto:web@scottishfilm.scot</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml
index 12d28d69..25301888 100644
--- a/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://devidp.nottingham.ac.uk/idp/shibboleth">
<!--
- This is a "Development" Shibboleth Test IdP for the University of Nottingham.
+ This is a Shibboleth IdP for the University of Nottingham.
-->
<Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -9,52 +9,94 @@
<saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-28T09:44:57Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-26T11:29:38Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor>
+ <KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEqDCCA5CgAwIBAgIQIQ1rs9m1C2AoNe0z3fesqjANBgkqhkiG9w0BAQsFADBk
- MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
- QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
- Q0EgMjAeFw0xNDEwMzEwMDAwMDBaFw0xNTEwMzEyMzU5NTlaMEUxITAfBgNVBAsT
- GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXZGV2aWRwLm5vdHRp
- bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsTxKr
- cTyAanJZyfCgwfEL39/arCojde/S4J+QXJa7CmMUmq6sxgHC4si6meAOKFzyW07H
- 2P/2F1HSZ2pX7TAcZV9W7lWL+fTD7BoPMHvBT5d9RpiU0tF3ZagNDGNnk4RdX4kC
- 13qmrv8gzhMyXvrc7r6E4d0td2J/iQrkw5hlLKL7OaqP7gckxkbN2DtVQXNn7HUE
- GQtZvFURoGeATqZlOOYez6+h26gYk3ay1QTPMHYVG40XUy9/j2EF3m2zyFzUei4u
- YCD5ZvWXJZEjqZ0hjA6yzRdvAmyZQ4DdfcXHYhuKlRwe380tXKW0HSh0rYVXuVvG
- rZSC5YbcUwwrrqgfAgMBAAGjggFzMIIBbzAfBgNVHSMEGDAWgBRb0IocmjJb4LXd
- llQb4YYosP22vTAdBgNVHQ4EFgQUuUOC7Vl12WJDMvG4oBhHeh/OxtcwDgYDVR0P
- AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
- AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
- HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xD
- QTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51
- c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6
- Ly9vY3NwLnVzZXJ0cnVzdC5jb20wIgYDVR0RBBswGYIXZGV2aWRwLm5vdHRpbmdo
- YW0uYWMudWswDQYJKoZIhvcNAQELBQADggEBADldm3QMEZof/isHRRXSw7tnKOHK
- geH8zqcCXYYGIdUABnGtUew/iPn0lA54gfKsnF+apMHUvcYA4/FvSFEg7C8A8Zya
- BcPakbJP2NkV2VCpy2wGVo2pYIpm9jZLsZdFoI4NsRlSm4//hflxkBMJkYI0wfut
- NfElPVdrZunLvBrMKc046ehphPbb55jy3uEUfC4kP+/E8rof90uU6j5aVSXESjGm
- tpv40MnM4G0vOGHGXDd4kMAMAkmYEN88r4pV3Y10o9ZUhcyB0o0vPCYjSNOf8GGq
- O0clm/8A13wY2x0gBIA6Lbs2XDEH0g4VU7LGnScQk5JPkTodVHlEpzq2meA=
+ MIIDRzCCAi+gAwIBAgIUPod7Sbr/56mHA3U++HPjhmWY37wwDQYJKoZIhvcNAQEL
+ BQAwIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRpbmdoYW0uYWMudWswHhcNMTUxMTA0
+ MTMxNDAzWhcNMzUxMTA0MTMxNDAzWjAiMSAwHgYDVQQDDBdkZXZpZHAubm90dGlu
+ Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIUmA1Je
+ uraCsBviSJhTzCsEiO9rLF1wFC79ZdKMM8+cRsBV8Wg2J3NTEsXdP3RDwaV7DU1i
+ DvqH0kkHd1TeTVWTBLy5tE5oSBI+XrUMWlW1+oKVRRgxuWwJinG9OzJGkLk3kPiC
+ wvmnh2oP/CvvBQFR7jXwzLETMX+ReJo8Qrm/i3uIatYnC+QjqXtiq32q+HrWm3/m
+ kbmbomaLhI/4eWAhyeCgbfkzJUm/J6/omhonCF2cTT9mAYTj/zEPkaIfOEsz/YoX
+ GZ1C3oJxMboECHwlXKrov4UBxcWybejM/w2tZ9hy+Dz98HBa9ktj8D+YGj17j44v
+ blKdnIvLNLeB2AECAwEAAaN1MHMwHQYDVR0OBBYEFOVrC+SsmuraLXapXXAJ1KiG
+ p0KlMFIGA1UdEQRLMEmCF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrhi5odHRwczov
+ L2RldmlkcC5ub3R0aW5naGFtLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+ DQEBCwUAA4IBAQCE/hCKcHULJtiEIvbaWVj/cJ/5djjVOq5yWp3SKqXr7QuNXhH3
+ vcyDRlSRAgM5sYztCetRizr8wvir6uQg8yThQ7a2haSKDpSSvrDlsbiN25QNcSPy
+ tHxbV/cmcPuBJqVuoSLGhl56Ak8cWcu+Gsv49f57ZwWdPry6nNxojf9T6QZ5Yjue
+ CRXV9/nKPeMyud0L9DOs6Fwv5PvVfGRqck+3GzLqFLqqd9bMEBizSqxOtitRkI6E
+ XX4b72sjaXxZmhZKx9OJDc+qb5JKIfPAhy/WMU5j8nvV1lMXA7ADQHEc6z0wcQAB
+ W6z4doMJR/vjhdSNsL+BscENO7S8TLwNerEG
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVAJByt+Pqvd0AQkDuileWY3HzdFCuMA0GCSqGSIb3DQEB
+ CwUAMCIxIDAeBgNVBAMMF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrMB4XDTE1MTEw
+ NDEzMTQwMFoXDTM1MTEwNDEzMTQwMFowIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRp
+ bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFjocT
+ hMLkbIhipB+LoOS6gnhQ926P+lwkbjm4L1k1z7L9Br1+FWy6y9A87C27vjl3NVmn
+ Mb3bOJoSWzO4zhCTXKIXwsGE4p/xU27tkJrhmWSiaGIgI0yIpgJ9VqffiylMYsbB
+ TMdJZKnRCkcsT3u9hNCrZTFciX6dCuTx1eG/O/gnP1Tsv1VgZNDGkIpQ2FGyGvqf
+ CnDsoYauqQboetyMbi35kNtzyHEeQlFGdf0TzcRu4+M9Iu8m8gdysHwVI6ooNgCh
+ rPkqsiRqN8QxLehGbb2iUkCBUm1ozIJ6gI/ISju9NU2rPvnGvEDIhdahN8he+SBB
+ nWIyYSigzFIiKRB1AgMBAAGjdTBzMB0GA1UdDgQWBBSecvscFzbVdcNqNo6BYvId
+ PbEB5DBSBgNVHREESzBJghdkZXZpZHAubm90dGluZ2hhbS5hYy51a4YuaHR0cHM6
+ Ly9kZXZpZHAubm90dGluZ2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+ 9w0BAQsFAAOCAQEANDNxfMHsXfT3qTlrHhHtqA+POFxFXmbVIl8eVyaRWDYt6CSh
+ ASNdkJ5JeAqyH+hi99ck/uEBHDOwkPbDz9mS5sXYQWlM/flJgPvfQhdH39x5I+89
+ E65VMCpVXIxSOimcv2e2T/6wN8LfeVxrdX/xqxTlwgMFITWiH0CBV32BYwnSTyWv
+ uA//1B+e5rrZieEDFpPIKp88kllHPI65gOM5BtM/7e7dSrP6DDFGQ9Cka2PKJN42
+ MSspvYO5t2896ElI8y5uo+WqEJJYQK5tUMEWHrEv4iKJBMh6o1RF0IKPsqfdbDXh
+ /pucELdoD3QB/+Y00gYUkW0ahafVQHPPmbXEhg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVALhfnz8SVgCdbIxwq62snEekShFkMA0GCSqGSIb3DQEB
+ CwUAMCIxIDAeBgNVBAMMF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrMB4XDTE1MTEw
+ NDEzMTQwMloXDTM1MTEwNDEzMTQwMlowIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRp
+ bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvP2BQ
+ wMB007chmstkFdsSMgy+3t2LrsKrUWGCp12ERHXsOygz3FtIXtJ9m2qQBAoyeEUE
+ ku93NCN8EdwMA8RItP6aN2rjqDkYNsI4Lf9R/cRLxdIKWHxV0uZa8bW7NCluhcY3
+ /rNPC3ulk+mAkB2Yk6e3sVMuvHNVRzbXKjEaHQ4k42FR+m+t4eMUp9lFsaWtTNBG
+ At7z2kwRPTVgCoeSP6QKParhLw2OQLDkswPsnmxjx/eUfzMZk+1p2QaqlNzb3Byw
+ mXbFdw89vJixXTMsEE9LBGt3xAig+wBL4KdXIVVUxeH4SvzsRJ5eesM3BzEsYR8O
+ qA2z6+g2/OERpldfAgMBAAGjdTBzMB0GA1UdDgQWBBRkhkF1SOCADGY5xIRUHCoJ
+ bLvqtTBSBgNVHREESzBJghdkZXZpZHAubm90dGluZ2hhbS5hYy51a4YuaHR0cHM6
+ Ly9kZXZpZHAubm90dGluZ2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+ 9w0BAQsFAAOCAQEAmiN8jb5MMsq9+lawIyf/OXd1wdAQ22Difv6/Q9zd1H1xzk84
+ okxYfdw3zH/F4ciK6MgEs4t/CUR4X9vMmA70uTKpcQjm5t9BScVvXftRGb2grGHs
+ PDeuuzCs4g9U4AdyxqrdxHZlz9rcT9XboWw61MFZIeklZRUjHU6lz6mVdxqKAoRY
+ M97HPqVv54uHdf5JrxSoN788L0nro+0Pk/ntS2YP6vNMkQ9JERnK1x3cONyJ8W6X
+ yv5xY3TkUJD4Q0hiiZ0L5uw1uDqXL6s2rHH6eQBPcr1Ju78t6hK0AfxGTalhlCiH
+ LBzKoSgVjHzieZ11lJXFwnCZmBIpMeK5rouxOg==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST/SLO"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://devidp.nottingham.ac.uk/idp/profile/Shibboleth/SSO"/>
@@ -62,60 +104,103 @@
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDRzCCAi+gAwIBAgIUPod7Sbr/56mHA3U++HPjhmWY37wwDQYJKoZIhvcNAQEL
+ BQAwIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRpbmdoYW0uYWMudWswHhcNMTUxMTA0
+ MTMxNDAzWhcNMzUxMTA0MTMxNDAzWjAiMSAwHgYDVQQDDBdkZXZpZHAubm90dGlu
+ Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIUmA1Je
+ uraCsBviSJhTzCsEiO9rLF1wFC79ZdKMM8+cRsBV8Wg2J3NTEsXdP3RDwaV7DU1i
+ DvqH0kkHd1TeTVWTBLy5tE5oSBI+XrUMWlW1+oKVRRgxuWwJinG9OzJGkLk3kPiC
+ wvmnh2oP/CvvBQFR7jXwzLETMX+ReJo8Qrm/i3uIatYnC+QjqXtiq32q+HrWm3/m
+ kbmbomaLhI/4eWAhyeCgbfkzJUm/J6/omhonCF2cTT9mAYTj/zEPkaIfOEsz/YoX
+ GZ1C3oJxMboECHwlXKrov4UBxcWybejM/w2tZ9hy+Dz98HBa9ktj8D+YGj17j44v
+ blKdnIvLNLeB2AECAwEAAaN1MHMwHQYDVR0OBBYEFOVrC+SsmuraLXapXXAJ1KiG
+ p0KlMFIGA1UdEQRLMEmCF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrhi5odHRwczov
+ L2RldmlkcC5ub3R0aW5naGFtLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+ DQEBCwUAA4IBAQCE/hCKcHULJtiEIvbaWVj/cJ/5djjVOq5yWp3SKqXr7QuNXhH3
+ vcyDRlSRAgM5sYztCetRizr8wvir6uQg8yThQ7a2haSKDpSSvrDlsbiN25QNcSPy
+ tHxbV/cmcPuBJqVuoSLGhl56Ak8cWcu+Gsv49f57ZwWdPry6nNxojf9T6QZ5Yjue
+ CRXV9/nKPeMyud0L9DOs6Fwv5PvVfGRqck+3GzLqFLqqd9bMEBizSqxOtitRkI6E
+ XX4b72sjaXxZmhZKx9OJDc+qb5JKIfPAhy/WMU5j8nvV1lMXA7ADQHEc6z0wcQAB
+ W6z4doMJR/vjhdSNsL+BscENO7S8TLwNerEG
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVAJByt+Pqvd0AQkDuileWY3HzdFCuMA0GCSqGSIb3DQEB
+ CwUAMCIxIDAeBgNVBAMMF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrMB4XDTE1MTEw
+ NDEzMTQwMFoXDTM1MTEwNDEzMTQwMFowIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRp
+ bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFjocT
+ hMLkbIhipB+LoOS6gnhQ926P+lwkbjm4L1k1z7L9Br1+FWy6y9A87C27vjl3NVmn
+ Mb3bOJoSWzO4zhCTXKIXwsGE4p/xU27tkJrhmWSiaGIgI0yIpgJ9VqffiylMYsbB
+ TMdJZKnRCkcsT3u9hNCrZTFciX6dCuTx1eG/O/gnP1Tsv1VgZNDGkIpQ2FGyGvqf
+ CnDsoYauqQboetyMbi35kNtzyHEeQlFGdf0TzcRu4+M9Iu8m8gdysHwVI6ooNgCh
+ rPkqsiRqN8QxLehGbb2iUkCBUm1ozIJ6gI/ISju9NU2rPvnGvEDIhdahN8he+SBB
+ nWIyYSigzFIiKRB1AgMBAAGjdTBzMB0GA1UdDgQWBBSecvscFzbVdcNqNo6BYvId
+ PbEB5DBSBgNVHREESzBJghdkZXZpZHAubm90dGluZ2hhbS5hYy51a4YuaHR0cHM6
+ Ly9kZXZpZHAubm90dGluZ2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+ 9w0BAQsFAAOCAQEANDNxfMHsXfT3qTlrHhHtqA+POFxFXmbVIl8eVyaRWDYt6CSh
+ ASNdkJ5JeAqyH+hi99ck/uEBHDOwkPbDz9mS5sXYQWlM/flJgPvfQhdH39x5I+89
+ E65VMCpVXIxSOimcv2e2T/6wN8LfeVxrdX/xqxTlwgMFITWiH0CBV32BYwnSTyWv
+ uA//1B+e5rrZieEDFpPIKp88kllHPI65gOM5BtM/7e7dSrP6DDFGQ9Cka2PKJN42
+ MSspvYO5t2896ElI8y5uo+WqEJJYQK5tUMEWHrEv4iKJBMh6o1RF0IKPsqfdbDXh
+ /pucELdoD3QB/+Y00gYUkW0ahafVQHPPmbXEhg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEqDCCA5CgAwIBAgIQIQ1rs9m1C2AoNe0z3fesqjANBgkqhkiG9w0BAQsFADBk
- MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
- QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
- Q0EgMjAeFw0xNDEwMzEwMDAwMDBaFw0xNTEwMzEyMzU5NTlaMEUxITAfBgNVBAsT
- GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXZGV2aWRwLm5vdHRp
- bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsTxKr
- cTyAanJZyfCgwfEL39/arCojde/S4J+QXJa7CmMUmq6sxgHC4si6meAOKFzyW07H
- 2P/2F1HSZ2pX7TAcZV9W7lWL+fTD7BoPMHvBT5d9RpiU0tF3ZagNDGNnk4RdX4kC
- 13qmrv8gzhMyXvrc7r6E4d0td2J/iQrkw5hlLKL7OaqP7gckxkbN2DtVQXNn7HUE
- GQtZvFURoGeATqZlOOYez6+h26gYk3ay1QTPMHYVG40XUy9/j2EF3m2zyFzUei4u
- YCD5ZvWXJZEjqZ0hjA6yzRdvAmyZQ4DdfcXHYhuKlRwe380tXKW0HSh0rYVXuVvG
- rZSC5YbcUwwrrqgfAgMBAAGjggFzMIIBbzAfBgNVHSMEGDAWgBRb0IocmjJb4LXd
- llQb4YYosP22vTAdBgNVHQ4EFgQUuUOC7Vl12WJDMvG4oBhHeh/OxtcwDgYDVR0P
- AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
- AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
- HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xD
- QTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51
- c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6
- Ly9vY3NwLnVzZXJ0cnVzdC5jb20wIgYDVR0RBBswGYIXZGV2aWRwLm5vdHRpbmdo
- YW0uYWMudWswDQYJKoZIhvcNAQELBQADggEBADldm3QMEZof/isHRRXSw7tnKOHK
- geH8zqcCXYYGIdUABnGtUew/iPn0lA54gfKsnF+apMHUvcYA4/FvSFEg7C8A8Zya
- BcPakbJP2NkV2VCpy2wGVo2pYIpm9jZLsZdFoI4NsRlSm4//hflxkBMJkYI0wfut
- NfElPVdrZunLvBrMKc046ehphPbb55jy3uEUfC4kP+/E8rof90uU6j5aVSXESjGm
- tpv40MnM4G0vOGHGXDd4kMAMAkmYEN88r4pV3Y10o9ZUhcyB0o0vPCYjSNOf8GGq
- O0clm/8A13wY2x0gBIA6Lbs2XDEH0g4VU7LGnScQk5JPkTodVHlEpzq2meA=
+ MIIDSDCCAjCgAwIBAgIVALhfnz8SVgCdbIxwq62snEekShFkMA0GCSqGSIb3DQEB
+ CwUAMCIxIDAeBgNVBAMMF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrMB4XDTE1MTEw
+ NDEzMTQwMloXDTM1MTEwNDEzMTQwMlowIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRp
+ bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvP2BQ
+ wMB007chmstkFdsSMgy+3t2LrsKrUWGCp12ERHXsOygz3FtIXtJ9m2qQBAoyeEUE
+ ku93NCN8EdwMA8RItP6aN2rjqDkYNsI4Lf9R/cRLxdIKWHxV0uZa8bW7NCluhcY3
+ /rNPC3ulk+mAkB2Yk6e3sVMuvHNVRzbXKjEaHQ4k42FR+m+t4eMUp9lFsaWtTNBG
+ At7z2kwRPTVgCoeSP6QKParhLw2OQLDkswPsnmxjx/eUfzMZk+1p2QaqlNzb3Byw
+ mXbFdw89vJixXTMsEE9LBGt3xAig+wBL4KdXIVVUxeH4SvzsRJ5eesM3BzEsYR8O
+ qA2z6+g2/OERpldfAgMBAAGjdTBzMB0GA1UdDgQWBBRkhkF1SOCADGY5xIRUHCoJ
+ bLvqtTBSBgNVHREESzBJghdkZXZpZHAubm90dGluZ2hhbS5hYy51a4YuaHR0cHM6
+ Ly9kZXZpZHAubm90dGluZ2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+ 9w0BAQsFAAOCAQEAmiN8jb5MMsq9+lawIyf/OXd1wdAQ22Difv6/Q9zd1H1xzk84
+ okxYfdw3zH/F4ciK6MgEs4t/CUR4X9vMmA70uTKpcQjm5t9BScVvXftRGb2grGHs
+ PDeuuzCs4g9U4AdyxqrdxHZlz9rcT9XboWw61MFZIeklZRUjHU6lz6mVdxqKAoRY
+ M97HPqVv54uHdf5JrxSoN788L0nro+0Pk/ntS2YP6vNMkQ9JERnK1x3cONyJ8W6X
+ yv5xY3TkUJD4Q0hiiZ0L5uw1uDqXL6s2rHH6eQBPcr1Ju78t6hK0AfxGTalhlCiH
+ LBzKoSgVjHzieZ11lJXFwnCZmBIpMeK5rouxOg==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
<OrganizationDisplayName xml:lang="en">University of Nottingham : Development</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/is/about/index.aspx/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>University of Nottingham IT Helpline</GivenName>
- <EmailAddress>mailto:itservicedesk@nottingham.ac.uk</EmailAddress>
+ <GivenName>Craig</GivenName>
+ <SurName>Betts</SurName>
+ <EmailAddress>mailto:craig.betts@nottingham.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Craig</GivenName>
<SurName>Betts</SurName>
- <EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</EmailAddress>
+ <EmailAddress>mailto:craig.betts@nottingham.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml
index 036ec043..bc30cc14 100644
--- a/swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml
@@ -14,32 +14,24 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEtjCCA56gAwIBAgIRAIO1zR0sJXDtO4ivkEIP7y8wDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMTUwMDAwMDBaFw0xNTExMTUyMzU5NTlaMIGKMQswCQYD
- VQQGEwJHQjETMBEGA1UECBMKTWVyc2V5c2lkZTESMBAGA1UEBxMJTGl2ZXJwb29s
- MSQwIgYDVQQKExtMaXZlcnBvb2wgQ29tbXVuaXR5IENvbGxlZ2UxDDAKBgNVBAsT
- A0xDQzEeMBwGA1UEAxMVZGlhbGVjdC5saXYtc3R1LmNvLnVrMIIBIjANBgkqhkiG
- 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtuDrD0qkEOW4lgDg3jJZyrp+Ubyfw8ikv8xf
- EUE5zFYTswon1XLddA+RSt0UL0+vM3KRALgl6kOnw6cMWyKxfDoNCDLMcKWtN39L
- GSyA9cWidzRVrYQ2vRJEv6MUwBo2PMiLIq5Vmyh/A4H7jYviDPDr2QiyL2FNCWYp
- xZiXDe4F9zj/CNGsfAOjUFjBVGxXyqdIPRmsRH4XNDjDigTepjIunHOZUS6IMWkx
- RiPtovbpo5EifcNbTJo+lVXyX1lV/dij33GAiVyRSLaNfDTlcVQDrHj0tn2jP8N1
- il2KohkqRNbfCvyKRrj1h674dXfzVCvt9iVFnJlVEuN0boLcbQIDAQABo4IBaDCC
- AWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLVg
- CxI5oup0l0VWVDHQPt1n1uAQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
- MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
- AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
- YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
- AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
- KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeC
- FWRpYWxlY3QubGl2LXN0dS5jby51azANBgkqhkiG9w0BAQUFAAOCAQEAf68MvoBq
- uWJVyE652ZENKikd4eY99UShXF29WujSt5olh9on15TdKBF6TfY+a3PdfvNHLTfS
- nTzghinaAf78yzeKFmS1QTPMiNRcKYMLi+4dwpgnb5DuiSvPhz9E0H1a+TkXmq4M
- 36ZxOA8QqFuHz2k1s0NG262BPy1qerEqnj5QJzs7mWKGxobpu9csfiU0NpZejFhv
- rqomrqYHhrY6GYOENekKOTmbf8USDpzDyWXP0jI9ZpnF6OsC3PdfV3zcs1FGJMXr
- 6330NH1Unn35VsA+kr8kNc+XLCOgK/cw23VLIkroKJgzWdhNo2bEYdQnrZ0T65OZ
- ZpWxzCt6Sli/hg==
+ MIIDPzCCAiegAwIBAgIUe2/KXRs2WbpKulqXL6OOhVDFMWQwDQYJKoZIhvcNAQEF
+ BQAwIDEeMBwGA1UEAwwVZGlhbGVjdC5saXYtc3R1LmNvLnVrMB4XDTE1MTEwNTE1
+ MzMyMVoXDTM1MTEwNTE1MzMyMVowIDEeMBwGA1UEAwwVZGlhbGVjdC5saXYtc3R1
+ LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhlsncxjioWzh
+ osMLSvqjM8GS7uPtTyX82vYQXeMRZmWYW1APaWHUom5fwJ21YORaVn4XYWQSS7uM
+ vfW+MV3bIUGqCUSvXMztGacSbY/NR+i0XQ583C8AL523KO7SLX+WyPMwmXcmffJt
+ n7d9g5Skosuuiy/grOQEmHQKE/XlpH4RiRh/kLQb38kG5ZhL9SR39wMfaWZzWBhc
+ YRpRFKjLFiVAHnKYRQ1fu9F02A89zFUEv+pTv+i3Vz9hL0q/TF61Oi7Tk5A57vMQ
+ CYTZ4DSx0cjCsjzxOLtQ6fwN10RTUjHrxGouFg/vKFpCZyi9PBkfxp6z6/6snZQP
+ AItRT6wBMQIDAQABo3EwbzAdBgNVHQ4EFgQU7OR2K7Vgwe2rTHCcPZ2+DEhTJsMw
+ TgYDVR0RBEcwRYIVZGlhbGVjdC5saXYtc3R1LmNvLnVrhixodHRwczovL2RpYWxl
+ Y3QubGl2LXN0dS5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOC
+ AQEAbiIW2ppSfDwBdrZJE1itt93UZooBxRh5NR3yoB+vUjoBOFMSSvUZkPlXBtsQ
+ FE5jXQZAwxRU0PBa679V9L4wMpgzp3S76m2lggO5fjD/VlbQddaRsYNfRGQ1ekzR
+ oFW18gZVO5i9PmqI8U3uNuMLgw3ZpBFn4t1x2M+7lFGLeA5xxr+GUQ3sZ2udm3AW
+ NbPwGN6xXZAVDtJ/y98Z+HLPvWyQH7C8NEyrI1zW/6GhhnzCwcgN3/nBeG+YLyab
+ XGqVeeQnBT4gvDRcb7yP1rxmt4yKXkKshf4xz/pDZBjK1LWlkkZz64LFByHicBJw
+ VrLt5484eyAnlQnkdiEKJiL+BA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -61,32 +53,24 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEtjCCA56gAwIBAgIRAIO1zR0sJXDtO4ivkEIP7y8wDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMTUwMDAwMDBaFw0xNTExMTUyMzU5NTlaMIGKMQswCQYD
- VQQGEwJHQjETMBEGA1UECBMKTWVyc2V5c2lkZTESMBAGA1UEBxMJTGl2ZXJwb29s
- MSQwIgYDVQQKExtMaXZlcnBvb2wgQ29tbXVuaXR5IENvbGxlZ2UxDDAKBgNVBAsT
- A0xDQzEeMBwGA1UEAxMVZGlhbGVjdC5saXYtc3R1LmNvLnVrMIIBIjANBgkqhkiG
- 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtuDrD0qkEOW4lgDg3jJZyrp+Ubyfw8ikv8xf
- EUE5zFYTswon1XLddA+RSt0UL0+vM3KRALgl6kOnw6cMWyKxfDoNCDLMcKWtN39L
- GSyA9cWidzRVrYQ2vRJEv6MUwBo2PMiLIq5Vmyh/A4H7jYviDPDr2QiyL2FNCWYp
- xZiXDe4F9zj/CNGsfAOjUFjBVGxXyqdIPRmsRH4XNDjDigTepjIunHOZUS6IMWkx
- RiPtovbpo5EifcNbTJo+lVXyX1lV/dij33GAiVyRSLaNfDTlcVQDrHj0tn2jP8N1
- il2KohkqRNbfCvyKRrj1h674dXfzVCvt9iVFnJlVEuN0boLcbQIDAQABo4IBaDCC
- AWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLVg
- CxI5oup0l0VWVDHQPt1n1uAQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
- MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
- AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
- YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
- AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
- KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeC
- FWRpYWxlY3QubGl2LXN0dS5jby51azANBgkqhkiG9w0BAQUFAAOCAQEAf68MvoBq
- uWJVyE652ZENKikd4eY99UShXF29WujSt5olh9on15TdKBF6TfY+a3PdfvNHLTfS
- nTzghinaAf78yzeKFmS1QTPMiNRcKYMLi+4dwpgnb5DuiSvPhz9E0H1a+TkXmq4M
- 36ZxOA8QqFuHz2k1s0NG262BPy1qerEqnj5QJzs7mWKGxobpu9csfiU0NpZejFhv
- rqomrqYHhrY6GYOENekKOTmbf8USDpzDyWXP0jI9ZpnF6OsC3PdfV3zcs1FGJMXr
- 6330NH1Unn35VsA+kr8kNc+XLCOgK/cw23VLIkroKJgzWdhNo2bEYdQnrZ0T65OZ
- ZpWxzCt6Sli/hg==
+ MIIDPzCCAiegAwIBAgIUe2/KXRs2WbpKulqXL6OOhVDFMWQwDQYJKoZIhvcNAQEF
+ BQAwIDEeMBwGA1UEAwwVZGlhbGVjdC5saXYtc3R1LmNvLnVrMB4XDTE1MTEwNTE1
+ MzMyMVoXDTM1MTEwNTE1MzMyMVowIDEeMBwGA1UEAwwVZGlhbGVjdC5saXYtc3R1
+ LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhlsncxjioWzh
+ osMLSvqjM8GS7uPtTyX82vYQXeMRZmWYW1APaWHUom5fwJ21YORaVn4XYWQSS7uM
+ vfW+MV3bIUGqCUSvXMztGacSbY/NR+i0XQ583C8AL523KO7SLX+WyPMwmXcmffJt
+ n7d9g5Skosuuiy/grOQEmHQKE/XlpH4RiRh/kLQb38kG5ZhL9SR39wMfaWZzWBhc
+ YRpRFKjLFiVAHnKYRQ1fu9F02A89zFUEv+pTv+i3Vz9hL0q/TF61Oi7Tk5A57vMQ
+ CYTZ4DSx0cjCsjzxOLtQ6fwN10RTUjHrxGouFg/vKFpCZyi9PBkfxp6z6/6snZQP
+ AItRT6wBMQIDAQABo3EwbzAdBgNVHQ4EFgQU7OR2K7Vgwe2rTHCcPZ2+DEhTJsMw
+ TgYDVR0RBEcwRYIVZGlhbGVjdC5saXYtc3R1LmNvLnVrhixodHRwczovL2RpYWxl
+ Y3QubGl2LXN0dS5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOC
+ AQEAbiIW2ppSfDwBdrZJE1itt93UZooBxRh5NR3yoB+vUjoBOFMSSvUZkPlXBtsQ
+ FE5jXQZAwxRU0PBa679V9L4wMpgzp3S76m2lggO5fjD/VlbQddaRsYNfRGQ1ekzR
+ oFW18gZVO5i9PmqI8U3uNuMLgw3ZpBFn4t1x2M+7lFGLeA5xxr+GUQ3sZ2udm3AW
+ NbPwGN6xXZAVDtJ/y98Z+HLPvWyQH7C8NEyrI1zW/6GhhnzCwcgN3/nBeG+YLyab
+ XGqVeeQnBT4gvDRcb7yP1rxmt4yKXkKshf4xz/pDZBjK1LWlkkZz64LFByHicBJw
+ VrLt5484eyAnlQnkdiEKJiL+BA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -104,11 +88,11 @@
<ContactPerson contactType="support">
<GivenName>Dale</GivenName>
<SurName>Davies</SurName>
- <EmailAddress>mailto:dale.davies@liv-coll.ac.uk</EmailAddress>
+ <EmailAddress>mailto:dale.davies@shared-ed.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Dale</GivenName>
<SurName>Davies</SurName>
- <EmailAddress>mailto:dale.davies@liv-coll.ac.uk</EmailAddress>
+ <EmailAddress>mailto:dale.davies@shared-ed.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml b/swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml
index aebcee75..f95705be 100644
--- a/swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://discourse.sci-gaia.eu/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://discourse.sci-gaia.eu/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-26T14:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
@@ -7,6 +7,7 @@
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
diff --git a/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml
index 97ffba2a..b193f9f2 100644
--- a/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml
@@ -26,6 +26,32 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDTzCCAjegAwIBAgIUZZAevsduZb+ksg12hWJz0it6obcwDQYJKoZIhvcNAQEF
+ BQAwJDEiMCAGA1UEAxMZZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51azAeFw0xNTEx
+ MjUxMzUyNTdaFw0zNTExMjUxMzUyNTdaMCQxIjAgBgNVBAMTGWRsaWItYnJld2Rv
+ Zy51Y3MuZWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT
+ lxvyZDrQk4NmB/8eCqgu+4rOJp6JW7bPXMkmmnibVbGDuGzyeD66GKuN/p4ev/nS
+ Xz9uUgX/5Z/30hNEANLIMFRW2Ds3zytISLnZ9plSOWJ456CEb1ne84H7B9N/VAHB
+ /eM+7zbNnzL4BhkYC64Zu2KzJvZzdsCe6mEUr6is6imn82YLyy3jzKWyuEsTxesN
+ 3XZqdPfehjy39jcgkG8DQJGgwqCxP4hyLhMCjo6lgZ7GO08wdTMHEkjP9Wf/WXPw
+ TP/VN3DBZmgHQ9XgCa45WYxab93+HnL258UscDOwYBeOuXLWnlNT2wfWqFU0lUD3
+ +2WH/tE3wjkCejiAXeaPAgMBAAGjeTB3MFYGA1UdEQRPME2CGWRsaWItYnJld2Rv
+ Zy51Y3MuZWQuYWMudWuGMGh0dHBzOi8vZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51
+ ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUHlvSVqIZuSLPEnkuljdJiy7YlzEw
+ DQYJKoZIhvcNAQEFBQADggEBAGV7em8jposBaytzgw3CYyCSLmAOkqaVMrUFVyQ1
+ KPA84EAS+K7/7d4hg1VMO3KQVB6oTUfzoMmz1AagDU8qeZbaD3zN/dPS1aNnEfPg
+ jizWl9pQeeiIYiLyVOY2+T2FYX+Kzf4w2tlIpM+1C2znVVJQcPTIIIwc3gQFgV3F
+ 5MLKXUMlpo3O4npIUXzR61O8EfjScnIaE/D3+rjbNStxfMebuyUi9G5THXZOOrbd
+ APu5rR/r9x/dJ3F3YTXGx2Mw3NfYYX7XP3UxvKKSCwCb5aQ/kEIJjE9hUIEIEdma
+ oobJ79OhVG+IPVW5qutgYavQ5qKeSCCa5Pe6/7Yww8L9Lks=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDUDCCAjigAwIBAgIVANeccAPs62oIBt2itOeJ9C/Li19lMA0GCSqGSIb3DQEB
BQUAMCQxIjAgBgNVBAMTGWRsaWItYnJld2RvZy51Y3MuZWQuYWMudWswHhcNMTQw
NTA3MTMzNTU3WhcNMzQwNTA3MTMzNTU3WjAkMSIwIAYDVQQDExlkbGliLWJyZXdk
@@ -91,6 +117,32 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDTzCCAjegAwIBAgIUZZAevsduZb+ksg12hWJz0it6obcwDQYJKoZIhvcNAQEF
+ BQAwJDEiMCAGA1UEAxMZZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51azAeFw0xNTEx
+ MjUxMzUyNTdaFw0zNTExMjUxMzUyNTdaMCQxIjAgBgNVBAMTGWRsaWItYnJld2Rv
+ Zy51Y3MuZWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT
+ lxvyZDrQk4NmB/8eCqgu+4rOJp6JW7bPXMkmmnibVbGDuGzyeD66GKuN/p4ev/nS
+ Xz9uUgX/5Z/30hNEANLIMFRW2Ds3zytISLnZ9plSOWJ456CEb1ne84H7B9N/VAHB
+ /eM+7zbNnzL4BhkYC64Zu2KzJvZzdsCe6mEUr6is6imn82YLyy3jzKWyuEsTxesN
+ 3XZqdPfehjy39jcgkG8DQJGgwqCxP4hyLhMCjo6lgZ7GO08wdTMHEkjP9Wf/WXPw
+ TP/VN3DBZmgHQ9XgCa45WYxab93+HnL258UscDOwYBeOuXLWnlNT2wfWqFU0lUD3
+ +2WH/tE3wjkCejiAXeaPAgMBAAGjeTB3MFYGA1UdEQRPME2CGWRsaWItYnJld2Rv
+ Zy51Y3MuZWQuYWMudWuGMGh0dHBzOi8vZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51
+ ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUHlvSVqIZuSLPEnkuljdJiy7YlzEw
+ DQYJKoZIhvcNAQEFBQADggEBAGV7em8jposBaytzgw3CYyCSLmAOkqaVMrUFVyQ1
+ KPA84EAS+K7/7d4hg1VMO3KQVB6oTUfzoMmz1AagDU8qeZbaD3zN/dPS1aNnEfPg
+ jizWl9pQeeiIYiLyVOY2+T2FYX+Kzf4w2tlIpM+1C2znVVJQcPTIIIwc3gQFgV3F
+ 5MLKXUMlpo3O4npIUXzR61O8EfjScnIaE/D3+rjbNStxfMebuyUi9G5THXZOOrbd
+ APu5rR/r9x/dJ3F3YTXGx2Mw3NfYYX7XP3UxvKKSCwCb5aQ/kEIJjE9hUIEIEdma
+ oobJ79OhVG+IPVW5qutgYavQ5qKeSCCa5Pe6/7Yww8L9Lks=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDUDCCAjigAwIBAgIVANeccAPs62oIBt2itOeJ9C/Li19lMA0GCSqGSIb3DQEB
BQUAMCQxIjAgBgNVBAMTGWRsaWItYnJld2RvZy51Y3MuZWQuYWMudWswHhcNMTQw
NTA3MTMzNTU3WhcNMzQwNTA3MTMzNTU3WjAkMSIwIAYDVQQDExlkbGliLWJyZXdk
diff --git a/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml b/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml
index bea02dc1..06b4a799 100644
--- a/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml
+++ b/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml
@@ -76,7 +76,7 @@ FLSCieH5zHtHuRj8cSafaBgJoQvFTOkZoD8D8N9CcCIKBUQleyBNpRBIfc0=
<md:Organization>
<md:OrganizationName xml:lang="en">unibe.ch</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="de">Universität Bern</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">University of Bern</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Universität Bern</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="de">http://www.unibe.ch/</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://www.unibe.ch/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml b/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml
index 3fa5676f..6bb9f74a 100644
--- a/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml
@@ -23,28 +23,23 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxLDAqBgNVBAoTI1VGUy1Vbml2
-ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMTIwMAYDVQQLFClOVEktTsO6Y2xl
-byBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqGSIb3DQEJARYL
-Y2FmZUB1ZnMuYnIxEDAOBgNVBAcTB0FyYWNhanUxEDAOBgNVBAgTB1NlcmdpcGUx
-CzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0xNDA0MTAx
-MjMxNDFaFw0xOTA0MDkxMjMxNDFaMIHIMSwwKgYDVQQKEyNVRlMtVW5pdmVyc2lk
-YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEyMDAGA1UECxQpTlRJLU7DumNsZW8gZGUg
-VGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xGjAYBgkqhkiG9w0BCQEWC2NhZmVA
-dWZzLmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYDVQQIEwdTZXJnaXBlMQswCQYD
-VQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYXXauTI4yRaEuEoeyv
-KultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8zCgEmnbjZVuG01q2
-eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7XkhbD5dA6PGtwyCu+43h
-VKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh3Gf/V01JdGgIhLls
-Mf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOTSK/QZzbOr6TVOuC0
-8Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAH8eyp2vC7zx5oFdqWzFqZXkjGRQyih+grWeiNb3qCviPcCacyUl
-YQ2NuQEEDqManKPBPxAscO7UP1Rr9g3Ggh0vkL6KAxQqEFRwWxUkCnRd3z/TUrys
-aIt7WrF0J0mZx8qZQPasestDbSehM74s+pNsACQxY/zlbXD2Ybft9Mj62kxSdeMx
-JjjUtWoCYJwdzXAklw8r0ot7/TnVx1nNZRCV1mwFtzcKuwz8M5JDcI9sBlH+/oRd
-d6xRz2iXP9guO9SjSdWIz/LP3Px/E+ASWZ1LZBMwv8tTBmYbo9tEdUzG4DWEMwS2
-ppG+3mm7IVx2FODAFkApZmdPV4osxno36Ww=
+ MIIDIjCCAgoCAQAwDQYJKoZIhvcNAQEFBQAwVzEoMCYGA1UEChMfVW5pdmVyc2lk
+YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEMMAoGA1UECxMDTlRJMQswCQYDVQQGEwJC
+UjEQMA4GA1UEAxMHZG91cmFkbzAeFw0xNTA1MTUxNDI4MDJaFw0xODA1MTQxNDI4
+MDJaMFcxKDAmBgNVBAoTH1VuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFNlcmdpcGUx
+DDAKBgNVBAsTA05USTELMAkGA1UEBhMCQlIxEDAOBgNVBAMTB2RvdXJhZG8wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFff+p/RDQabbgSlBQLdM0vDaf
+qHQcuFVjejHxOuYTYP76mjAovqQfdumR6zWD9cw6X/KsrD+Au/oRnSzSqE0R3dB5
+hPFIj/sIslDJ0YO5kHTGYVzsqdGp5sbIJ3N06+1g3tkk+hW/1pftIU5X4PgCN1WL
+5Ib+kqs7BjPjOPwhnR1VSwGp31WU8KfRihSvBDnQugH51dPIUHm3UeVbPo4cS5/S
+pGDO5zbpG5FB6Mj571G71szB3sxU2fGFbcp6xM0ZMLXHmWYHXwPKM05IOgNRan3b
+Xtbj0Ca4aMV5xMpx59CeoLBirYwH2/psTkeQbZL7qTAi92oDb5v9Wh5lFNWdAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAKPnwQGVt9Fe3x5FyIp6PXbqmZxvO2vELwNw
+L0w5lrI6p3l1hSTwIfhynEOUBoLnuQOgKa4lNEfe0I5/LRdUVvvvDpWri1DuGEtl
+28xH4m8Buwbs6NOed7zc/6sAi13t1CG1oJ8TgjGHVMH0K3bE+AHE086qLsndxVvf
+6ccAOSBncTRv9xqESUX8tveu5JS5VR4SlRzTUvE+6zDQknLuT7gjuiCOEDX9IOso
+h2KToeZCA4/5zJzRpYL6Yh7m1SVptKtpi9zn+QVPdpZi3cUhWeNE96uifumvXt6M
+4nVAfP2nR1ImFjXDZPD1cf+m1ylSz40jEbkpowOXXiWowojAjbw=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -67,28 +62,23 @@ ppG+3mm7IVx2FODAFkApZmdPV4osxno36Ww=
<ds:X509Data>
<ds:X509Certificate>
-MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxLDAqBgNVBAoTI1VGUy1Vbml2
-ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMTIwMAYDVQQLFClOVEktTsO6Y2xl
-byBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqGSIb3DQEJARYL
-Y2FmZUB1ZnMuYnIxEDAOBgNVBAcTB0FyYWNhanUxEDAOBgNVBAgTB1NlcmdpcGUx
-CzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0xNDA0MTAx
-MjMxNDFaFw0xOTA0MDkxMjMxNDFaMIHIMSwwKgYDVQQKEyNVRlMtVW5pdmVyc2lk
-YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEyMDAGA1UECxQpTlRJLU7DumNsZW8gZGUg
-VGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xGjAYBgkqhkiG9w0BCQEWC2NhZmVA
-dWZzLmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYDVQQIEwdTZXJnaXBlMQswCQYD
-VQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYXXauTI4yRaEuEoeyv
-KultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8zCgEmnbjZVuG01q2
-eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7XkhbD5dA6PGtwyCu+43h
-VKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh3Gf/V01JdGgIhLls
-Mf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOTSK/QZzbOr6TVOuC0
-8Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAH8eyp2vC7zx5oFdqWzFqZXkjGRQyih+grWeiNb3qCviPcCacyUl
-YQ2NuQEEDqManKPBPxAscO7UP1Rr9g3Ggh0vkL6KAxQqEFRwWxUkCnRd3z/TUrys
-aIt7WrF0J0mZx8qZQPasestDbSehM74s+pNsACQxY/zlbXD2Ybft9Mj62kxSdeMx
-JjjUtWoCYJwdzXAklw8r0ot7/TnVx1nNZRCV1mwFtzcKuwz8M5JDcI9sBlH+/oRd
-d6xRz2iXP9guO9SjSdWIz/LP3Px/E+ASWZ1LZBMwv8tTBmYbo9tEdUzG4DWEMwS2
-ppG+3mm7IVx2FODAFkApZmdPV4osxno36Ww=
+MIIDIjCCAgoCAQAwDQYJKoZIhvcNAQEFBQAwVzEoMCYGA1UEChMfVW5pdmVyc2lk
+YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEMMAoGA1UECxMDTlRJMQswCQYDVQQGEwJC
+UjEQMA4GA1UEAxMHZG91cmFkbzAeFw0xNTA1MTUxNDI4MDJaFw0xODA1MTQxNDI4
+MDJaMFcxKDAmBgNVBAoTH1VuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFNlcmdpcGUx
+DDAKBgNVBAsTA05USTELMAkGA1UEBhMCQlIxEDAOBgNVBAMTB2RvdXJhZG8wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFff+p/RDQabbgSlBQLdM0vDaf
+qHQcuFVjejHxOuYTYP76mjAovqQfdumR6zWD9cw6X/KsrD+Au/oRnSzSqE0R3dB5
+hPFIj/sIslDJ0YO5kHTGYVzsqdGp5sbIJ3N06+1g3tkk+hW/1pftIU5X4PgCN1WL
+5Ib+kqs7BjPjOPwhnR1VSwGp31WU8KfRihSvBDnQugH51dPIUHm3UeVbPo4cS5/S
+pGDO5zbpG5FB6Mj571G71szB3sxU2fGFbcp6xM0ZMLXHmWYHXwPKM05IOgNRan3b
+Xtbj0Ca4aMV5xMpx59CeoLBirYwH2/psTkeQbZL7qTAi92oDb5v9Wh5lFNWdAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAKPnwQGVt9Fe3x5FyIp6PXbqmZxvO2vELwNw
+L0w5lrI6p3l1hSTwIfhynEOUBoLnuQOgKa4lNEfe0I5/LRdUVvvvDpWri1DuGEtl
+28xH4m8Buwbs6NOed7zc/6sAi13t1CG1oJ8TgjGHVMH0K3bE+AHE086qLsndxVvf
+6ccAOSBncTRv9xqESUX8tveu5JS5VR4SlRzTUvE+6zDQknLuT7gjuiCOEDX9IOso
+h2KToeZCA4/5zJzRpYL6Yh7m1SVptKtpi9zn+QVPdpZi3cUhWeNE96uifumvXt6M
+4nVAfP2nR1ImFjXDZPD1cf+m1ylSz40jEbkpowOXXiWowojAjbw=
</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml b/swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml
new file mode 100644
index 00000000..b3d5467b
--- /dev/null
+++ b/swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://drive.asnet.am/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.asnet.am" registrationInstant="2015-08-22T12:46:47Z"/>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://drive.asnet.am/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://drive.asnet.am/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">ASNET-AM Drive</mdui:DisplayName>
+ <mdui:Description xml:lang="en">ASNET-AM Drive is an Internet service to store data in Armenian's cloud storage and retreive or work with these data at any time. It provides a simple web interface and a syncing and sharing capabilities for files, as well as native syncing clients for Mac OS X, iPhone, iPad and Windows. All this will be performed in a secure and rebust environment and free of charge.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://drive.asnet.am/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>*.asnet.am</ds:KeyName>
+ <ds:KeyName>asnet.am</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFkTCCBHmgAwIBAgIRAJGxdi6BndHGs8GWsagMbaYwDQYJKoZIhvcNAQELBQAw
+gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
+VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
+Q0EwHhcNMTUwNjAyMDAwMDAwWhcNMTgwNjAxMjM1OTU5WjCBoTEhMB8GA1UECxMY
+RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
+dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
+QVMuMRwwGgYDVQQLExNDT01PRE8gU1NMIFdpbGRjYXJkMRMwEQYDVQQDFAoqLmFz
+bmV0LmFtMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtYnlRhHME8WP
+4x/2SiMMV25dK9HnrJmrssJVi/A/3Om0cSMVyybohqMcWTLq4s6A1kBSy4pEK7Kl
+3M7qaTBUVOkXZZPn/vpOJoaHR71tG/CClNivpN5Q/a3RA6jRjT20pvUApNzQglwN
+23wYPu5Uz1iLjVT53Bq3HnbuYlI7FIjWKyfHonHnYw0CARJHRXeq/ykFngbxj1ie
+sdtVdrpI4hUDk1o85y4rDuvK1HYcMudI8kbfZ1a8l/3jiA4EnNeoe5fbKQDkP63V
+cN2f1cM3Noj1GGAGYX5sY9PY3d0UmBH/8Kzg4i58E8V4EJTwLLYpSfAXO04+e3Bb
+VKCUUz5vywIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99D
+tDoo2ucwHQYDVR0OBBYEFKjnkZCHfwFjf2kkMGdeTAcM4Q8SMA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjBPBgNVHSAESDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBz
+Oi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmg
+R6BFhkNodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxp
+ZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYB
+BQUHMAKGQ2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZh
+bGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
+Y3NwLmNvbW9kb2NhLmNvbTAfBgNVHREEGDAWggoqLmFzbmV0LmFtgghhc25ldC5h
+bTANBgkqhkiG9w0BAQsFAAOCAQEAAN5hdW1ipGLn9khP5UoSEHFJPuKzR4yzuWrF
+Kc1UamsQLWA2SNvN3Lb+4vj+W7q++aBgmGEjfhw/BWQzFOXfeHHYb8YLBZuweesm
+5neG4kULC4Qpf6tc5LgK0V6geVNHzXnAchLn2KzBhjgMUmvHOJFPSwCJHKSyN2Qc
+lCrQol4CRGiKXH7428yGMgFi2kqdL9xlxxned0/13GfyMVQwUfwmLe2a/HH7nn4k
+iNKDKTPbYWvuDjrIuKskC0uBwkvqEunCqE0beN5/bzfA/XiN7VFQm19o6T/8fwFO
+xAkgTb8s+nKQoqK0D7O7EXRzLd/m825ao8+E21sqAhwodilGeg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFkTCCBHmgAwIBAgIRAJGxdi6BndHGs8GWsagMbaYwDQYJKoZIhvcNAQELBQAw
+gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
+VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
+Q0EwHhcNMTUwNjAyMDAwMDAwWhcNMTgwNjAxMjM1OTU5WjCBoTEhMB8GA1UECxMY
+RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
+dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
+QVMuMRwwGgYDVQQLExNDT01PRE8gU1NMIFdpbGRjYXJkMRMwEQYDVQQDFAoqLmFz
+bmV0LmFtMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtYnlRhHME8WP
+4x/2SiMMV25dK9HnrJmrssJVi/A/3Om0cSMVyybohqMcWTLq4s6A1kBSy4pEK7Kl
+3M7qaTBUVOkXZZPn/vpOJoaHR71tG/CClNivpN5Q/a3RA6jRjT20pvUApNzQglwN
+23wYPu5Uz1iLjVT53Bq3HnbuYlI7FIjWKyfHonHnYw0CARJHRXeq/ykFngbxj1ie
+sdtVdrpI4hUDk1o85y4rDuvK1HYcMudI8kbfZ1a8l/3jiA4EnNeoe5fbKQDkP63V
+cN2f1cM3Noj1GGAGYX5sY9PY3d0UmBH/8Kzg4i58E8V4EJTwLLYpSfAXO04+e3Bb
+VKCUUz5vywIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99D
+tDoo2ucwHQYDVR0OBBYEFKjnkZCHfwFjf2kkMGdeTAcM4Q8SMA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjBPBgNVHSAESDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBz
+Oi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmg
+R6BFhkNodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxp
+ZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYB
+BQUHMAKGQ2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZh
+bGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
+Y3NwLmNvbW9kb2NhLmNvbTAfBgNVHREEGDAWggoqLmFzbmV0LmFtgghhc25ldC5h
+bTANBgkqhkiG9w0BAQsFAAOCAQEAAN5hdW1ipGLn9khP5UoSEHFJPuKzR4yzuWrF
+Kc1UamsQLWA2SNvN3Lb+4vj+W7q++aBgmGEjfhw/BWQzFOXfeHHYb8YLBZuweesm
+5neG4kULC4Qpf6tc5LgK0V6geVNHzXnAchLn2KzBhjgMUmvHOJFPSwCJHKSyN2Qc
+lCrQol4CRGiKXH7428yGMgFi2kqdL9xlxxned0/13GfyMVQwUfwmLe2a/HH7nn4k
+iNKDKTPbYWvuDjrIuKskC0uBwkvqEunCqE0beN5/bzfA/XiN7VFQm19o6T/8fwFO
+xAkgTb8s+nKQoqK0D7O7EXRzLd/m825ao8+E21sqAhwodilGeg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drive.asnet.am/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drive.asnet.am/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drive.asnet.am/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drive.asnet.am/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drive.asnet.am/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drive.asnet.am/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drive.asnet.am/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drive.asnet.am/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drive.asnet.am/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drive.asnet.am/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://drive.asnet.am/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">ASNET-AM Drive</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">ASNET-AM Drive is an Internet service to store data in Armenian's cloud storage and retreive or work with these data at any time. It provides a simple web interface and a syncing and sharing capabilities for files, as well as native syncing clients for Mac OS X, iPhone, iPad and Windows. All this will be performed in a secure and rebust environment and free of charge.</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Academic Scientific Network of Armenia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">ASNET-AM</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.asnet.am/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Andranik</md:GivenName>
+ <md:SurName>Hayrapetyan</md:SurName>
+ <md:EmailAddress>mailto:andranik@ipia.sci.am</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/drupal-pilot-web-01.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/drupal-pilot-web-01.it.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..30f7bc8e
--- /dev/null
+++ b/swamid-interfederations-2.0/drupal-pilot-web-01.it.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://drupal-pilot-web-01.it.ox.ac.uk/shibboleth">
+ <!--
+ This is a "Drupal Pilot production" Shibboleth SP for the University of Oxford.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-12T09:43:31Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.council.ox.ac.uk/Shibboleth.sso/Shibboleth.sso/Login"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDWTCCAkGgAwIBAgIJAM+Hk42onQyyMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
+ BAMTH2RydXBhbC1waWxvdC13ZWItMDEuaXQub3guYWMudWswHhcNMTUxMDA4MTQ0
+ NjU1WhcNMjUxMDA1MTQ0NjU1WjAqMSgwJgYDVQQDEx9kcnVwYWwtcGlsb3Qtd2Vi
+ LTAxLml0Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ 2oUqXTJ+Hn6gKfh4C19sh17bF0nFqnn70E2Le3C9BQbq3kPLCXSJUJqAPINiyCd0
+ ji2O8bNDLh3IrgaTVE0zU3Y8NQfSvsFTiQA9wE9M9CYdRWE+5m0rdiTYxC1aiMs1
+ 7+KDM/4tbY/xWEbGrUKeq92EAId4fw+r+C3D0O6zuaXUTIq3fA7NDR0UUZRaQ2p1
+ 34cXjCkq+D4hTsfrpTPKnQfDI3MfSOUyaFG0tlq1O5BF6w7OtfUlgkBAa6qenlCR
+ 36RyvKzrt9EnREwlqpAz4GJbFqY1ShGtwl9/CP6QWOJu5cD1GH2rL9H+ldQXPdzX
+ FwTYfOGXxoCeoD/g/0Zc2wIDAQABo4GBMH8wXgYDVR0RBFcwVYIfZHJ1cGFsLXBp
+ bG90LXdlYi0wMS5pdC5veC5hYy51a4YyaHR0cHM6Ly9kcnVwYWwtcGlsb3Qtd2Vi
+ LTAxLml0Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFIRg3FGPg1ywm7aE
+ hsPpUfArjxVlMA0GCSqGSIb3DQEBBQUAA4IBAQABdV7iO2QaUUzKzlmMOhzzWE4b
+ Cgcghaowaa8g1qc6zIvSNoqU9imHJTItzv/dfEDM1KX9ppV0hmIu1wE8d6n3lVvZ
+ Gg4JNhsRG+7a4TS6NXZQIrrd3uG2FglMWobTaH5sQsu/GHxHQOTJOHUovB1IweZB
+ sIlMsDAJo38zuab3GSrKkcgDIEAutul42Jv5dquXRxOgjAh+e7ttmgPH3nrzb5/J
+ sRDgx2FFHN5WjgMiQhB8tUcq2OrdtmNQBz5eXT96YoTja1ANxq3AlgqM47yymlNj
+ FjesGc4el4t9A6gSXpuQDFWQisQVxg+lA51tHP2hhIx/3fySzhUu6Pke2iiQ
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.council.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.council.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.council.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.council.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University of Oxford Drupal Pilot production</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Systems Development and Support</GivenName>
+ <EmailAddress>mailto:sysdev@oucs.ox.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Systems Development and Support</GivenName>
+ <EmailAddress>mailto:sysdev@oucs.ox.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/drupal-pilot-web-02.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/drupal-pilot-web-02.it.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..be7b3e74
--- /dev/null
+++ b/swamid-interfederations-2.0/drupal-pilot-web-02.it.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://drupal-pilot-web-02.it.ox.ac.uk/shibboleth">
+ <!--
+ This is a "Drupal Pilot development" Shibboleth SP for the University of Oxford.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-12T09:43:31Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/Login"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDWTCCAkGgAwIBAgIJAPOKjeXKIpPPMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
+ BAMTH2RydXBhbC1waWxvdC13ZWItMDIuaXQub3guYWMudWswHhcNMTUxMDAxMTM1
+ MzIzWhcNMjUwOTI4MTM1MzIzWjAqMSgwJgYDVQQDEx9kcnVwYWwtcGlsb3Qtd2Vi
+ LTAyLml0Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ sQMf3qRXSHmQ0ye8gI0aveqbk6rIRXpcaxYFJ/ebcaec04TkFMq0LjBzE3Yj8UyS
+ gk+tWTOIUrUlzREiMdfU4Qro2xERenlvttJAZnRGngjDfPXgHoQsg5lTjm/tRaHY
+ LWnflxzA3XdPhd/t1D7J2DpBLL7p6ok+Y4PgwDOkZrc3eEpx7PcdLBn54f1RcbYC
+ Uz/jPHWJ0D6g+lg9HBjC9SjfnJv3lkUmXFV5DE05chK2uNHEjz8ZSbWYCrVPMcUx
+ fBlpIGSTvstMjoz92DjbtTUP5H1+rR3yb2cBc0IiU0V+NfL8fMb79G5CXP6HAUL6
+ XWo4vEh2x791KMLXC6wS8QIDAQABo4GBMH8wXgYDVR0RBFcwVYIfZHJ1cGFsLXBp
+ bG90LXdlYi0wMi5pdC5veC5hYy51a4YyaHR0cHM6Ly9kcnVwYWwtcGlsb3Qtd2Vi
+ LTAyLml0Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFLvwkmrVvmir9YsG
+ rI2ee4f0f4ILMA0GCSqGSIb3DQEBBQUAA4IBAQBAUPYBXkLeNnmjnVhbtG5T0zqe
+ /8Vx9C+Y+9vPygR6pEtHNh2x5dJMB5gWny7Ks071rgs0/s2MdWoe72nC1NB4kieE
+ mNvNGPSmSJxIYXA6ZVczIvajAl2qB9j4Q/lIJt2PmGBQmeOu7m9YzqCvSDfKMpgk
+ KQ6y0BigQ6Tpa7tSFRzMwwK56dN2VoKAHPxclfExoIWsK2d8wPO/PiiVv99NxrDl
+ wICWl+HpC/pPJHVP2NMJPI7FLsO+Pzc8a2yTKl3QQWpV5HqK2P+/jhMzRcq7Bm80
+ 5DMxXDen4Zx9PRnX+LSqVDBXL2Sy3nsIbayFHVpLKYCdwFGpUco+zke0ik1i
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University of Oxford Drupal Pilot development</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Systems Development and Support</GivenName>
+ <EmailAddress>mailto:sysdev@oucs.ox.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Systems Development and Support</GivenName>
+ <EmailAddress>mailto:sysdev@oucs.ox.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/e-localcourses.unibo.it.xml b/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
index 0ddee155..52a93844 100644
--- a/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
+++ b/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e-localcourses.unibo.it">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e-localcourses.unibo.it">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-02-17T11:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">
diff --git a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml b/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml
index bb13bf8c..4352c209 100644
--- a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://earthserver-sg.consorzio-cometa.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://earthserver-sg.consorzio-cometa.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-04-11T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
diff --git a/swamid-interfederations-2.0/eco2meter.grnet.gr-shibboleth.xml b/swamid-interfederations-2.0/eco2meter.grnet.gr-shibboleth.xml
new file mode 100644
index 00000000..2bad258d
--- /dev/null
+++ b/swamid-interfederations-2.0/eco2meter.grnet.gr-shibboleth.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eco2meter.grnet.gr/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">GHG report tool</mdui:DisplayName>
+ <mdui:Description xml:lang="en">GHG online reporting tool</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://eco2meter.grnet.gr/about/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://eco2meter.grnet.gr/privacy</mdui:PrivacyStatementURL>
+ <mdui:Logo height="64" width="250" xml:lang="en">https://eco2meter.grnet.gr/about/ghgtoollogo.png</mdui:Logo>
+ </mdui:UIInfo>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://eco2meter.grnet.gr/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://eco2meter.grnet.gr/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>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
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eco2meter.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="0" isDefault="true">
+ <md:ServiceName xml:lang="en">GHG report tool</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">GHG online reporting tool</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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="shacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="shacHomeOrganization" Name="urn:mace:terena.org:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Vasiliki Giannikopoulou</md:GivenName>
+ <md:EmailAddress>vasilg@admin.grnet.gr</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Vasiliki Giannikopoulou</md:GivenName>
+ <md:EmailAddress>vasilg@admin.grnet.gr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml b/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml
index 315165ef..ca8e5992 100644
--- a/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ecsg.dch-rp.eu/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ecsg.dch-rp.eu/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-06-10T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/edited.com.xml b/swamid-interfederations-2.0/edited.com.xml
new file mode 100644
index 00000000..8a46cc26
--- /dev/null
+++ b/swamid-interfederations-2.0/edited.com.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edited.com">
+ <!--
+ This is an "EDITED retail analytics" OneLogin SP for Stylescape Ltd.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-15T13:46:52Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIERTCCAy2gAwIBAgIJAJH/R36ghqhmMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNV
+ BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEPMA0GA1UE
+ ChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0wGwYJKoZIhvcNAQkBFg5k
+ ZXZAZWRpdGVkLmNvbTAeFw0xNTExMjYxMTM1MjZaFw0zNTExMjYxMTM1MjZaMHQx
+ CzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEP
+ MA0GA1UEChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0wGwYJKoZIhvcN
+ AQkBFg5kZXZAZWRpdGVkLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ ggEBAMoT+vwV6q3V55EAJ8Gf3CUduwSigipWLHTJpLua8QebwlbDuMTVWOTcI2FH
+ scxrfxIdAj7h+uLmkqpvi1/9YJQW5sqkSuD3fK07GSXbUfJjevMUT7e88yvTRUOI
+ YRH6fnrcz3WeMxM+gux4xDNJrLrMXvbC4PsainJDmIL1+PznoFRbLrFWKhx47oad
+ jth4HM0PQ5sF+n8rx2rE44GRss7VAIlv6rTEhMYKraMSK60ZmNdWavjPIBhFEb6+
+ 2Wfp8LRJ7/nHt/fxQ03feP05v5lMePtOxaninefnWKtvSxj+Lx3T/tbczperJzFR
+ RTb/0p9a/rRvto/j+qwp4XxoaB8CAwEAAaOB2TCB1jAdBgNVHQ4EFgQUBynvwBIg
+ 075+rJ6dOOHFcFKU43UwgaYGA1UdIwSBnjCBm4AUBynvwBIg075+rJ6dOOHFcFKU
+ 43WheKR2MHQxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcT
+ BkxvbmRvbjEPMA0GA1UEChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0w
+ GwYJKoZIhvcNAQkBFg5kZXZAZWRpdGVkLmNvbYIJAJH/R36ghqhmMAwGA1UdEwQF
+ MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEde1nzDoM2cj51bY2wMdbi5N2XVEB6l
+ 82SWENnv76a8tQai5oUdhAUwRbShpIvhuCyK93r6ffHFXw9z6nR6A3mLusGSCMLK
+ DYXmvgf9IGAm2ptgvZOhnaW3qLny9AmMZH1XG+G4wEvdFuyRnv2hb7AlF3BRsPi2
+ sh1c2xpqYd4/9zRx0o9C7oS3e7NRIzWCVPQRObb56b8jgsE9H6ljbhivHuoeUEIn
+ 9APDG8vwHH/Y3XWsA3TyrcbSpFiXUiXmxDNFlKoRqlypUJUKb4KEAKXtI7c3n/T7
+ XniDAl12MNbPqskNhYA2BbmN+wgEp467ONVD1a1qHy3zcfqM99UmTJg=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIERTCCAy2gAwIBAgIJAJH/R36ghqhmMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNV
+ BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEPMA0GA1UE
+ ChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0wGwYJKoZIhvcNAQkBFg5k
+ ZXZAZWRpdGVkLmNvbTAeFw0xNTExMjYxMTM1MjZaFw0zNTExMjYxMTM1MjZaMHQx
+ CzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEP
+ MA0GA1UEChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0wGwYJKoZIhvcN
+ AQkBFg5kZXZAZWRpdGVkLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ ggEBAMoT+vwV6q3V55EAJ8Gf3CUduwSigipWLHTJpLua8QebwlbDuMTVWOTcI2FH
+ scxrfxIdAj7h+uLmkqpvi1/9YJQW5sqkSuD3fK07GSXbUfJjevMUT7e88yvTRUOI
+ YRH6fnrcz3WeMxM+gux4xDNJrLrMXvbC4PsainJDmIL1+PznoFRbLrFWKhx47oad
+ jth4HM0PQ5sF+n8rx2rE44GRss7VAIlv6rTEhMYKraMSK60ZmNdWavjPIBhFEb6+
+ 2Wfp8LRJ7/nHt/fxQ03feP05v5lMePtOxaninefnWKtvSxj+Lx3T/tbczperJzFR
+ RTb/0p9a/rRvto/j+qwp4XxoaB8CAwEAAaOB2TCB1jAdBgNVHQ4EFgQUBynvwBIg
+ 075+rJ6dOOHFcFKU43UwgaYGA1UdIwSBnjCBm4AUBynvwBIg075+rJ6dOOHFcFKU
+ 43WheKR2MHQxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcT
+ BkxvbmRvbjEPMA0GA1UEChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0w
+ GwYJKoZIhvcNAQkBFg5kZXZAZWRpdGVkLmNvbYIJAJH/R36ghqhmMAwGA1UdEwQF
+ MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEde1nzDoM2cj51bY2wMdbi5N2XVEB6l
+ 82SWENnv76a8tQai5oUdhAUwRbShpIvhuCyK93r6ffHFXw9z6nR6A3mLusGSCMLK
+ DYXmvgf9IGAm2ptgvZOhnaW3qLny9AmMZH1XG+G4wEvdFuyRnv2hb7AlF3BRsPi2
+ sh1c2xpqYd4/9zRx0o9C7oS3e7NRIzWCVPQRObb56b8jgsE9H6ljbhivHuoeUEIn
+ 9APDG8vwHH/Y3XWsA3TyrcbSpFiXUiXmxDNFlKoRqlypUJUKb4KEAKXtI7c3n/T7
+ XniDAl12MNbPqskNhYA2BbmN+wgEp467ONVD1a1qHy3zcfqM99UmTJg=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.edited.com/login/saml/335/" index="1"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">EDITED retail analytics</ServiceName>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Stylescape Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">EDITED retail analytics</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://edited.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Rachel</GivenName>
+ <SurName>Neath</SurName>
+ <EmailAddress>mailto:rachel@edited.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Nick</GivenName>
+ <SurName>Barrett</SurName>
+ <EmailAddress>mailto:nick@edited.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml b/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
index 78b7ea01..11c6b411 100644
--- a/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
+++ b/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
@@ -125,16 +125,11 @@ The website will process your userid, name and email address to authorise access
<md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
<md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
- <md:RequestedAttribute FriendlyName="freebusyurl" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
<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="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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: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="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
- <md:RequestedAttribute FriendlyName="RCSidNumber" Name="urn:oid:1.2.840.113556.1.8000.2092.3.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
- <md:RequestedAttribute FriendlyName="awsRoles" Name="https://aws.amazon.com/SAML/Attributes/Role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
- <md:RequestedAttribute FriendlyName="awsRoleSessionName" Name="https://aws.amazon.com/SAML/Attributes/RoleSessionName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
- <md:RequestedAttribute FriendlyName="sAMAccountName" Name="urn:oid:1.2.840.113556.1.4.221" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-interfederations-2.0/eduspot-n.oca.eu-authsaml2-metadata.xml b/swamid-interfederations-2.0/eduspot-n.oca.eu-authsaml2-metadata.xml
new file mode 100644
index 00000000..3cb83ee4
--- /dev/null
+++ b/swamid-interfederations-2.0/eduspot-n.oca.eu-authsaml2-metadata.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eduspot-n.oca.eu/authsaml2/metadata">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-19T14:51:19Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>https://federation.renater.fr/category/wifi</saml:AttributeValue>
+ <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Univnautes captive portal - Observatoire de la Côte d'Azur</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="fr">https://eduspot-n.oca.eu</mdui:InformationURL>
+ <mdui:Description xml:lang="en">eduspot captive portal</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Portail captif Univnautes - Observatoire de la Côte d'Azur</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Portail captif eduspot</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5TCCAs2gAwIBAgIJAIreaYViIoPOMA0GCSqGSIb3DQEBDQUAMIGIMQswCQYD
+VQQGEwJGUjEYMBYGA1UECAwPQWxwZXMtTWFyaXRpbWVzMQ0wCwYDVQQHDAROaWNl
+MQwwCgYDVQQKDANPQ0ExDDAKBgNVBAsMA0RTSTEZMBcGA1UEAwwQZWR1c3BvdC1u
+Lm9jYS5ldTEZMBcGCSqGSIb3DQEJARYKZHNpQG9jYS5ldTAeFw0xNTEwMDEyMTEz
+MTVaFw0yNTA5MjgyMTEzMTVaMIGIMQswCQYDVQQGEwJGUjEYMBYGA1UECAwPQWxw
+ZXMtTWFyaXRpbWVzMQ0wCwYDVQQHDAROaWNlMQwwCgYDVQQKDANPQ0ExDDAKBgNV
+BAsMA0RTSTEZMBcGA1UEAwwQZWR1c3BvdC1uLm9jYS5ldTEZMBcGCSqGSIb3DQEJ
+ARYKZHNpQG9jYS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2y
+JozqjhIFFGhTna0svsVYXduF1T7wJzM+yoL+rKAdzJd8OEi892/Bs49Db0DUtiez
+nUglXeoh0YH8mHvbTQCAbt3R+FyR7RPMBEbfJw42i2zFZRiFx+JKEm0UOq8iexe4
+iyxvopTAqv4v9aIo+fLSg0MRmh8SAv9ThpiC/wQwLtTVk5AjFT7j6AF+FQvRZW0R
+DV8xkDn5yt6sSzPfGvh2ww7dtdju75zh8wfcDYF/NKT/qFpx+a5bWw05lcQNDLBe
+UO9rmP5WA2in0maxTIAZN+v1Mch3Ncmcnj8Dq4eSjGLkeBShCgVdUS51I/3Sf7El
+8Cftj8ew3FE9DoM8SscCAwEAAaNQME4wHQYDVR0OBBYEFFTmugvtpu2im1RJ9t5m
+YjqgYymiMB8GA1UdIwQYMBaAFFTmugvtpu2im1RJ9t5mYjqgYymiMAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQENBQADggEBADWirrLrtUzgCo17DfkcKIURobKRX60x
+L682veI5tSU4YQkUt8R4wl/9rwN74Qikvt2qJDxTgJYS46w+jjf6vkH2QA9XN29Y
+6VD5kO0NjU7BzIAO/e5UXGr1+lVyQneGHtktDium9wRoMPUxuymifdaxdPBwGd3P
+iXD74feSq1Ux5IePvPCouWu3wJp/TYYfSfvwZgEiEt0u/fzzr003xZUVluzhJClJ
+IdaLpnq1vAA8CjyWhhRb2+3O6Z5DC3vDL7adk2BhpN2dMJ7p9fTAamjZB4LEyt8Q
+lbnxijvgzNnV1qqHT476M01F5zF76FoP1SfJqygrhMrAifq3ooFHCa4=
+ </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>
+ MIID5TCCAs2gAwIBAgIJAIreaYViIoPOMA0GCSqGSIb3DQEBDQUAMIGIMQswCQYD
+VQQGEwJGUjEYMBYGA1UECAwPQWxwZXMtTWFyaXRpbWVzMQ0wCwYDVQQHDAROaWNl
+MQwwCgYDVQQKDANPQ0ExDDAKBgNVBAsMA0RTSTEZMBcGA1UEAwwQZWR1c3BvdC1u
+Lm9jYS5ldTEZMBcGCSqGSIb3DQEJARYKZHNpQG9jYS5ldTAeFw0xNTEwMDEyMTEz
+MTVaFw0yNTA5MjgyMTEzMTVaMIGIMQswCQYDVQQGEwJGUjEYMBYGA1UECAwPQWxw
+ZXMtTWFyaXRpbWVzMQ0wCwYDVQQHDAROaWNlMQwwCgYDVQQKDANPQ0ExDDAKBgNV
+BAsMA0RTSTEZMBcGA1UEAwwQZWR1c3BvdC1uLm9jYS5ldTEZMBcGCSqGSIb3DQEJ
+ARYKZHNpQG9jYS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2y
+JozqjhIFFGhTna0svsVYXduF1T7wJzM+yoL+rKAdzJd8OEi892/Bs49Db0DUtiez
+nUglXeoh0YH8mHvbTQCAbt3R+FyR7RPMBEbfJw42i2zFZRiFx+JKEm0UOq8iexe4
+iyxvopTAqv4v9aIo+fLSg0MRmh8SAv9ThpiC/wQwLtTVk5AjFT7j6AF+FQvRZW0R
+DV8xkDn5yt6sSzPfGvh2ww7dtdju75zh8wfcDYF/NKT/qFpx+a5bWw05lcQNDLBe
+UO9rmP5WA2in0maxTIAZN+v1Mch3Ncmcnj8Dq4eSjGLkeBShCgVdUS51I/3Sf7El
+8Cftj8ew3FE9DoM8SscCAwEAAaNQME4wHQYDVR0OBBYEFFTmugvtpu2im1RJ9t5m
+YjqgYymiMB8GA1UdIwQYMBaAFFTmugvtpu2im1RJ9t5mYjqgYymiMAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQENBQADggEBADWirrLrtUzgCo17DfkcKIURobKRX60x
+L682veI5tSU4YQkUt8R4wl/9rwN74Qikvt2qJDxTgJYS46w+jjf6vkH2QA9XN29Y
+6VD5kO0NjU7BzIAO/e5UXGr1+lVyQneGHtktDium9wRoMPUxuymifdaxdPBwGd3P
+iXD74feSq1Ux5IePvPCouWu3wJp/TYYfSfvwZgEiEt0u/fzzr003xZUVluzhJClJ
+IdaLpnq1vAA8CjyWhhRb2+3O6Z5DC3vDL7adk2BhpN2dMJ7p9fTAamjZB4LEyt8Q
+lbnxijvgzNnV1qqHT476M01F5zF76FoP1SfJqygrhMrAifq3ooFHCa4=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduspot-n.oca.eu/authsaml2/singleSignOnPost" index="0"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="fr">Portail captif Univnautes - Observatoire de la Côte d'Azur</md:ServiceName>
+ <md:ServiceName xml:lang="en">Univnautes captive portal - Observatoire de la Côte d'Azur</md:ServiceName>
+ <md:ServiceDescription xml:lang="fr">Portail captif eduspot</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">eduspot captive portal</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Observatoire de la Côte d'Azur</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Observatoire de la Côte d'Azur</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.oca.eu</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>dsi@oca.eu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml b/swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml
new file mode 100644
index 00000000..6d89e60c
--- /dev/null
+++ b/swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elearning.asnet.am/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.asnet.am" registrationInstant="2015-08-22T12:52:43Z"/>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://elearning.asnet.am/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elearning.asnet.am/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">ASNET-AM E-Learning Platform</mdui:DisplayName>
+ <mdui:Description xml:lang="hy">ASNET-AM E-Learning service provides online courses for the students of the National Academy of Sciences of the Republic of Armenia and beyond in Moodle. Moodle is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://elearning.asnet.am/moodle/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>elearning.asnet.am</ds:KeyName>
+ <ds:KeyName>www.elearning.asnet.am</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFpjCCBI6gAwIBAgIRALYbJfMx2YKNrR/xrgIpYdYwDQYJKoZIhvcNAQELBQAw
+gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
+VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
+Q0EwHhcNMTUwNTE4MDAwMDAwWhcNMTgwNTE3MjM1OTU5WjCBoDEhMB8GA1UECxMY
+RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
+dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
+QVMuMRMwEQYDVQQLEwpDT01PRE8gU1NMMRswGQYDVQQDExJlbGVhcm5pbmcuYXNu
+ZXQuYW0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEXMgh+DkGHpsu
+YD8CDbvKzAK9IGgmxviLfBCtGZi4E0EAwyoJfgLEGNH8wxWQkAPhhiaBiJqPjZAX
+J4RqON8Y3RDFY0zAt2fqF7WRjmHfrVWoc3m6nusGdRLV/MZC/iuE7lVaHQ+tSqS6
+zLib4lO6WtXsBz+CazYCOAi7qE88zFwTsanaa/ule6RxuTBjpIKrS9igN5yhDgFx
+sZIJNIKrksfpzhsiIk2uIA+pql3GE+z3CEsRAJemCoUyv3qm8VvXh/+H15PZqK/i
+6Iwb6R1GubkBilA5cVocxKA1pc4NHhh3Y+Q02EmP6FE0mVVnDqf0RAlBpnkj3DCD
+J13UyO1rAgMBAAGjggHnMIIB4zAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0
+Oija5zAdBgNVHQ4EFgQU3NLawTnsQzZy5tclxTYAwXdl868wDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+ME8GA1UdIARIMEYwOgYLKwYBBAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6
+Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBH
+oEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlk
+YXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEF
+BQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFs
+aWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29j
+c3AuY29tb2RvY2EuY29tMDUGA1UdEQQuMCyCEmVsZWFybmluZy5hc25ldC5hbYIW
+d3d3LmVsZWFybmluZy5hc25ldC5hbTANBgkqhkiG9w0BAQsFAAOCAQEAQxf5uG7Q
+8WZOmAvDH46Zsn8AmgBe45xtpVpqipYyaVwYvkIAYsPBCA7m8sjeJjGyafLxBn4t
+j+p+aLdLQG1TAcsZZkMya4ELgvYpx4q0b1hhxel3dnV/gr1dhmTehSaNM2R4FOL9
+dGguvuqP9EnVqEexXN0AG2XRDQhn7LpwjGj1EjDlQ8+8lYBFvXh1RPsdWi7/U4Yp
+9zM1sUMRewMmlDlpizbjRL9y3YdQU0eG7z7b02n+Ym+atm6A6giXA9YfuCf/4xP7
+z1vrYPooAcnln7HnvUGEQ1mw32N/nRkJA8dDxVaU8d0WFH4QVUuJXt0pdNpVJ3Uh
+4ilH5zaIpJbAkg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFpjCCBI6gAwIBAgIRALYbJfMx2YKNrR/xrgIpYdYwDQYJKoZIhvcNAQELBQAw
+gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
+VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
+Q0EwHhcNMTUwNTE4MDAwMDAwWhcNMTgwNTE3MjM1OTU5WjCBoDEhMB8GA1UECxMY
+RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
+dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
+QVMuMRMwEQYDVQQLEwpDT01PRE8gU1NMMRswGQYDVQQDExJlbGVhcm5pbmcuYXNu
+ZXQuYW0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEXMgh+DkGHpsu
+YD8CDbvKzAK9IGgmxviLfBCtGZi4E0EAwyoJfgLEGNH8wxWQkAPhhiaBiJqPjZAX
+J4RqON8Y3RDFY0zAt2fqF7WRjmHfrVWoc3m6nusGdRLV/MZC/iuE7lVaHQ+tSqS6
+zLib4lO6WtXsBz+CazYCOAi7qE88zFwTsanaa/ule6RxuTBjpIKrS9igN5yhDgFx
+sZIJNIKrksfpzhsiIk2uIA+pql3GE+z3CEsRAJemCoUyv3qm8VvXh/+H15PZqK/i
+6Iwb6R1GubkBilA5cVocxKA1pc4NHhh3Y+Q02EmP6FE0mVVnDqf0RAlBpnkj3DCD
+J13UyO1rAgMBAAGjggHnMIIB4zAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0
+Oija5zAdBgNVHQ4EFgQU3NLawTnsQzZy5tclxTYAwXdl868wDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+ME8GA1UdIARIMEYwOgYLKwYBBAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6
+Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBH
+oEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlk
+YXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEF
+BQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFs
+aWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29j
+c3AuY29tb2RvY2EuY29tMDUGA1UdEQQuMCyCEmVsZWFybmluZy5hc25ldC5hbYIW
+d3d3LmVsZWFybmluZy5hc25ldC5hbTANBgkqhkiG9w0BAQsFAAOCAQEAQxf5uG7Q
+8WZOmAvDH46Zsn8AmgBe45xtpVpqipYyaVwYvkIAYsPBCA7m8sjeJjGyafLxBn4t
+j+p+aLdLQG1TAcsZZkMya4ELgvYpx4q0b1hhxel3dnV/gr1dhmTehSaNM2R4FOL9
+dGguvuqP9EnVqEexXN0AG2XRDQhn7LpwjGj1EjDlQ8+8lYBFvXh1RPsdWi7/U4Yp
+9zM1sUMRewMmlDlpizbjRL9y3YdQU0eG7z7b02n+Ym+atm6A6giXA9YfuCf/4xP7
+z1vrYPooAcnln7HnvUGEQ1mw32N/nRkJA8dDxVaU8d0WFH4QVUuJXt0pdNpVJ3Uh
+4ilH5zaIpJbAkg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elearning.asnet.am/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elearning.asnet.am/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elearning.asnet.am/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elearning.asnet.am/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elearning.asnet.am/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elearning.asnet.am/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elearning.asnet.am/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elearning.asnet.am/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://elearning.asnet.am/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elearning.asnet.am/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elearning.asnet.am/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">ASNET-AM E-Learning Platform</md:ServiceName>
+ <md:ServiceDescription xml:lang="hy">ASNET-AM E-Learning service provides online courses for the students of the National Academy of Sciences of the Republic of Armenia and beyond in Moodle. Moodle is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments.</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.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">Academic Scientific Network of Armenia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">ASNET-AM</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.asnet.am/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Andranik</md:GivenName>
+ <md:SurName>Hayrapetyan</md:SurName>
+ <md:EmailAddress>mailto:andranik@ipia.sci.am</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engine.elixir-czech.org-authentication-sp-metadata.xml b/swamid-interfederations-2.0/engine.elixir-czech.org-authentication-sp-metadata.xml
new file mode 100644
index 00000000..6b93cc49
--- /dev/null
+++ b/swamid-interfederations-2.0/engine.elixir-czech.org-authentication-sp-metadata.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://engine.elixir-czech.org/authentication/sp/metadata">
+ <md:Extensions>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-12-08T11:25:02Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:SPSSODescriptor WantAssertionsSigned="true" 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">ELIXIR research infrastructure AAI</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">ELIXIR research infrastructure AAI</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This service is the common gateway to the services ELIXIR
+research infrastructure provides for biological data.</mdui:Description>
+ <mdui:Description xml:lang="cs">This service is the common gateway to the services ELIXIR
+research infrastructure provides for biological data.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://login.elixir-czech.org/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://login.elixir-czech.org/</mdui:InformationURL>
+ <mdui:Logo height="96" width="96">https://login.elixir-czech.org/media/elixir-ds.jpg</mdui:Logo>
+ <mdui:Keywords xml:lang="en">ELIXIR proxy biology life sciences</mdui:Keywords>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFMTCCBBmgAwIBAgIIIespBL5TmnswDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow
+GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz
+LmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMTMwMQYDVQQDEypHbyBEYWRkeSBTZWN1
+cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTUxMDA2MTMyNzM5WhcN
+MTgxMDA2MTMyNzM5WjBAMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0
+ZWQxGzAZBgNVBAMMEiouZWxpeGlyLWN6ZWNoLm9yZzCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANduYwpgat3apqc/pV/hoFGtOjZ1HJ9OI01krvmrOobM
+e5w5jCzL8Sf0R6ltreV3MSpAuLdJLu8Tz0++4vGDdIqze20AHkh64/zu3I75VdZI
+WWD8iBBUNvIwjW3G0scLiwjK5/HMjO/HZuyCH4ppQvL0u86U0gAsVoFn2b4WqIIz
+yH1n85Fi71CufekD9LrbSukGUZV0QAvqFGrAPxm1LupBdwgXSVeVJlx8ZA0CBtCK
+yYnTWhRVa1Xod5/E0zd5zpuGU4VSf9r1JcSxgTnsODFb8piRJv+BErVAGj4DTHQI
+4bUf1ESvyDYz6BDy/PLOi/IV6iVATHiktphmv4P4eUkCAwEAAaOCAbgwggG0MAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA4GA1Ud
+DwEB/wQEAwIFoDA3BgNVHR8EMDAuMCygKqAohiZodHRwOi8vY3JsLmdvZGFkZHku
+Y29tL2dkaWcyczEtMTM0LmNybDBTBgNVHSAETDBKMEgGC2CGSAGG/W0BBxcBMDkw
+NwYIKwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVw
+b3NpdG9yeS8wdgYIKwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhhodHRwOi8vb2Nz
+cC5nb2RhZGR5LmNvbS8wQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZXJ0aWZpY2F0ZXMu
+Z29kYWRkeS5jb20vcmVwb3NpdG9yeS9nZGlnMi5jcnQwHwYDVR0jBBgwFoAUQMK9
+J47MNIMwojPX+2yz8LQsgM4wLwYDVR0RBCgwJoISKi5lbGl4aXItY3plY2gub3Jn
+ghBlbGl4aXItY3plY2gub3JnMB0GA1UdDgQWBBQmJim6lGWIf9VusC8ms7npEYgl
+2zANBgkqhkiG9w0BAQsFAAOCAQEAFumHQHq1geOegg6EzHxwnvrQLfWcEWfcoRWT
+hj0MnINUoSEdJscQEihRPiQgxe1CYHVAsWyLcnZLpKHerM/f//i6bmoqLbh0fLyp
+2kjAC3Uph4VBPdmz5a3LUS6G8nomoRwXtO+CXB3xPXvamXyppMYb0xdV1YONrmuN
+rs0ldKjUtU8ieb88vJ0fcYXDjJBngTGjVEeFLllzlpHdZ0gMAJ7XuDHHupg9ISSe
+X+oaZlcJVzARIhZzLynBGKygtPjCtSeIhIpLitsBiKA354ZntN+CWV8PP6OQhRv/
+GtsSzA726/B+flEAviTfdsgY0QytNtOd3Uz26GUR21PH2OS+xg==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.elixir-czech.org/authentication/sp/consume-assertion" index="0"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">ELIXIR Services</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Services of ELIXIR, the European research infrastructure for biological information, supporting life science research and its translation to medicine, agriculture, bioindustries and society</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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"/>
+ <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">ELIXIR CZ</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">ELIXIR CZ</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">ELIXIR CZ</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.elixir-czech.cz</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://www.elixir-czech.cz</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>ELIXIR Directory</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>aai-contact@elixir-europe.org</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>ELIXIR Directory</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>aai-contact@elixir-europe.or</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>ELIXIR Directory</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>aai-contact@elixir-europe.or</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml b/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
index 4063bd81..1ac796e9 100644
--- a/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
@@ -24,34 +24,24 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIFNjCCBB6gAwIBAgIDEF5UMA0GCSqGSIb3DQEBCwUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTQwMTI4MDM0MzI2WhcNMTYwMjI5MTgwMDU1WjCBvzEpMCcGA1UEBRMgOW5L
-LXA1Zkpsam1leVg1aXREZTFMS2VnTHB1WWJtVUQxEzARBgNVBAsTCkdUMjgzMzcw
-OTIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
-KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
-U1NMKFIpMRkwFwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAxU1Kzma74qazOCj/66wzcyZHB7XtSgIFEw1LtLq/
-9OA5efe/5yL6nK6H0pZoEpWGDLSzQkQJFP1OlozStQAAf/U0N5mWY5JUqwJce+Y5
-8bA7jg2JIDp8zPDvKMJ3izkeJUxBdYiV6aZW3aRjt22tTlxlXgU3wovicu+acSY9
-YAZLMWkvNoVHfNTmXZA8rzMif2qPSHnv2HIu+vUiTmD39BPxHfbunvCjmmFZWM2f
-O/QEyG2n4/YuttEzNd9yhU7t++KFiK+D1vlCbRRnjffyhQfEhcj6zauCDtfOzadt
-O+LzMSdS+g/B3mx2ic9ixgC0ml2Mw7De29XHzcbhcYuD/wIDAQABo4IBuzCCAbcw
-HwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWg
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjArBgNVHREEJDAighAqLmNv
-bXBpbGF0aW8ubmV0gg5jb21waWxhdGlvLm5ldDBDBgNVHR8EPDA6MDigNqA0hjJo
-dHRwOi8vcmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNy
-bDAdBgNVHQ4EFgQURW26V/eSqhDZz4+cUahkSIp9/XgwDAYDVR0TAQH/BAIwADB4
-BggrBgEFBQcBAQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9yYXBpZHNzbC1vY3Nw
-Lmdlb3RydXN0LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5n
-ZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMwQQYKYIZIAYb4RQEH
-NjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJj
-ZXMvY3BzMA0GCSqGSIb3DQEBCwUAA4IBAQAXnQ0EXVz77PiovvYKBMjktoylywL0
-hHKQDl//Uogoq9bTLvp91pfTMagvmGBZwL5l+9CPtal+yJc6ogh2cCjddqWleSAQ
-F2ikd/QRMXaolcSNofFG9M+cmJHPmhFIJPOOqHdfTbcaM54swrgdEXhsKCd56t3X
-hUSa267XqAf+UgSVXa5/9+7niYKbPm6S7ENEdzmJBjzC6xZ3o0IpncmQpC1cPNOy
-v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
-6Y+OhZYur/8jg4W7AsT50u4Nm1YhbT4O+wl3P1dAZTirIjdcLJPi1Igc
+ MIIDPjCCAiYCCQDLkvKzyxmCozANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJG
+UjEUMBIGA1UEBwwLU2FpbnQgRmVsaXgxEzARBgNVBAoMCkNvbXBpbGF0aW8xCzAJ
+BgNVBAsMAklUMRkwFwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MCAXDTE1MTAwMTE0
+NTIyNloYDzIxMTUwOTA3MTQ1MjI2WjBgMQswCQYDVQQGEwJGUjEUMBIGA1UEBwwL
+U2FpbnQgRmVsaXgxEzARBgNVBAoMCkNvbXBpbGF0aW8xCzAJBgNVBAsMAklUMRkw
+FwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxU1Kzma74qazOCj/66wzcyZHB7XtSgIFEw1LtLq/9OA5efe/5yL6
+nK6H0pZoEpWGDLSzQkQJFP1OlozStQAAf/U0N5mWY5JUqwJce+Y58bA7jg2JIDp8
+zPDvKMJ3izkeJUxBdYiV6aZW3aRjt22tTlxlXgU3wovicu+acSY9YAZLMWkvNoVH
+fNTmXZA8rzMif2qPSHnv2HIu+vUiTmD39BPxHfbunvCjmmFZWM2fO/QEyG2n4/Yu
+ttEzNd9yhU7t++KFiK+D1vlCbRRnjffyhQfEhcj6zauCDtfOzadtO+LzMSdS+g/B
+3mx2ic9ixgC0ml2Mw7De29XHzcbhcYuD/wIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQASeEiw1b+IblGOSrqTaJhCHmkOTKpaVl5+ARTc4J1f1zWZm6gmf2mGSJZthlsn
+i+MjdeE6mHsX0B4ZRQdyEXaj2d90lnJXQ3Hy4YUht1T3Q+rm4+DPIKpCLZxIYMXW
+CGD9S73G7vS1npUIP0g5TAk808UzaYDPtbTKsTk7YNnvlr7o1aJLBq4EGURHzwKs
+ur5AvNBhBVh3NqjhsDb5JzYkgncMR0jhlF79yeUQ0hJN3dsArkRW8hfFKkmMg/vV
+b3MlBBOGsobwQbkN5sUxaZF1vPtLD0THGTJDUYY4F3bySOFBaxIhORL8fiHKQr9J
+4oI8R2FqqBAcrToXFmQESE/i
</ds:X509Certificate>
</ds:X509Data>
@@ -61,6 +51,33 @@ v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDPjCCAiYCCQDLkvKzyxmCozANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJG
+UjEUMBIGA1UEBwwLU2FpbnQgRmVsaXgxEzARBgNVBAoMCkNvbXBpbGF0aW8xCzAJ
+BgNVBAsMAklUMRkwFwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MCAXDTE1MTAwMTE0
+NTIyNloYDzIxMTUwOTA3MTQ1MjI2WjBgMQswCQYDVQQGEwJGUjEUMBIGA1UEBwwL
+U2FpbnQgRmVsaXgxEzARBgNVBAoMCkNvbXBpbGF0aW8xCzAJBgNVBAsMAklUMRkw
+FwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxU1Kzma74qazOCj/66wzcyZHB7XtSgIFEw1LtLq/9OA5efe/5yL6
+nK6H0pZoEpWGDLSzQkQJFP1OlozStQAAf/U0N5mWY5JUqwJce+Y58bA7jg2JIDp8
+zPDvKMJ3izkeJUxBdYiV6aZW3aRjt22tTlxlXgU3wovicu+acSY9YAZLMWkvNoVH
+fNTmXZA8rzMif2qPSHnv2HIu+vUiTmD39BPxHfbunvCjmmFZWM2fO/QEyG2n4/Yu
+ttEzNd9yhU7t++KFiK+D1vlCbRRnjffyhQfEhcj6zauCDtfOzadtO+LzMSdS+g/B
+3mx2ic9ixgC0ml2Mw7De29XHzcbhcYuD/wIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQASeEiw1b+IblGOSrqTaJhCHmkOTKpaVl5+ARTc4J1f1zWZm6gmf2mGSJZthlsn
+i+MjdeE6mHsX0B4ZRQdyEXaj2d90lnJXQ3Hy4YUht1T3Q+rm4+DPIKpCLZxIYMXW
+CGD9S73G7vS1npUIP0g5TAk808UzaYDPtbTKsTk7YNnvlr7o1aJLBq4EGURHzwKs
+ur5AvNBhBVh3NqjhsDb5JzYkgncMR0jhlF79yeUQ0hJN3dsArkRW8hfFKkmMg/vV
+b3MlBBOGsobwQbkN5sUxaZF1vPtLD0THGTJDUYY4F3bySOFBaxIhORL8fiHKQr9J
+4oI8R2FqqBAcrToXFmQESE/i
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIFNjCCBB6gAwIBAgIDEF5UMA0GCSqGSIb3DQEBCwUAMDwxCzAJBgNVBAYTAlVT
MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
HhcNMTQwMTI4MDM0MzI2WhcNMTYwMjI5MTgwMDU1WjCBvzEpMCcGA1UEBRMgOW5L
@@ -89,7 +106,6 @@ F2ikd/QRMXaolcSNofFG9M+cmJHPmhFIJPOOqHdfTbcaM54swrgdEXhsKCd56t3X
hUSa267XqAf+UgSVXa5/9+7niYKbPm6S7ENEdzmJBjzC6xZ3o0IpncmQpC1cPNOy
v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
6Y+OhZYur/8jg4W7AsT50u4Nm1YhbT4O+wl3P1dAZTirIjdcLJPi1Igc
-
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -105,8 +121,10 @@ v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
<md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="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"/>
<md:RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <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"/>
+ <md:RequestedAttribute FriendlyName="supannEntiteAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="supannEntiteAffectationPrincipale" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml
index 5867764d..d9b4d642 100644
--- a/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml
@@ -10,7 +10,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:Description xml:lang="nl">NHTV internationaal hoger onderwijs Breda</mdui:Description>
<mdui:Description xml:lang="en">NHTV Breda University of Applied Sciences</mdui:Description>
- <mdui:Logo height="48" width="78">https://static.surfconext.nl/media/idp/nhtv.png</mdui:Logo>
+ <mdui:Logo height="48" width="78">https://static.surfconext.nl/logos/idp/nhtv.png</mdui:Logo>
<mdui:Keywords xml:lang="en">NHTV Breda University of Applied Sciences</mdui:Keywords>
<mdui:Keywords xml:lang="nl">NHTV Breda University of Applied Sciences Nationale Hogeschool voor Toerisme en Verkeer</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml
index 8df6f805..a1f9ffe6 100644
--- a/swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Rijn IJssel</mdui:DisplayName>
<mdui:Description xml:lang="nl">Rijn IJssel</mdui:Description>
<mdui:Description xml:lang="en">Rijn IJssel</mdui:Description>
- <mdui:Logo height="25" width="108">https://static.surfconext.nl/media/idp/rijnijssel.gif</mdui:Logo>
+ <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/rijnijssel.gif</mdui:Logo>
<mdui:Keywords xml:lang="en">Rijn IJssel ROC MBO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Rijn IJssel ROC MBO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml
index 37e37e82..a2e4f373 100644
--- a/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Clusius College</mdui:DisplayName>
<mdui:Description xml:lang="nl">Clusius College</mdui:Description>
<mdui:Description xml:lang="en">Clusius College</mdui:Description>
- <mdui:Logo height="37" width="108">https://static.surfconext.nl/media/idp/clusius.png</mdui:Logo>
+ <mdui:Logo height="37" width="108">https://static.surfconext.nl/logos/idp/clusius.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Clusius College MBO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Clusius College MBO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml
index 477878f5..11f07ad2 100644
--- a/swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">Graafschap College</mdui:DisplayName>
<mdui:Description xml:lang="nl">Graafschap College</mdui:Description>
<mdui:Description xml:lang="en">Graafschap College</mdui:Description>
- <mdui:Logo height="24" width="108">https://static.surfconext.nl/media/idp/graafschapcollege.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Graafschap College MBO</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Graafschap College MBO</mdui:Keywords>
+ <mdui:Logo height="24" width="108">https://static.surfconext.nl/logos/idp/graafschapcollege.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">graafschap college mbo</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">graafschap college mbo</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml
index 5defa36c..ce18d2f6 100644
--- a/swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">Leids Universitair Medisch Centrum</mdui:DisplayName>
<mdui:Description xml:lang="nl">Leids Universitair Medisch Centrum</mdui:Description>
<mdui:Description xml:lang="en">Leids Universitair Medisch Centrum</mdui:Description>
- <mdui:Logo height="70" width="280">https://static.surfconext.nl/media/idp/lumc-logo.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">UMC LUMC Leids Universitair Medisch Centrum Ziekenhuis</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">UMC LUMC Leids Universitair Medisch Centrum Ziekenhuis</mdui:Keywords>
+ <mdui:Logo height="70" width="280">https://static.surfconext.nl/logos/idp/lumc-logo.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">UMC lumc Leids Universitair Medisch Centrum Ziekenhuis</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">UMC lumc Leids Universitair Medisch Centrum Ziekenhuis</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
@@ -31,7 +31,7 @@
<md:Organization>
<md:OrganizationName xml:lang="en">Leids Universitair Medisch Centrum</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Leids Universitair Medisch Centrum</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.surffederatie.nl</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.lumc.nl</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="administrative">
<md:GivenName>SURFconext support</md:GivenName>
diff --git a/swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml
index f8e96376..02702959 100644
--- a/swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Trimbos Instituut</mdui:DisplayName>
<mdui:Description xml:lang="nl">Trimbos Instituut</mdui:Description>
<mdui:Description xml:lang="en">Trimbos Instituut</mdui:Description>
- <mdui:Logo height="34" width="108">https://static.surfconext.nl/media/idp/trimbos.png</mdui:Logo>
+ <mdui:Logo height="34" width="108">https://static.surfconext.nl/logos/idp/trimbos.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Trimbos Instituut</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Trimbos Instituut</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/federatie.umcn.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.umcn.nl-adfs-services-trust.xml
new file mode 100644
index 00000000..d92f06c4
--- /dev/null
+++ b/swamid-interfederations-2.0/federatie.umcn.nl-adfs-services-trust.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federatie.umcn.nl/adfs/services/trust">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-12-11T14:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="nl">Radboudumc</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Radboudumc</mdui:DisplayName>
+ <mdui:Description xml:lang="nl">Radboudumc</mdui:Description>
+ <mdui:Description xml:lang="en">Radboudumc</mdui:Description>
+ <mdui:Logo height="300" width="500">https://static.surfconext.nl/logos/idp/Radboudumc.jpg</mdui:Logo>
+ <mdui:Keywords xml:lang="en">UMC St Radboud UMCN Radboudumc</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">UMC St Radboud UMCN Radboudumc</mdui:Keywords>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/6e54255933dcf152086180366e8bf0d4"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Radboudumc</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Radboudumc</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.umcn.nl/Pages/default.aspx</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml b/swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml
new file mode 100644
index 00000000..fa4664fb
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.cyclone-project.eu/auth/realms/master">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-09-30T08:59:16Z">
+ <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>
+ </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="de">CYCLONE Test Federation Provider</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">CYCLONE Test Federation Provider</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Der CYCLONE Test Federation Provider dient zum Testen und zur Demonstration der im CYCLONE – Projekt entwickelten Technologien</mdui:Description>
+ <mdui:Description xml:lang="en">The CYCLONE Test Federation Provider is used for testing and demonstrating the technologies developed within the CYCLONE project</mdui:Description>
+ <mdui:Logo height="50" width="197">https://secure.cyclone-project.eu/assets/images/CYCLONE-LOGO-mini.png</mdui:Logo>
+ <mdui:PrivacyStatementURL xml:lang="en">https://secure.cyclone-project.eu/sp_privacy_policy.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>federation.cyclone-project.eu</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=federation.cyclone-project.eu,OU=Service-centric Networking,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIF4jCCBMqgAwIBAgIHGc8MRIp62zANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
+EwJERTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8w
+DQYDVQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAe
+Fw0xNTA3MjIxMjM4MTNaFw0xODEwMTgxMjM4MTNaMIGlMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xJzAlBgNVBAoMHlRlY2hu
+aXNjaGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEjMCEGA1UECwwaU2VydmljZS1jZW50
+cmljIE5ldHdvcmtpbmcxJjAkBgNVBAMMHWZlZGVyYXRpb24uY3ljbG9uZS1wcm9q
+ZWN0LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJTW+QZ156G
+51hhDG3nOpAdq+U9cb5kl0nEgFnvzSIu7tVZIr4dLBQjTFXfHl5tQ6JwbqxAvYFf
+Lco+1llQe25I5ax/ULQv+Y0uZC2992pnsSezRB2sVc4UNb/XnQMCRP6nKAeLLmwg
+ophcUmI5ItxkwftpW2iW8bAp3Rq3vpXHFVKgxvKXt8IQ37j0SwKVuSaDRbIdIPtC
+XjpRb9wXdKYgS+hCmF0IKblH5mowOr6qVy4ss+m/n3z23MoE3teTJrWK/urSRBuk
+7zzh5x4mVO5jH3/p8enh7ePX/sMgf68VDnIFrXPFdgDQxbv9eOGyMTyWX6Mt6AWE
+mVXA2SR1jQIDAQABo4ICUjCCAk4wTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEE
+AwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
+rSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSGIY/ZZD7VJ2s/fIl5bKlKV71I0DAfBgNV
+HSMEGDAWgBQjMkKe/mJCTvtO0BebeOftiow+eDAoBgNVHREEITAfgh1mZWRlcmF0
+aW9uLmN5Y2xvbmUtcHJvamVjdC5ldTCBgwYDVR0fBHwwejA7oDmgN4Y1aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmww
+O6A5oDeGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmVybGluLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIHTBggrBgEFBQcBAQSBxjCBwzAzBggrBgEFBQcwAYYnaHR0
+cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEUGCCsGAQUFBzAC
+hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+dHUtYmVybGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF
+AAOCAQEAcD7me5NvAkGAAMQSxlDVtmHi6foUPNt9adzUh1HujfkpKj7SDffpvFzl
+qjQuzcyXT03k0mC5BzRVZcvhoTHO8iAN84zD98C26kWUW4rrnX0J0LNlJ6WuTwG8
+gvNWLsYAZQQQWfSgRUGQXMzCFgXa/pFe8En63eh49MHhMNMFCZ+CBzLCxJmtGqRR
+/GTZHsUfmLgMcM/i77wPSSTz/WJ1XqpSdTX3ZcqxHTj91Mkle4feDbs0esiRrgm+
+pEG48bIOW7zC1nhkztvEfA5XgHVh9HvCV/QoeHOpuzCv8brHbPQtj1sZi6EsFb89
+awjhhm+d45PRPp1X8A1+/JdMtBQbiQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>federation.cyclone-project.eu</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=federation.cyclone-project.eu,OU=Service-centric Networking,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIF4jCCBMqgAwIBAgIHGc8MRIp62zANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
+EwJERTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8w
+DQYDVQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAe
+Fw0xNTA3MjIxMjM4MTNaFw0xODEwMTgxMjM4MTNaMIGlMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xJzAlBgNVBAoMHlRlY2hu
+aXNjaGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEjMCEGA1UECwwaU2VydmljZS1jZW50
+cmljIE5ldHdvcmtpbmcxJjAkBgNVBAMMHWZlZGVyYXRpb24uY3ljbG9uZS1wcm9q
+ZWN0LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJTW+QZ156G
+51hhDG3nOpAdq+U9cb5kl0nEgFnvzSIu7tVZIr4dLBQjTFXfHl5tQ6JwbqxAvYFf
+Lco+1llQe25I5ax/ULQv+Y0uZC2992pnsSezRB2sVc4UNb/XnQMCRP6nKAeLLmwg
+ophcUmI5ItxkwftpW2iW8bAp3Rq3vpXHFVKgxvKXt8IQ37j0SwKVuSaDRbIdIPtC
+XjpRb9wXdKYgS+hCmF0IKblH5mowOr6qVy4ss+m/n3z23MoE3teTJrWK/urSRBuk
+7zzh5x4mVO5jH3/p8enh7ePX/sMgf68VDnIFrXPFdgDQxbv9eOGyMTyWX6Mt6AWE
+mVXA2SR1jQIDAQABo4ICUjCCAk4wTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEE
+AwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
+rSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSGIY/ZZD7VJ2s/fIl5bKlKV71I0DAfBgNV
+HSMEGDAWgBQjMkKe/mJCTvtO0BebeOftiow+eDAoBgNVHREEITAfgh1mZWRlcmF0
+aW9uLmN5Y2xvbmUtcHJvamVjdC5ldTCBgwYDVR0fBHwwejA7oDmgN4Y1aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmww
+O6A5oDeGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmVybGluLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIHTBggrBgEFBQcBAQSBxjCBwzAzBggrBgEFBQcwAYYnaHR0
+cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEUGCCsGAQUFBzAC
+hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+dHUtYmVybGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF
+AAOCAQEAcD7me5NvAkGAAMQSxlDVtmHi6foUPNt9adzUh1HujfkpKj7SDffpvFzl
+qjQuzcyXT03k0mC5BzRVZcvhoTHO8iAN84zD98C26kWUW4rrnX0J0LNlJ6WuTwG8
+gvNWLsYAZQQQWfSgRUGQXMzCFgXa/pFe8En63eh49MHhMNMFCZ+CBzLCxJmtGqRR
+/GTZHsUfmLgMcM/i77wPSSTz/WJ1XqpSdTX3ZcqxHTj91Mkle4feDbs0esiRrgm+
+pEG48bIOW7zC1nhkztvEfA5XgHVh9HvCV/QoeHOpuzCv8brHbPQtj1sZi6EsFb89
+awjhhm+d45PRPp1X8A1+/JdMtBQbiQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/TU-Berlin/endpoint"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/dfnaai/endpoint"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/UVA/endpoint"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/CNRS/endpoint"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/TU-Berlin/endpoint" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/UVA/endpoint" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/CNRS/endpoint" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/dfnaai/endpoint" index="4"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e160</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e160</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Technische Universität Berlin</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Technische Universität Berlin</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.tu-berlin.de</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.tu-berlin.de</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Mathias</md:GivenName>
+ <md:SurName>Slawik</md:SurName>
+ <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Mathias</md:GivenName>
+ <md:SurName>Slawik</md:SurName>
+ <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Mathias</md:GivenName>
+ <md:SurName>Slawik</md:SurName>
+ <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml b/swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml
new file mode 100644
index 00000000..a9e06bb0
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/metadata.php/cyclone-saml-bridge">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-12-08T10:25:03Z">
+ <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>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">CYCLONE Federation Provider</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">CYCLONE Federation Provider</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Der CYCLONE Test Federation Provider dient zum Testen und zur Demonstration der im CYCLONE – Projekt entwickelten Technologien</mdui:Description>
+ <mdui:Description xml:lang="en">The CYCLONE Test Federation Provider is used for testing and demonstrating the technologies developed within the CYCLONE project</mdui:Description>
+ <mdui:Logo height="50" width="197">https://secure.cyclone-project.eu/assets/images/CYCLONE-LOGO-mini.png</mdui:Logo>
+ <mdui:PrivacyStatementURL xml:lang="en">https://secure.cyclone-project.eu/sp_privacy_policy.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>federation.cyclone-project.eu</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=federation.cyclone-project.eu,OU=Service-centric Networking,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIF4jCCBMqgAwIBAgIHGc8MRIp62zANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
+EwJERTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8w
+DQYDVQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAe
+Fw0xNTA3MjIxMjM4MTNaFw0xODEwMTgxMjM4MTNaMIGlMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xJzAlBgNVBAoMHlRlY2hu
+aXNjaGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEjMCEGA1UECwwaU2VydmljZS1jZW50
+cmljIE5ldHdvcmtpbmcxJjAkBgNVBAMMHWZlZGVyYXRpb24uY3ljbG9uZS1wcm9q
+ZWN0LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJTW+QZ156G
+51hhDG3nOpAdq+U9cb5kl0nEgFnvzSIu7tVZIr4dLBQjTFXfHl5tQ6JwbqxAvYFf
+Lco+1llQe25I5ax/ULQv+Y0uZC2992pnsSezRB2sVc4UNb/XnQMCRP6nKAeLLmwg
+ophcUmI5ItxkwftpW2iW8bAp3Rq3vpXHFVKgxvKXt8IQ37j0SwKVuSaDRbIdIPtC
+XjpRb9wXdKYgS+hCmF0IKblH5mowOr6qVy4ss+m/n3z23MoE3teTJrWK/urSRBuk
+7zzh5x4mVO5jH3/p8enh7ePX/sMgf68VDnIFrXPFdgDQxbv9eOGyMTyWX6Mt6AWE
+mVXA2SR1jQIDAQABo4ICUjCCAk4wTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEE
+AwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
+rSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSGIY/ZZD7VJ2s/fIl5bKlKV71I0DAfBgNV
+HSMEGDAWgBQjMkKe/mJCTvtO0BebeOftiow+eDAoBgNVHREEITAfgh1mZWRlcmF0
+aW9uLmN5Y2xvbmUtcHJvamVjdC5ldTCBgwYDVR0fBHwwejA7oDmgN4Y1aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmww
+O6A5oDeGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmVybGluLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIHTBggrBgEFBQcBAQSBxjCBwzAzBggrBgEFBQcwAYYnaHR0
+cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEUGCCsGAQUFBzAC
+hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+dHUtYmVybGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF
+AAOCAQEAcD7me5NvAkGAAMQSxlDVtmHi6foUPNt9adzUh1HujfkpKj7SDffpvFzl
+qjQuzcyXT03k0mC5BzRVZcvhoTHO8iAN84zD98C26kWUW4rrnX0J0LNlJ6WuTwG8
+gvNWLsYAZQQQWfSgRUGQXMzCFgXa/pFe8En63eh49MHhMNMFCZ+CBzLCxJmtGqRR
+/GTZHsUfmLgMcM/i77wPSSTz/WJ1XqpSdTX3ZcqxHTj91Mkle4feDbs0esiRrgm+
+pEG48bIOW7zC1nhkztvEfA5XgHVh9HvCV/QoeHOpuzCv8brHbPQtj1sZi6EsFb89
+awjhhm+d45PRPp1X8A1+/JdMtBQbiQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>federation.cyclone-project.eu</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=federation.cyclone-project.eu,OU=Service-centric Networking,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIF4jCCBMqgAwIBAgIHGc8MRIp62zANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
+EwJERTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8w
+DQYDVQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAe
+Fw0xNTA3MjIxMjM4MTNaFw0xODEwMTgxMjM4MTNaMIGlMQswCQYDVQQGEwJERTEP
+MA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xJzAlBgNVBAoMHlRlY2hu
+aXNjaGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEjMCEGA1UECwwaU2VydmljZS1jZW50
+cmljIE5ldHdvcmtpbmcxJjAkBgNVBAMMHWZlZGVyYXRpb24uY3ljbG9uZS1wcm9q
+ZWN0LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJTW+QZ156G
+51hhDG3nOpAdq+U9cb5kl0nEgFnvzSIu7tVZIr4dLBQjTFXfHl5tQ6JwbqxAvYFf
+Lco+1llQe25I5ax/ULQv+Y0uZC2992pnsSezRB2sVc4UNb/XnQMCRP6nKAeLLmwg
+ophcUmI5ItxkwftpW2iW8bAp3Rq3vpXHFVKgxvKXt8IQ37j0SwKVuSaDRbIdIPtC
+XjpRb9wXdKYgS+hCmF0IKblH5mowOr6qVy4ss+m/n3z23MoE3teTJrWK/urSRBuk
+7zzh5x4mVO5jH3/p8enh7ePX/sMgf68VDnIFrXPFdgDQxbv9eOGyMTyWX6Mt6AWE
+mVXA2SR1jQIDAQABo4ICUjCCAk4wTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEE
+AwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
+rSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSGIY/ZZD7VJ2s/fIl5bKlKV71I0DAfBgNV
+HSMEGDAWgBQjMkKe/mJCTvtO0BebeOftiow+eDAoBgNVHREEITAfgh1mZWRlcmF0
+aW9uLmN5Y2xvbmUtcHJvamVjdC5ldTCBgwYDVR0fBHwwejA7oDmgN4Y1aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmww
+O6A5oDeGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmVybGluLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIHTBggrBgEFBQcBAQSBxjCBwzAzBggrBgEFBQcwAYYnaHR0
+cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEUGCCsGAQUFBzAC
+hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+dHUtYmVybGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF
+AAOCAQEAcD7me5NvAkGAAMQSxlDVtmHi6foUPNt9adzUh1HujfkpKj7SDffpvFzl
+qjQuzcyXT03k0mC5BzRVZcvhoTHO8iAN84zD98C26kWUW4rrnX0J0LNlJ6WuTwG8
+gvNWLsYAZQQQWfSgRUGQXMzCFgXa/pFe8En63eh49MHhMNMFCZ+CBzLCxJmtGqRR
+/GTZHsUfmLgMcM/i77wPSSTz/WJ1XqpSdTX3ZcqxHTj91Mkle4feDbs0esiRrgm+
+pEG48bIOW7zC1nhkztvEfA5XgHVh9HvCV/QoeHOpuzCv8brHbPQtj1sZi6EsFb89
+awjhhm+d45PRPp1X8A1+/JdMtBQbiQ==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/saml2-logout.php/cyclone-saml-bridge"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/saml2-acs.php/cyclone-saml-bridge" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/saml1-acs.php/cyclone-saml-bridge" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/saml2-acs.php/cyclone-saml-bridge" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/saml1-acs.php/cyclone-saml-bridge/artifact" index="3"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="de">CYCLONE Federation Provider</md:ServiceName>
+ <md:ServiceName xml:lang="en">CYCLONE Federation Provider</md:ServiceName>
+ <md:ServiceDescription xml:lang="de">Der CYCLONE Test Federation Provider dient zum Testen und zur Demonstration der im CYCLONE – Projekt entwickelten Technologien</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">The CYCLONE Test Federation Provider is used for testing and demonstrating the technologies developed within the CYCLONE project</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e160</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e160</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Technische Universität Berlin</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Technische Universität Berlin</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.tu-berlin.de</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.tu-berlin.de</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Mathias</md:GivenName>
+ <md:SurName>Slawik</md:SurName>
+ <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Mathias</md:GivenName>
+ <md:SurName>Slawik</md:SurName>
+ <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Mathias</md:GivenName>
+ <md:SurName>Slawik</md:SurName>
+ <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml
index f460b511..41bd866b 100644
--- a/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml
@@ -9,12 +9,12 @@
<md:Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="nl">Hanzehogeschool Groningen</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Hanze University Groningen</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Hanze University of Applied Sciences</mdui:DisplayName>
<mdui:Description xml:lang="nl">Hanzehogeschool Groningen</mdui:Description>
- <mdui:Description xml:lang="en">Hanze University Groningen</mdui:Description>
- <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/hanze.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Hanze University Groningen Hanzehogeschool Groningen HBO</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Hanze University Groningen Hanzehogeschool Groningen HBO</mdui:Keywords>
+ <mdui:Description xml:lang="en">Hanze University of Applied Sciences</mdui:Description>
+ <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/hanze.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">hanze university groningen hanzehogeschool groningen hbo applied sciences</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">hanze university groningen hanzehogeschool groningen hbo</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
@@ -30,9 +30,9 @@
</md:IDPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="nl">Hanzehogeschool Groningen</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Hanze University Groningen</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Hanze University of Applied Sciences</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="nl">Hanzehogeschool Groningen</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Hanze University Groningen</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Hanze University of Applied Sciences</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="nl">https://www.hanze.nl/</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">https://www.hanze.nl/eng</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml
index 1b39c0b7..6f9a2806 100644
--- a/swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Hotelschool den Haag</mdui:DisplayName>
<mdui:Description xml:lang="nl">Hotelschool den Haag</mdui:Description>
<mdui:Description xml:lang="en">Hotelschool den Haag</mdui:Description>
- <mdui:Logo height="35" width="108">https://static.surfconext.nl/media/idp/hdh.gif</mdui:Logo>
+ <mdui:Logo height="35" width="108">https://static.surfconext.nl/logos/idp/hdh.gif</mdui:Logo>
<mdui:Keywords xml:lang="en">Hotelschool den Haag HDH</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Hotelschool den Haag HDH</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/federation.rijksmuseum.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.rijksmuseum.nl-adfs-services-trust.xml
index 0747fee9..54ad5efb 100644
--- a/swamid-interfederations-2.0/federation.rijksmuseum.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/federation.rijksmuseum.nl-adfs-services-trust.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:Description xml:lang="nl">Rijksmuseum Amsterdam</mdui:Description>
<mdui:Description xml:lang="en">Rijksmuseum Amsterdam</mdui:Description>
- <mdui:Logo height="300" width="500">https://static.surfconext.nl/media/idp/rijksmuseum_logo.png</mdui:Logo>
+ <mdui:Logo height="300" width="500">https://static.surfconext.nl/logos/idp/rijksmuseum_logo.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Rijksmuseum Amsterdam</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Rijksmuseum Amsterdam</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/federation.springer-sbm.com-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.springer-sbm.com-adfs-services-trust.xml
index f663790f..baa31f4a 100644
--- a/swamid-interfederations-2.0/federation.springer-sbm.com-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/federation.springer-sbm.com-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Springer Science+Business Media</mdui:DisplayName>
<mdui:Description xml:lang="nl">Springer Science+Business Media</mdui:Description>
<mdui:Description xml:lang="en">Springer Science+Business Media</mdui:Description>
- <mdui:Logo height="32" width="108">https://static.surfconext.nl/media/idp/springer.png</mdui:Logo>
+ <mdui:Logo height="32" width="108">https://static.surfconext.nl/logos/idp/springer.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Springer Science Business Media</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Springer Science Business Media</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml
index b486e15c..f923db56 100644
--- a/swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml
@@ -13,9 +13,9 @@
<mdui:DisplayName xml:lang="en">UMC Groningen</mdui:DisplayName>
<mdui:Description xml:lang="nl">UMCG</mdui:Description>
<mdui:Description xml:lang="en">UMCG</mdui:Description>
- <mdui:Logo height="264" width="500">https://static.surfconext.nl/media/sp/UMCGkort_fc.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">UMCG UMC Groningen</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">UMC Groningen UMCG</mdui:Keywords>
+ <mdui:Logo height="264" width="500">https://static.surfconext.nl/logos/sp/UMCGkort_fc.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">umcg UMC Groningen</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">UMC Groningen umcg</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml
index b9f32499..741a1aab 100644
--- a/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml
@@ -21,30 +21,24 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEdTCCA12gAwIBAgIQA+x4/gpIpc75aHTaD2HjdjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTAyMzAwMDAwMFoXDTE1MTIwOTIzNTk1OVowTDELMAkGA1UE
-BhMCRlIxHjAcBgNVBAoMFVVuaXZlcnNpdMOpIGRlIE7Drm1lczEdMBsGA1UEAxMU
-ZmVkZXJhdGlvbi51bmltZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDfE7PieWyEg8LeR53J/lE/B59bPXfHLEO+uLd3OBC8jTGkIRWvaqPgM1Gk
-lCzK/efmA1s11KncwGOTvJJJPeWFAOisznFMbNfhI1tPSYDIxlULXQBEnTCy9eUm
-JV2zo3MvCVFw1vJPXgyA7m4KsMu39meUuhK6emBfv0vz1Kh8eABMDR/c945d0TXP
-XCizQ9I3SyU/zVJ18XcaniaZ777mjNaNmT3ZJhqj85cSRQNBH1nAT4/GeLUMuyv1
-5ymGq0ytEhp8QKcWfwRvU5InOQlG17R8z7BxXtJbuvuaG7kk7UO8TJ4bHNU+14T9
-EqCKaalydIILjRBNfwe8fZ6b+ohvAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU720AGcrCuWMx7XX5CLNo5qGm
-JyswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZmVkZXJhdGlvbi51bmlt
-ZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBAJJRjU+uJplLJdi4qKubLFQv61lnWLMg
-w3IbQ2icm7u9dEUNIY2nXj8a2nBn6svWzNyPlvipHhEbj/KWkQPwmEIQWSBXz8aK
-cRG0kNEqEvrpkLVFakNWzm/T6pEh6VhRiu85LMQeMHo2zrFGOo92b/OY9NGq+nyX
-8kDchVM7wj/JlMU57UuZ7hCRsE/T+GgghBgCoU1u9Way8ker6s6DvPv38jgOT7/P
-cMz63qOCn2FWBpvJL1ykjw+vu4cL8NXdo51ZgYG+03hcb3lBFv5f3Y2y7Pitgy+K
-R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
+ MIIDQDCCAiigAwIBAgIVAJ1SM6iHte5TPCVs7XoW5WjkjB0PMA0GCSqGSIb3DQEB
+CwUAMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0xNTExMDMw
+OTQ4MTlaFw0zNTExMDMwOTQ4MTlaMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2Nh
+bGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4elIBs4zZa
+rIbDSXZLr/9cwkuZjqHqLRKHAQlGcqVFMOkwNPjq/c0nimGoWs2/bydBZzgsPWI8
+zNPIf9KIoBbuJ+TuTuBKEW59vO5R3Sag2DdPg/0LpSDHBrRjy/1tbrWZDGLAfwYa
+QYOkpp4MeS/CcYg58U5sodSNDgYisJoUiXBay6fBjOyj4J/7WsayikX6c4SJ8HOs
+o4eKPd9OVesOZnvcQQ31IfBqOxg4rCWVoT/dcR7qFNX4Zi/69eRkNgqyXeY1AKU4
+Pyi4q4Jrw/IvQPXVs5uKtcO+/my5Ejbgafsm2hyghugY8DM5IqfF+VJo8McIb+lM
+DSReDxilbJUCAwEAAaNxMG8wHQYDVR0OBBYEFFXQq0AoRGEAMklb1VTM+nZp7Tci
+ME4GA1UdEQRHMEWCFWxvY2FsaG9zdC5sb2NhbGRvbWFpboYsaHR0cHM6Ly9sb2Nh
+bGhvc3QubG9jYWxkb21haW4vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ggEBAIyOqoxmwdEdrK28tOI5aqrI2Piogd8wRFpiUIy6DBX8RxeSy8hBCay1CTKH
+mFjXeju4Nc0FOEO6qcXooz44t3PvJy0zT+9pG1O9l/dmNSj3DtrH19MS7stiXbIg
+ilTHN2gT0S7R7qwMIZWRZ5BmBd+kREuPmFY3V07y0O+4fi47OSHzLyosuKqAea9w
+zB1W/0CzVdLXupOO6VlFWzFO/hn34Tuyi/Y9qkBaHg9L7K1V46G/euePPMX/6UsZ
+W+3uQb7N9ip8Jtxrw+VKwZNm+8L4LFLv76RETfy72pKnf14BC9lSR4nDhgce7lHv
+5OaHjZWql53PgGifU8qG3+uLgCM=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -53,31 +47,24 @@ R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEpDCCA4ygAwIBAgIQL1M6BUXb9ey/N5UwsW6q8zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTExOTAwMDAwMFoXDTEyMTExODIzNTk1OVowezELMAkGA1UE
-BhMCRlIxDzANBgNVBAcMBk7Drm1lczEeMBwGA1UECgwVVW5pdmVyc2l0w6kgZGUg
-TsOubWVzMRwwGgYDVQQLExN1bml2ZXJzaXRlIGRlIG5pbWVzMR0wGwYDVQQDExRm
-ZWRlcmF0aW9uLnVuaW1lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANHvYAl0+rpik/m50vPpeormI0yeYWtu37gDW9P159zOraMiKjfTBU3r5Oe6
-PUa4jVWXfDuAO97LWdUMX4m1cTRO/v20JYPeSEVVJSOULzazC/kV9W7wPJRqONkt
-btJr7a0VgbGR1ZVVEJ3sZggLafUVT09n0YLhMMwdRPDpsD7iE7tdBQuEc7AlpLS0
-XWHx4P+6vDdIwyhFIJt8nyVkTs+JkZ+troK8wkYgW/l4bktrajcwQjOHiisdk4ZP
-WxRiNEcAdWcH4qp86pi6fG2YXy1deYnMtOIz5xyTTVwcl/7xCpWEnj1hbR2x7wRX
-twgfqAH95T0PhwuioSaj35DShFMCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTBXcQRRBdoAv1nWM2OU71HTFaZ
-xjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAWghRmZWRlcmF0aW9uLnVuaW1l
-cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAQi35VtjG2PEd7o4yAWU6acXgddghxls2
-2kqlN7KcFl6PpQ2lpHfUHVmncTmafoQEHmlgjFscWYgagRb1UQZ4pmquoEfr2v8Y
-0Fox/MQHIUV4xCPyRSIiSGOHAI62rG3HOrV2ha6LusjaJPNdNaetCgX+XJFFNKMm
-dnUIrUnxSsaMhx/zACINKnb09Ob2AGDz5KgFvq8V0IRcl09d/qWLE61m/wvIZfaF
-VTP5+9UA1RfGxEIOG3zA4D309fxapoVnb84yM9eRNgtw6hZrzDyZfNWQ1VkSVrFO
-xqaW8/4VYHjxNTVZ2KxsKKVL1ykc/9Gk5YAITiyKeWFjYhP17R9+Cw==
+ MIIDQDCCAiigAwIBAgIVANTxM7lRFuk6ldqI2pXvvz/5CUHLMA0GCSqGSIb3DQEB
+CwUAMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0xNTExMDMw
+OTQ4MjBaFw0zNTExMDMwOTQ4MjBaMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2Nh
+bGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMHIFt13E44F
++oa0nEIrepkyKokHuZYTtJvp54pCm6xIhxInknHC+MexzkiXxpnyVmkVSr2Lt2hU
+aLIle5Vyq2LpZi4NwBzAJ+bn16Nv4ykloG5lJnA4PI76p8VqhzOzKmGlDah+QbS0
+oLDihqJqwvWq7xmV25zsR+IUcp9e78ZtOk92zpSqYUfz2I28RfaS0UK5EBnwv4DK
+SObKPXVlVCgvYb43tx8lbAXDejlRqggGupxmQtleXVZEkwbKqtJKGuicNnnlOehv
+kmBqMI6Rfu20Ycvxp+B5NBt/MP71/LPFLgpizJjGCCOdFvPg65s6FOH1OEXwIqDS
+4shOp9vVdsECAwEAAaNxMG8wHQYDVR0OBBYEFH+PsJqcBET5E8pScs+hWpboo5oX
+ME4GA1UdEQRHMEWCFWxvY2FsaG9zdC5sb2NhbGRvbWFpboYsaHR0cHM6Ly9sb2Nh
+bGhvc3QubG9jYWxkb21haW4vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ggEBAFTEWw5vSdsD2kW6Mlf2SKSBsqNVxkjV0uba/f/t6Ab5++8EyM9uJXLOydhJ
+uOhuO4Mo1TuApbC95q9X883uS51At0DPz7Xgd/TcfkZ3iZe07IejWOszmE43SUky
+pidGfDeN17atHaIlsHJDc14YT/rt166VoJ6klrPd6OYA87yl+ctr3B35hgSdYBqu
+RPQoWOyEI4pXGNZx5D34635wHe1gSZwpEh+tcX7VL4otjLibizfNQuyRinEK9RYP
+gxArLNOySmnishD6YcQISMe3HUhOx+yUSxI+ed+UqZt1dk0zfV58/SqopQxoqmj2
+sNiDGGHIBx2cQAFLigJlndYt5rI=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -96,30 +83,24 @@ xqaW8/4VYHjxNTVZ2KxsKKVL1ykc/9Gk5YAITiyKeWFjYhP17R9+Cw==
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEdTCCA12gAwIBAgIQA+x4/gpIpc75aHTaD2HjdjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTAyMzAwMDAwMFoXDTE1MTIwOTIzNTk1OVowTDELMAkGA1UE
-BhMCRlIxHjAcBgNVBAoMFVVuaXZlcnNpdMOpIGRlIE7Drm1lczEdMBsGA1UEAxMU
-ZmVkZXJhdGlvbi51bmltZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDfE7PieWyEg8LeR53J/lE/B59bPXfHLEO+uLd3OBC8jTGkIRWvaqPgM1Gk
-lCzK/efmA1s11KncwGOTvJJJPeWFAOisznFMbNfhI1tPSYDIxlULXQBEnTCy9eUm
-JV2zo3MvCVFw1vJPXgyA7m4KsMu39meUuhK6emBfv0vz1Kh8eABMDR/c945d0TXP
-XCizQ9I3SyU/zVJ18XcaniaZ777mjNaNmT3ZJhqj85cSRQNBH1nAT4/GeLUMuyv1
-5ymGq0ytEhp8QKcWfwRvU5InOQlG17R8z7BxXtJbuvuaG7kk7UO8TJ4bHNU+14T9
-EqCKaalydIILjRBNfwe8fZ6b+ohvAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU720AGcrCuWMx7XX5CLNo5qGm
-JyswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZmVkZXJhdGlvbi51bmlt
-ZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBAJJRjU+uJplLJdi4qKubLFQv61lnWLMg
-w3IbQ2icm7u9dEUNIY2nXj8a2nBn6svWzNyPlvipHhEbj/KWkQPwmEIQWSBXz8aK
-cRG0kNEqEvrpkLVFakNWzm/T6pEh6VhRiu85LMQeMHo2zrFGOo92b/OY9NGq+nyX
-8kDchVM7wj/JlMU57UuZ7hCRsE/T+GgghBgCoU1u9Way8ker6s6DvPv38jgOT7/P
-cMz63qOCn2FWBpvJL1ykjw+vu4cL8NXdo51ZgYG+03hcb3lBFv5f3Y2y7Pitgy+K
-R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
+ MIIDQDCCAiigAwIBAgIVAJ1SM6iHte5TPCVs7XoW5WjkjB0PMA0GCSqGSIb3DQEB
+CwUAMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0xNTExMDMw
+OTQ4MTlaFw0zNTExMDMwOTQ4MTlaMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2Nh
+bGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4elIBs4zZa
+rIbDSXZLr/9cwkuZjqHqLRKHAQlGcqVFMOkwNPjq/c0nimGoWs2/bydBZzgsPWI8
+zNPIf9KIoBbuJ+TuTuBKEW59vO5R3Sag2DdPg/0LpSDHBrRjy/1tbrWZDGLAfwYa
+QYOkpp4MeS/CcYg58U5sodSNDgYisJoUiXBay6fBjOyj4J/7WsayikX6c4SJ8HOs
+o4eKPd9OVesOZnvcQQ31IfBqOxg4rCWVoT/dcR7qFNX4Zi/69eRkNgqyXeY1AKU4
+Pyi4q4Jrw/IvQPXVs5uKtcO+/my5Ejbgafsm2hyghugY8DM5IqfF+VJo8McIb+lM
+DSReDxilbJUCAwEAAaNxMG8wHQYDVR0OBBYEFFXQq0AoRGEAMklb1VTM+nZp7Tci
+ME4GA1UdEQRHMEWCFWxvY2FsaG9zdC5sb2NhbGRvbWFpboYsaHR0cHM6Ly9sb2Nh
+bGhvc3QubG9jYWxkb21haW4vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ggEBAIyOqoxmwdEdrK28tOI5aqrI2Piogd8wRFpiUIy6DBX8RxeSy8hBCay1CTKH
+mFjXeju4Nc0FOEO6qcXooz44t3PvJy0zT+9pG1O9l/dmNSj3DtrH19MS7stiXbIg
+ilTHN2gT0S7R7qwMIZWRZ5BmBd+kREuPmFY3V07y0O+4fi47OSHzLyosuKqAea9w
+zB1W/0CzVdLXupOO6VlFWzFO/hn34Tuyi/Y9qkBaHg9L7K1V46G/euePPMX/6UsZ
+W+3uQb7N9ip8Jtxrw+VKwZNm+8L4LFLv76RETfy72pKnf14BC9lSR4nDhgce7lHv
+5OaHjZWql53PgGifU8qG3+uLgCM=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -128,31 +109,24 @@ R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEpDCCA4ygAwIBAgIQL1M6BUXb9ey/N5UwsW6q8zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTExOTAwMDAwMFoXDTEyMTExODIzNTk1OVowezELMAkGA1UE
-BhMCRlIxDzANBgNVBAcMBk7Drm1lczEeMBwGA1UECgwVVW5pdmVyc2l0w6kgZGUg
-TsOubWVzMRwwGgYDVQQLExN1bml2ZXJzaXRlIGRlIG5pbWVzMR0wGwYDVQQDExRm
-ZWRlcmF0aW9uLnVuaW1lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANHvYAl0+rpik/m50vPpeormI0yeYWtu37gDW9P159zOraMiKjfTBU3r5Oe6
-PUa4jVWXfDuAO97LWdUMX4m1cTRO/v20JYPeSEVVJSOULzazC/kV9W7wPJRqONkt
-btJr7a0VgbGR1ZVVEJ3sZggLafUVT09n0YLhMMwdRPDpsD7iE7tdBQuEc7AlpLS0
-XWHx4P+6vDdIwyhFIJt8nyVkTs+JkZ+troK8wkYgW/l4bktrajcwQjOHiisdk4ZP
-WxRiNEcAdWcH4qp86pi6fG2YXy1deYnMtOIz5xyTTVwcl/7xCpWEnj1hbR2x7wRX
-twgfqAH95T0PhwuioSaj35DShFMCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTBXcQRRBdoAv1nWM2OU71HTFaZ
-xjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAWghRmZWRlcmF0aW9uLnVuaW1l
-cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAQi35VtjG2PEd7o4yAWU6acXgddghxls2
-2kqlN7KcFl6PpQ2lpHfUHVmncTmafoQEHmlgjFscWYgagRb1UQZ4pmquoEfr2v8Y
-0Fox/MQHIUV4xCPyRSIiSGOHAI62rG3HOrV2ha6LusjaJPNdNaetCgX+XJFFNKMm
-dnUIrUnxSsaMhx/zACINKnb09Ob2AGDz5KgFvq8V0IRcl09d/qWLE61m/wvIZfaF
-VTP5+9UA1RfGxEIOG3zA4D309fxapoVnb84yM9eRNgtw6hZrzDyZfNWQ1VkSVrFO
-xqaW8/4VYHjxNTVZ2KxsKKVL1ykc/9Gk5YAITiyKeWFjYhP17R9+Cw==
+ MIIDQDCCAiigAwIBAgIVANTxM7lRFuk6ldqI2pXvvz/5CUHLMA0GCSqGSIb3DQEB
+CwUAMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0xNTExMDMw
+OTQ4MjBaFw0zNTExMDMwOTQ4MjBaMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2Nh
+bGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMHIFt13E44F
++oa0nEIrepkyKokHuZYTtJvp54pCm6xIhxInknHC+MexzkiXxpnyVmkVSr2Lt2hU
+aLIle5Vyq2LpZi4NwBzAJ+bn16Nv4ykloG5lJnA4PI76p8VqhzOzKmGlDah+QbS0
+oLDihqJqwvWq7xmV25zsR+IUcp9e78ZtOk92zpSqYUfz2I28RfaS0UK5EBnwv4DK
+SObKPXVlVCgvYb43tx8lbAXDejlRqggGupxmQtleXVZEkwbKqtJKGuicNnnlOehv
+kmBqMI6Rfu20Ycvxp+B5NBt/MP71/LPFLgpizJjGCCOdFvPg65s6FOH1OEXwIqDS
+4shOp9vVdsECAwEAAaNxMG8wHQYDVR0OBBYEFH+PsJqcBET5E8pScs+hWpboo5oX
+ME4GA1UdEQRHMEWCFWxvY2FsaG9zdC5sb2NhbGRvbWFpboYsaHR0cHM6Ly9sb2Nh
+bGhvc3QubG9jYWxkb21haW4vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ggEBAFTEWw5vSdsD2kW6Mlf2SKSBsqNVxkjV0uba/f/t6Ab5++8EyM9uJXLOydhJ
+uOhuO4Mo1TuApbC95q9X883uS51At0DPz7Xgd/TcfkZ3iZe07IejWOszmE43SUky
+pidGfDeN17atHaIlsHJDc14YT/rt166VoJ6klrPd6OYA87yl+ctr3B35hgSdYBqu
+RPQoWOyEI4pXGNZx5D34635wHe1gSZwpEh+tcX7VL4otjLibizfNQuyRinEK9RYP
+gxArLNOySmnishD6YcQISMe3HUhOx+yUSxI+ed+UqZt1dk0zfV58/SqopQxoqmj2
+sNiDGGHIBx2cQAFLigJlndYt5rI=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/fides.rivm.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fides.rivm.nl-adfs-services-trust.xml
index 4116b874..df43aa31 100644
--- a/swamid-interfederations-2.0/fides.rivm.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fides.rivm.nl-adfs-services-trust.xml
@@ -10,9 +10,9 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:Description xml:lang="nl">Rijksinstituut voor Volksgezondheid en Milieu</mdui:Description>
<mdui:Description xml:lang="en">National Institute for Public Health and the Environment</mdui:Description>
- <mdui:Logo height="101" width="500">https://static.surfconext.nl/media/idp/RIVM_Logo.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">RIVM health environment rijk</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">RIVM volk gezondheid milieu rijk</mdui:Keywords>
+ <mdui:Logo height="101" width="500">https://static.surfconext.nl/logos/idp/RIVM_Logo.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">rivm health environment rijk</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">rivm volk gezondheid milieu rijk</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml b/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml
index 78dcc8d8..fffe3e9c 100644
--- a/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml
+++ b/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml
@@ -12,6 +12,14 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-toulouse.fr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-orleans-tours.fr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">orion.education.fr</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-guyane.fr</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-lyon.fr</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-amiens.fr</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-caen.fr</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-creteil.fr</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-dijon.fr</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-lille.fr</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">recherche.gouv.fr</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Education Nationale</mdui:DisplayName>
<mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACfklEQVQ4y32SW0jTARTGf/952WyueamWCmapQcsUCzNBsx4qiiRnPURBYZcHUyJYiEEQEVgRSFYEWZaXBzGyK1EmajfMLqI9uFkGlqLFSFELN+e204O6vGTf4znfdzjfOZ8iItnABsDFDLgRvla94em1GlTWEXK6ryJqBWUqSUTK5T+4tDpPzhj2yqCl9599RKR0TrVbpKfJKiN9g3NSfPkHhjp/0HK7ga5mC2NjLuYvCsa4aQ0JWekoWr9pXNVM8YvCas6uyOFdRT0hkQZiU+Nw253UHCuhcOUhel9apwumWnhaUCoFgVnSdPHebDf9dinfeVpO+Jmkr6nDW1dEpBQ48L35ExdT8tl9M5fE/Zu5EJ6Nb0QALqcbj9NFdIqRXWVmyjJPYbP2km+5AT5TLDRevsuStGgSszfj/uXAs8AHVbCG+Mx1GHesJSwuCgDThSMMdPXzufY9AL6CoKDQ9drKllN7ptlTq3yJN6UxanegN4QCoI81EJmyjM7GVpZvS0LlAXAIdpudoLBQr1hRFH677BQnH6c41cyHyjpvLzhyIb9sg+MbqADUCppQDcMTxYnjovcP5GhPJU7HKP46jbc33DdAWPzSKW9UIDI5lpaqBi/J4xaGRn9TcfAclYfPU3uyDICR7gG+vf1CzPqE8QGTyU7PM9FZZ6G9+hU+Og3hURGELV6MJjAArV5HgF4LwMOT19GG6jBuTZ6dgwe5V6RAnyVtlfWzM+vwyJ1DRZKv3iFdz9pm52By9SfmEp4XPcawOoJVGeuYF6LD1tHDx/vNiNPDvltmojOS/h575gCAn+3dWB410936GZdzDG2QjpiNicRtT8EvZN60V/8B3OKmKDpnnJwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDArMDI6MDDUOMI2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAwKzAyOjAwpWV6igAAAABJRU5ErkJggg==</mdui:Logo>
diff --git a/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml b/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
index 366c1a36..579522d7 100644
--- a/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fire.rettorato.unito.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fire.rettorato.unito.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml b/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
index 6cd26cd9..538a6eab 100644
--- a/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
+++ b/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
@@ -4,8 +4,6 @@
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 47fa352f..2eb2ccbc 100644
--- a/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-15T12:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
index 16774a7f..34693d6d 100644
--- a/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
@@ -510,13 +510,13 @@ G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</ds:X509Certificate
<md:ContactPerson contactType="technical">
<md:Company>Linköping University (ADFS)</md:Company>
<md:SurName>Johan Peterson</md:SurName>
- <md:EmailAddress>johan.peterson@liu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:johan.peterson@liu.se</md:EmailAddress>
<md:TelephoneNumber>+46 13 28 5730</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Linköping University (ADFS)</md:Company>
<md:SurName>LiU-IT:s Kundcenter</md:SurName>
- <md:EmailAddress>helpdesk@student.liu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@student.liu.se</md:EmailAddress>
<md:TelephoneNumber>+46 13 28 5898</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml
index fad88872..1a9c58ac 100644
--- a/swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">SURF</mdui:DisplayName>
<mdui:Description xml:lang="nl">SURF</mdui:Description>
<mdui:Description xml:lang="en">SURF</mdui:Description>
- <mdui:Logo height="86" width="44">https://static.surfconext.nl/media/idp/surf.png</mdui:Logo>
+ <mdui:Logo height="86" width="44">https://static.surfconext.nl/logos/idp/surf.png</mdui:Logo>
<mdui:Keywords xml:lang="en">SURF</mdui:Keywords>
<mdui:Keywords xml:lang="nl">SURF</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml
index 08c4f1fc..b085b97f 100644
--- a/swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">HZ University of Applied Sciences</mdui:DisplayName>
<mdui:Description xml:lang="nl">HZ University of Applied Sciences</mdui:Description>
<mdui:Description xml:lang="en">HZ University of Applied Sciences</mdui:Description>
- <mdui:Logo height="30" width="108">https://static.surfconext.nl/media/idp/hzeeland.png</mdui:Logo>
+ <mdui:Logo height="30" width="108">https://static.surfconext.nl/logos/idp/hzeeland.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml
index 1f424937..c208d065 100644
--- a/swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">ROC Mondriaan</mdui:DisplayName>
<mdui:Description xml:lang="nl">ROC Mondriaan</mdui:Description>
<mdui:Description xml:lang="en">ROC Mondriaan</mdui:Description>
- <mdui:Logo height="78" width="214">https://static.surfconext.nl/media/idp/ROC-Mondriaan_Logo.jpg</mdui:Logo>
+ <mdui:Logo height="78" width="214">https://static.surfconext.nl/logos/idp/ROC-Mondriaan_Logo.jpg</mdui:Logo>
<mdui:Keywords xml:lang="en">ROC Mondriaan MBO Den Haag Zuid Holland</mdui:Keywords>
<mdui:Keywords xml:lang="nl">ROC Mondriaan International Business Hotel Management</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
index c80e4ba3..14bd4883 100644
--- a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -13,13 +13,13 @@
<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="fi">Eduuni</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
<mdui:Description xml:lang="fi">Eduuni on sähköisen työskentelyn ja verkostoitumisen palveluympäristö.</mdui:Description>
<mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking.</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml
index 30bddecd..eaa3e287 100644
--- a/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://garr-idp-prod.irccs.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://garr-idp-prod.irccs.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml b/swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml
index d929a36b..081ece8a 100644
--- a/swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml
+++ b/swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">Delft University of Technology (OpenASelect)</mdui:DisplayName>
<mdui:Description xml:lang="nl">Technische Universiteit Delft</mdui:Description>
<mdui:Description xml:lang="en">Technische Universiteit Delft</mdui:Description>
- <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/tudelft.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Technische Universiteit Delft Delft University of Technology TUD TUDELFT</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Technische Universiteit Delft Delft University of Technology TUD TUDELFT</mdui:Keywords>
+ <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/tudelft.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">technische universiteit delft delft university of technology tud tudelft</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">technische universiteit delft delft university of technology tud tudelft</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml b/swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml
index a74745f1..28a7c792 100644
--- a/swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml
+++ b/swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/metadata.php/rm1_mlib-sp">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/metadata.php/rm1_mlib-sp">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-03-17T12:30:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/gidp.federations.renam.md.xml b/swamid-interfederations-2.0/gidp.federations.renam.md.xml
new file mode 100644
index 00000000..a6b894dc
--- /dev/null
+++ b/swamid-interfederations-2.0/gidp.federations.renam.md.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.federations.renam.md">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-12-01T08:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://federations.renam.md</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="ro">GIDP-RENAM</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">GIDP-RENAM</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="ru">GIDP-RENAM</mdui:DisplayName>
+ <mdui:Description xml:lang="ro">GIDP-RENAM - prestator de servicii de identitate utilizat de RENAM</mdui:Description>
+ <mdui:Description xml:lang="en">GIDP-RENAM - identity provider used by RENAM</mdui:Description>
+ <mdui:Description xml:lang="ru">GIDP-RENAM - сервис для идентификации сотрудников RENAM</mdui:Description>
+ <mdui:InformationURL xml:lang="ro">https://gidp.federations.renam.md</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://gidp.federations.renam.md</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="ru">https://gidp.federations.renam.md</mdui:InformationURL>
+ <mdui:Logo height="121" width="205">https://gidp.federations.renam.md/renam.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIE7zCCA9egAwIBAgICAPAwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
+ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
+IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
+cmlkIENBMB4XDTE1MTEyODIxMTkzM1oXDTI1MTEyNTIxMTkzM1owVzESMBAGCgmS
+JomT8ixkARkWAk1EMRowGAYKCZImiZPyLGQBGRYKRmVkZXJhdGlvbjEOMAwGA1UE
+ChMFUkVOQU0xFTATBgNVBAMTDEdJRFBNZXRhU2lnbjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAPF69NvGFIb22cXX2ikG6oRGwfe3h/qdeEiYirjhkp49
+XuGpQ4zY1TXEczuI28oTvLPNbDKPu+11w6Ncmie1Kwsj7C6VOo5c5ru9QVDJt1xF
+7DVWpSZhdKeRNKm1Jtg9W6ghAzl+BQzl4R8K4SmznPoBsCzJoLGbEQ7Vgfmy2uWE
+DN2cb37Fyw/dktzD0wVWC/YS8ZAFoPW/6eCJyqrF0zQ+gxgkEAFOX6+UycG7AIHm
+GJEyFQdJZDzsejlCH5KpzlsuRuZzhA/upSYVROrf+KTDTmydsdskcXCy3vAEWLjP
+OuAfFN8j7ij8+/Q1k1lTdy5IZ4xDTsU5h2/JOt8aMJECAwEAAaOCAaYwggGiMB0G
+A1UdDgQWBBTwpsknXDfs+ZgEhfq1cY6m8hv/cjAfBgNVHSMEGDAWgBQHQ26bo1u5
+q+z02L86Gw2jKbg1YjA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUHMAKGHmh0dHA6
+Ly9jYS5ncmlkLm1kL2ZpbGVzL2NhLmNydDAzBgNVHR8ELDAqMCigJqAkhiJodHRw
+Oi8vY2EuZ3JpZC5tZC9maWxlcy9jcmwtdjIuY3JsMAsGA1UdEQQEMAKCADApBgNV
+HRIEIjAggQtjYUByZW5hbS5tZIYRaHR0cDovL2NhLmdyaWQubWQwgbYGA1UdIASB
+rjCBqzAOBgwrBgEEAYHzWgoBAQQwgZgGCiqGSIb3TAUCAgEwgYkwNgYIKwYBBQUH
+AgEWKmh0dHA6Ly9jYS5ncmlkLm1kL2ZpbGVzL01ELUdyaWQtQ1AtQ1BTLnBkZjBP
+BggrBgEFBQcCAjBDGkFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly9jYS5n
+cmlkLm1kL2ZpbGVzL01ELUdyaWQtQ1AtQ1BTLnBkZjANBgkqhkiG9w0BAQsFAAOC
+AQEATlnDNLLCx2eiTYLDPeeS3IntyilM/ND90Coy8Ogb4+ZLfJzQBPdWUhv8+VUb
+2HcBt+1ytJ3c+nfiZS09CBmR0pXr8QtHKJnL72SOO7Jj1LnZ1jqQkm70xcG7/pgn
+81EYQAm5O4i3xAdAbFOSAPYWcIEdvXFdt1B4LxYaogpJBF6dfxWrQlp5oHtaYmx3
+2Hal2K3pUMSxtEAvE7cXddjsGVU+o4mCXIBTmBG5qfJ193xNLkFwuhMODYiU+cTs
++cHDef8L8nqolX1coNKIwJnd8jQalj7W5wvAlBIq47Uog2zWxyi5LS3R9UApI7Bp
+cOnlbkVFhq8dS6BrkwXGRrnBNg==
+</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>
+MIIE7zCCA9egAwIBAgICAPAwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
+ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
+IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
+cmlkIENBMB4XDTE1MTEyODIxMTkzM1oXDTI1MTEyNTIxMTkzM1owVzESMBAGCgmS
+JomT8ixkARkWAk1EMRowGAYKCZImiZPyLGQBGRYKRmVkZXJhdGlvbjEOMAwGA1UE
+ChMFUkVOQU0xFTATBgNVBAMTDEdJRFBNZXRhU2lnbjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAPF69NvGFIb22cXX2ikG6oRGwfe3h/qdeEiYirjhkp49
+XuGpQ4zY1TXEczuI28oTvLPNbDKPu+11w6Ncmie1Kwsj7C6VOo5c5ru9QVDJt1xF
+7DVWpSZhdKeRNKm1Jtg9W6ghAzl+BQzl4R8K4SmznPoBsCzJoLGbEQ7Vgfmy2uWE
+DN2cb37Fyw/dktzD0wVWC/YS8ZAFoPW/6eCJyqrF0zQ+gxgkEAFOX6+UycG7AIHm
+GJEyFQdJZDzsejlCH5KpzlsuRuZzhA/upSYVROrf+KTDTmydsdskcXCy3vAEWLjP
+OuAfFN8j7ij8+/Q1k1lTdy5IZ4xDTsU5h2/JOt8aMJECAwEAAaOCAaYwggGiMB0G
+A1UdDgQWBBTwpsknXDfs+ZgEhfq1cY6m8hv/cjAfBgNVHSMEGDAWgBQHQ26bo1u5
+q+z02L86Gw2jKbg1YjA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUHMAKGHmh0dHA6
+Ly9jYS5ncmlkLm1kL2ZpbGVzL2NhLmNydDAzBgNVHR8ELDAqMCigJqAkhiJodHRw
+Oi8vY2EuZ3JpZC5tZC9maWxlcy9jcmwtdjIuY3JsMAsGA1UdEQQEMAKCADApBgNV
+HRIEIjAggQtjYUByZW5hbS5tZIYRaHR0cDovL2NhLmdyaWQubWQwgbYGA1UdIASB
+rjCBqzAOBgwrBgEEAYHzWgoBAQQwgZgGCiqGSIb3TAUCAgEwgYkwNgYIKwYBBQUH
+AgEWKmh0dHA6Ly9jYS5ncmlkLm1kL2ZpbGVzL01ELUdyaWQtQ1AtQ1BTLnBkZjBP
+BggrBgEFBQcCAjBDGkFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly9jYS5n
+cmlkLm1kL2ZpbGVzL01ELUdyaWQtQ1AtQ1BTLnBkZjANBgkqhkiG9w0BAQsFAAOC
+AQEATlnDNLLCx2eiTYLDPeeS3IntyilM/ND90Coy8Ogb4+ZLfJzQBPdWUhv8+VUb
+2HcBt+1ytJ3c+nfiZS09CBmR0pXr8QtHKJnL72SOO7Jj1LnZ1jqQkm70xcG7/pgn
+81EYQAm5O4i3xAdAbFOSAPYWcIEdvXFdt1B4LxYaogpJBF6dfxWrQlp5oHtaYmx3
+2Hal2K3pUMSxtEAvE7cXddjsGVU+o4mCXIBTmBG5qfJ193xNLkFwuhMODYiU+cTs
++cHDef8L8nqolX1coNKIwJnd8jQalj7W5wvAlBIq47Uog2zWxyi5LS3R9UApI7Bp
+cOnlbkVFhq8dS6BrkwXGRrnBNg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.federations.renam.md/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://gidp.federations.renam.md/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="ro">RENAM</md:OrganizationName>
+ <md:OrganizationName xml:lang="ru">RENAM</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">RENAM</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="ro">RENAM</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="ru">RENAM</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">RENAM</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="ru">http://renam.md</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="ro">http://renam.md</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://renam.md</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Valentin</md:GivenName>
+ <md:SurName>Pocotilenco</md:SurName>
+ <md:EmailAddress>mailto:pvv@renam.md</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
index 7f6f80bf..b191352a 100644
--- a/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
@@ -107,19 +107,19 @@ icptKTpDxrRjfCXibBT1
<md:ContactPerson contactType="administrative">
<md:Company>The Swedish School of Sport and Health Sciences</md:Company>
<md:SurName>Fredrik Nilsson</md:SurName>
- <md:EmailAddress>fredrik.nilsson@gih.se</md:EmailAddress>
+ <md:EmailAddress>mailto:fredrik.nilsson@gih.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 12053734</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>The Swedish School of Sport and Health Sciences</md:Company>
<md:SurName>Michael Thunell</md:SurName>
- <md:EmailAddress>michael.thunell@gih.se</md:EmailAddress>
+ <md:EmailAddress>mailto:michael.thunell@gih.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 12053807</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>The Swedish School of Sport and Health Sciences</md:Company>
<md:SurName>Charlie Skog</md:SurName>
- <md:EmailAddress>charlie.skog@gih.se</md:EmailAddress>
+ <md:EmailAddress>mailto:charlie.skog@gih.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 12053792</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml
index 90d35a8d..676b7451 100644
--- a/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gisela-gw.ct.infn.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gisela-gw.ct.infn.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-30T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
diff --git a/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
index d4528cd6..46e9d55a 100644
--- a/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
@@ -48,11 +48,14 @@ RmuXgPAZEv19nTEdQKEFyx9iFmdOFc7/IKQdPQWVriSBzJRdc7dl1+RnUzZ2hsY3
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/Artifact" index="7"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/ECP" index="8"/>
<md:AttributeConsumingService index="1">
<md:ServiceName xml:lang="en">Gravitational-wave Candidate Event Database</md:ServiceName>
<md:ServiceDescription xml:lang="en">GraceDB organizes candidate events from gravitational-wave searches and provides an environment to record information about follow-ups. </md:ServiceDescription>
- <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..130765be
--- /dev/null
+++ b/swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grnetbox.duth.gr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">duth.gr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Democritus University of Thrace</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.duth.gr/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="el">http://www.duth.gr/</mdui:InformationURL>
+ <mdui:Logo height="69" width="156">https://utopia.duth.gr/images/duth_logo_156x69.png</mdui:Logo>
+ <mdui:Logo height="64" width="64">https://utopia.duth.gr/images/duth_logo_64x64.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>duth.gr</mdui:DomainHint>
+ <mdui:IPHint>192.108.114.0/24</mdui:IPHint>
+ <mdui:IPHint>83.212.128.0/19</mdui:IPHint>
+ <mdui:IPHint>83.212.160.0/21</mdui:IPHint>
+ <mdui:IPHint>2001:648:2e80::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:41.136504, 25.372488</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIF/TCCBWagAwIBAgIBBzANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCR1Ix
+ LjAsBgNVBAoTJUdyZWVrIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5IE5ldHdvcmsx
+ LzAtBgNVBAMTJkdSTkVUIEdybmV0Ym94IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+ MR4wHAYJKoZIhvcNAQkBFg9jYUBub2MuZ3JuZXQuZ3IwHhcNMTAwMTI3MTMxMDAw
+ WhcNMTUwMTI2MTMxMDAwWjBYMQswCQYDVQQGEwJHUjEuMCwGA1UEChMlR3JlZWsg
+ UmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEZMBcGA1UEAxMQZ3JuZXRi
+ b3guZHV0aC5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnj3Hsi
+ yckz+IisKeI8KCCapb42qNVJ3qEm26dLQcSfz9EGL955L6dhlqEdsdtviml6to9w
+ sVV/EgzZNw+9zGDD33Qbq770RCrGwj47VkTeN20ECB06PW0qUVZuYwL3D0jeq09U
+ 65MXFa0W3DinYGlH/0kj0NrYNutKqspQXgxj587CfiQEvNf52W3HYhI46ZpdafUZ
+ txOGd6f33kFFtchkfs1K7WXNI2Myr18kWsGn+8UZdSrv6HRn3cx8KqDP23C4WeAa
+ 9CWqZCd0mQ9x7CTtpaGdptRrUKeaL7zmo/c7aGhbHyXnDszP+/GkbvFAsqqrgqFF
+ b0qEEL7oTXrn7AECAwEAAaOCAxowggMWMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4
+ QgEBBAQDAgbAMIGPBglghkgBhvhCAQ0EgYEWf1RoaXMgY2VydGlmaWNhdGUgaXMg
+ c3ViamVjdCB0byBHcmVlayBsYXdzIGFuZCBHUk5FVCdzIENQUyBhbmQgbXVzdCBv
+ bmx5IGJlIHVzZWQgZm9yIEFjYWRlbWljLCBSZXNlYXJjaCBvciBFZHVjYXRpb25h
+ bCBwdXJwb3Nlcy4wHQYDVR0OBBYEFOcrove1OrOCKMabX2D9cx4TP0IXMIG7BgNV
+ HSMEgbMwgbCAFAoZMZ2th54nXoq9jp6+4FZvEvnPoYGUpIGRMIGOMQswCQYDVQQG
+ EwJHUjEuMCwGA1UEChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0
+ d29yazEzMDEGA1UEAxMqR1JuZXQgQ2VudHJhbCBDZXJ0aWZpY2F0aW9uIEF1dGhv
+ cml0eSAyMDA5MRowGAYJKoZIhvcNAQkBFgtjYUBncm5ldC5ncoIBAzAgBgNVHSUB
+ Af8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgTwMBsGA1Ud
+ EQQUMBKCEGdybmV0Ym94LmR1dGguZ3IwPgYJYIZIAYb4QgECBDEWL2h0dHBzOi8v
+ Y3JsdjEucGtpLmdybmV0LmdyL0dybmV0U2VydmVyc0NBLzIwMDkvMCMGCWCGSAGG
+ +EIBBAQWFhRuc19yZXZva2VfcXVlcnkucGhwPzBPBglghkgBhvhCAQgEQhZAaHR0
+ cDovL3d3dy5wa2kuZ3JuZXQuZ3IvZG9jdW1lbnRzL0dybmV0U2VydmVyc0NBLzIw
+ MDkvQ1AxLjAuaHRtbDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6
+ Ly9vY3NwLnBraS5ncm5ldC5nci8wSAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL2Ny
+ bHYxLnBraS5ncm5ldC5nci9Hcm5ldFNlcnZlcnNDQS8yMDA5L2NybHYxLmNybDAN
+ BgkqhkiG9w0BAQUFAAOBgQB2M+X92LGPeSzIHK32x2RCeo+j4tCazhkl7kSGd4NY
+ eiWAYwH4cpOr5Xi0zLBG/vdCRuZGsRZgoRAeqMQO0mRhCSOK+s1APux6yDQLk+Yy
+ pNBpS87jQzgaOP0J4JXKd+lcLNN+FYoA+PZX8zaPELVWTG1DYBK//D4qe0/GCAQt
+ zg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.duth.gr/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.duth.gr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.duth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.duth.gr/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">duth.gr</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIF/TCCBWagAwIBAgIBBzANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCR1Ix
+ LjAsBgNVBAoTJUdyZWVrIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5IE5ldHdvcmsx
+ LzAtBgNVBAMTJkdSTkVUIEdybmV0Ym94IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+ MR4wHAYJKoZIhvcNAQkBFg9jYUBub2MuZ3JuZXQuZ3IwHhcNMTAwMTI3MTMxMDAw
+ WhcNMTUwMTI2MTMxMDAwWjBYMQswCQYDVQQGEwJHUjEuMCwGA1UEChMlR3JlZWsg
+ UmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEZMBcGA1UEAxMQZ3JuZXRi
+ b3guZHV0aC5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnj3Hsi
+ yckz+IisKeI8KCCapb42qNVJ3qEm26dLQcSfz9EGL955L6dhlqEdsdtviml6to9w
+ sVV/EgzZNw+9zGDD33Qbq770RCrGwj47VkTeN20ECB06PW0qUVZuYwL3D0jeq09U
+ 65MXFa0W3DinYGlH/0kj0NrYNutKqspQXgxj587CfiQEvNf52W3HYhI46ZpdafUZ
+ txOGd6f33kFFtchkfs1K7WXNI2Myr18kWsGn+8UZdSrv6HRn3cx8KqDP23C4WeAa
+ 9CWqZCd0mQ9x7CTtpaGdptRrUKeaL7zmo/c7aGhbHyXnDszP+/GkbvFAsqqrgqFF
+ b0qEEL7oTXrn7AECAwEAAaOCAxowggMWMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4
+ QgEBBAQDAgbAMIGPBglghkgBhvhCAQ0EgYEWf1RoaXMgY2VydGlmaWNhdGUgaXMg
+ c3ViamVjdCB0byBHcmVlayBsYXdzIGFuZCBHUk5FVCdzIENQUyBhbmQgbXVzdCBv
+ bmx5IGJlIHVzZWQgZm9yIEFjYWRlbWljLCBSZXNlYXJjaCBvciBFZHVjYXRpb25h
+ bCBwdXJwb3Nlcy4wHQYDVR0OBBYEFOcrove1OrOCKMabX2D9cx4TP0IXMIG7BgNV
+ HSMEgbMwgbCAFAoZMZ2th54nXoq9jp6+4FZvEvnPoYGUpIGRMIGOMQswCQYDVQQG
+ EwJHUjEuMCwGA1UEChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0
+ d29yazEzMDEGA1UEAxMqR1JuZXQgQ2VudHJhbCBDZXJ0aWZpY2F0aW9uIEF1dGhv
+ cml0eSAyMDA5MRowGAYJKoZIhvcNAQkBFgtjYUBncm5ldC5ncoIBAzAgBgNVHSUB
+ Af8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgTwMBsGA1Ud
+ EQQUMBKCEGdybmV0Ym94LmR1dGguZ3IwPgYJYIZIAYb4QgECBDEWL2h0dHBzOi8v
+ Y3JsdjEucGtpLmdybmV0LmdyL0dybmV0U2VydmVyc0NBLzIwMDkvMCMGCWCGSAGG
+ +EIBBAQWFhRuc19yZXZva2VfcXVlcnkucGhwPzBPBglghkgBhvhCAQgEQhZAaHR0
+ cDovL3d3dy5wa2kuZ3JuZXQuZ3IvZG9jdW1lbnRzL0dybmV0U2VydmVyc0NBLzIw
+ MDkvQ1AxLjAuaHRtbDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6
+ Ly9vY3NwLnBraS5ncm5ldC5nci8wSAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL2Ny
+ bHYxLnBraS5ncm5ldC5nci9Hcm5ldFNlcnZlcnNDQS8yMDA5L2NybHYxLmNybDAN
+ BgkqhkiG9w0BAQUFAAOBgQB2M+X92LGPeSzIHK32x2RCeo+j4tCazhkl7kSGd4NY
+ eiWAYwH4cpOr5Xi0zLBG/vdCRuZGsRZgoRAeqMQO0mRhCSOK+s1APux6yDQLk+Yy
+ pNBpS87jQzgaOP0J4JXKd+lcLNN+FYoA+PZX8zaPELVWTG1DYBK//D4qe0/GCAQt
+ zg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Democritus University of Thrace</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Democritus University of Thrace</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.duth.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.duth.gr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:Company>Democritus University of Thrace NOC</md:Company>
+ <md:EmailAddress>noc@duth.gr</md:EmailAddress>
+ <md:TelephoneNumber>+30-25410-79200</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>Democritus University of Thrace NOC</md:Company>
+ <md:EmailAddress>noc@duth.gr</md:EmailAddress>
+ <md:TelephoneNumber>+30-25410-79200</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
index de708f72..bbfaa609 100644
--- a/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.idem.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.idem.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-21T14:30:22Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml b/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml
index afdff111..82326a8b 100644
--- a/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.idem.garr.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.idem.garr.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-21T11:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/groupes.renater.fr-sympa.xml b/swamid-interfederations-2.0/groupes.renater.fr-sympa.xml
new file mode 100644
index 00000000..996ec832
--- /dev/null
+++ b/swamid-interfederations-2.0/groupes.renater.fr-sympa.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://groupes.renater.fr/sympa">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-01T11:45:56Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+ <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">RENATER - Universalistes</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="fr">https://groupes.renater.fr/sympa</mdui:InformationURL>
+ <mdui:DisplayName xml:lang="fr">RENATER - Universalistes</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Universalistes est le service de groupware de RENATER.
+
+Il permet aux utilisateurs de créer des groupes disposant des outils suivants :
+- liste de diffusion
+- wiki
+- prise de rendez-vous
+- sondage</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIICoTCCAgqgAwIBAgIJAPdDY8XfnR75MA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNV
+BAYTAkZSMRQwEgYDVQQKEwtHSVAgUkVOQVRFUjEbMBkGA1UEAxMSZ3JvdXBlcy5y
+ZW5hdGVyLmZyMB4XDTEyMDQwNDE1MTc1MloXDTMyMDMzMDE1MTc1MlowQDELMAkG
+A1UEBhMCRlIxFDASBgNVBAoTC0dJUCBSRU5BVEVSMRswGQYDVQQDExJncm91cGVz
+LnJlbmF0ZXIuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJGMhk8cQ8Ti
+g+xtLGz5Acg0KpRBndgzMvN4Tp1NAkh+C8+zUfFfiAErA4L7h1P1eeP34z9hXMVH
+BAKdOluSsMRpXeuFsFvw1H2wVrPdrAYWL4HEnhvvmHtUyt7r2+w0AMcoYmYovpJy
+YuLS05aTNRx/NqCaHENcJWjNePy1I7dVAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFGln
+RkCGn5XLH3Pc4q5jx0ysRGN2MHAGA1UdIwRpMGeAFGlnRkCGn5XLH3Pc4q5jx0ys
+RGN2oUSkQjBAMQswCQYDVQQGEwJGUjEUMBIGA1UEChMLR0lQIFJFTkFURVIxGzAZ
+BgNVBAMTEmdyb3VwZXMucmVuYXRlci5mcoIJAPdDY8XfnR75MAwGA1UdEwQFMAMB
+Af8wDQYJKoZIhvcNAQEFBQADgYEALwdiWiyOmhGyozhBa+lT0i+JFKpLJzQUilqI
+BixcuiH/bClNPNA0Rr3gNOlzl5uMxz0s1Dfp+M0mjf1+AgQ5i7Vu3vG2bh10xR9t
+slMraAvScqJOYoi798luASiH/LBBFUXHbPx4zk+JxNDTfXhat6OmWzi/Xld6nRry
+tRX99iQ=
+ </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>
+ MIICoTCCAgqgAwIBAgIJAPdDY8XfnR75MA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNV
+BAYTAkZSMRQwEgYDVQQKEwtHSVAgUkVOQVRFUjEbMBkGA1UEAxMSZ3JvdXBlcy5y
+ZW5hdGVyLmZyMB4XDTEyMDQwNDE1MTc1MloXDTMyMDMzMDE1MTc1MlowQDELMAkG
+A1UEBhMCRlIxFDASBgNVBAoTC0dJUCBSRU5BVEVSMRswGQYDVQQDExJncm91cGVz
+LnJlbmF0ZXIuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJGMhk8cQ8Ti
+g+xtLGz5Acg0KpRBndgzMvN4Tp1NAkh+C8+zUfFfiAErA4L7h1P1eeP34z9hXMVH
+BAKdOluSsMRpXeuFsFvw1H2wVrPdrAYWL4HEnhvvmHtUyt7r2+w0AMcoYmYovpJy
+YuLS05aTNRx/NqCaHENcJWjNePy1I7dVAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFGln
+RkCGn5XLH3Pc4q5jx0ysRGN2MHAGA1UdIwRpMGeAFGlnRkCGn5XLH3Pc4q5jx0ys
+RGN2oUSkQjBAMQswCQYDVQQGEwJGUjEUMBIGA1UEChMLR0lQIFJFTkFURVIxGzAZ
+BgNVBAMTEmdyb3VwZXMucmVuYXRlci5mcoIJAPdDY8XfnR75MAwGA1UdEwQFMAMB
+Af8wDQYJKoZIhvcNAQEFBQADgYEALwdiWiyOmhGyozhBa+lT0i+JFKpLJzQUilqI
+BixcuiH/bClNPNA0Rr3gNOlzl5uMxz0s1Dfp+M0mjf1+AgQ5i7Vu3vG2bh10xR9t
+slMraAvScqJOYoi798luASiH/LBBFUXHbPx4zk+JxNDTfXhat6OmWzi/Xld6nRry
+tRX99iQ=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIICjzCCAfigAwIBAgIJANzMu0IV83S0MA0GCSqGSIb3DQEBBQUAMDoxCzAJBgNV
+BAYTAkZSMRAwDgYDVQQKEwdSRU5BVEVSMRkwFwYDVQQDExBiYWJlbC5yZW5hdGVy
+LmZyMB4XDTEyMDEzMTEwNDY1M1oXDTMyMDEyNjEwNDY1M1owOjELMAkGA1UEBhMC
+RlIxEDAOBgNVBAoTB1JFTkFURVIxGTAXBgNVBAMTEGJhYmVsLnJlbmF0ZXIuZnIw
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAORAbR40lHI9l3gICzBcydh2DdAW
+vAVzjyyDvhpaMUkAfYEp6lHOfqOC6f1JsGiu3bfWoZqTf1knW+95xnvuMiJAMY8C
+5P0hRgPIkiejYC7igm0JHAeFTya4hzY+ZJKkC/PY6mKZVzWfdBeLZhYozqXiG6Wt
+0x79EYxPbwqNRsxVAgMBAAGjgZwwgZkwHQYDVR0OBBYEFPSl1AwmOjcQTd/nF+F6
+rzkg2/SUMGoGA1UdIwRjMGGAFPSl1AwmOjcQTd/nF+F6rzkg2/SUoT6kPDA6MQsw
+CQYDVQQGEwJGUjEQMA4GA1UEChMHUkVOQVRFUjEZMBcGA1UEAxMQYmFiZWwucmVu
+YXRlci5mcoIJANzMu0IV83S0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+gYEAbA8HBZTvGmi1mANKgPKlknYAT9olC6wHuCZI5UHYxaoRv6lY6LA8BjeyFPWy
+xQ9lTeD31gYHQRlu9NxaKFTnay58By/PAkdRzZfpohXFCj2gTX2Vnd/of0F5+4mS
+OcnzyMjo+f3ngAPx/LMg/pxM21R1GzpaZeyz9ErgUvc8MJs=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes.renater.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes.renater.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="fr">RENATER - Universalistes</md:ServiceName>
+ <md:ServiceDescription xml:lang="fr">Universalistes est le service de groupware de RENATER.
+
+Il permet aux utilisateurs de créer des groupes disposant des outils suivants :
+- liste de diffusion
+- wiki
+- prise de rendez-vous
+- sondage</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>listmaster@groupes.renater.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gteavirtual.org.xml b/swamid-interfederations-2.0/gteavirtual.org.xml
index 91b9b491..9aa43c3b 100644
--- a/swamid-interfederations-2.0/gteavirtual.org.xml
+++ b/swamid-interfederations-2.0/gteavirtual.org.xml
@@ -10,7 +10,7 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIFyjCCA7ICCQCkUnPQ/PtKmzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wHhcNMTExMTE5MjMwNTAxWhcNMTYxMTE3MjMwNTAxWjCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFUagwJ9IvqMmMGKHFQ3XmAr6G7B0suWqbHPMWBfIlyu6cm0NWhH1JsiDxEhUxljmk+B4FZOWI9YcNo1YB1pO8wYJTeviqzrQDNjqURUOsyfYdQn3L2k4f9exQT25cmXhu0h8zybslGQDKWZZPH/S/jMpShPjIlrRx/ARrEbH/CgLHviS1oVKi/IkwZ55Gwd5/ikvUaQL+cmPsVPIzMrKgxGJk37RmFgRKYMvjqsMF8IKzOJRMxm342aJNP7Tka/C4p4E+nmFcqN5ak4rljqpjucjwGGNpKiZ4XZN/7ItpI2Lcj8tmW6UZx6/55r99OjwrmnkLd6bLWnHsavMnABkdp54st5uplhEfkSV9rP67k5MOpGSQFZGFyvSteMUc8atiZjaeZQ8YOugC8HMB/zIg7TGx5/pqHJjYNxYmHp0EkEmw8ahGOS0dsFWxzlHP36OvhSXQ5OQxj9iQLIF2j56RHYfedcJjkb5KbnBanfNVWgOZnPtmsYFy6d1hjWsnvLPd5B1Jt2F+zAsQlFIkJ9jJOWd7+QpeeUi8AC1XMTjHkDnlkEROvk5JQYYNG+CHY9brTH/vCmT7gLHF6pOEBdjtLhoK7G8oB2Flmq7vZUyFbRMSjBvBiBwZZLdMtn1Zj9tEWmWHgcYcVyPN4QeIcjJI63le4UP4RkJKgRZBbspEZwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCVOFINDie1oi7tXIXnvc43aZMxgjojUp0JCkVMpNsbF34X1C09FA5CiIngISYtP4FF7tbMjq08FnbjOUUEzYqhjAWKXCRipEOAED1todVlu14AL4P66HLWXUq5pahuYKwzSs+f7Km3d2Ttfv0GeYHfHEhIc4xOTiEEQ2J2zZpdJaDgRxRVTGIC4GAAh13EGd2DZQi87tK5dxQ4Lrrae/ko+7JxWmHY24emCRQNB97huD4IHMXDU9geiBf4PVwueI7/FSPAiyCanCc5GpZdZMW3JBegsfNi64lm5MjGLhp2pD3dKq33lG4IoDt4kT9ta6TDk/JLLxNIkAAliGMT8qPZlVQMTqkMchKz4NaUZTz0K6cobkSYpo5OLdfT4ukcN/rIup4/ha0kXX7sj7sgDuUV7EtLkUJyNIZOdjphaBRdxyPjXLrrmpaBCyWZxz4CZCu4xhsV8LJvFnfC5nb+r13WpZLN2Mdv74z8LPZ6hxtCaVVgcnlWaO1SslpagDVE2t0s0PpJWivf9+wssIOK5fRyagTAdzSk+nDI0vPxcgnMsim4FfXaragepZomc6jOCELFJFCZ/qdoCbdfndxiKFtyO5vsfnt0+f29C6NJc4GDRdzaKFKY14uXxaK/H6EEqfHKDGdDY8nOi
- 6jCaLPUFw5hY05y5AyqNgwDK26yXPJlcQ==</ds:X509Certificate>
+ 6jCaLPUFw5hY05y5AyqNgwDK26yXPJlcQ==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -18,7 +18,7 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIFyjCCA7ICCQCkUnPQ/PtKmzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wHhcNMTExMTE5MjMwNTAxWhcNMTYxMTE3MjMwNTAxWjCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFUagwJ9IvqMmMGKHFQ3XmAr6G7B0suWqbHPMWBfIlyu6cm0NWhH1JsiDxEhUxljmk+B4FZOWI9YcNo1YB1pO8wYJTeviqzrQDNjqURUOsyfYdQn3L2k4f9exQT25cmXhu0h8zybslGQDKWZZPH/S/jMpShPjIlrRx/ARrEbH/CgLHviS1oVKi/IkwZ55Gwd5/ikvUaQL+cmPsVPIzMrKgxGJk37RmFgRKYMvjqsMF8IKzOJRMxm342aJNP7Tka/C4p4E+nmFcqN5ak4rljqpjucjwGGNpKiZ4XZN/7ItpI2Lcj8tmW6UZx6/55r99OjwrmnkLd6bLWnHsavMnABkdp54st5uplhEfkSV9rP67k5MOpGSQFZGFyvSteMUc8atiZjaeZQ8YOugC8HMB/zIg7TGx5/pqHJjYNxYmHp0EkEmw8ahGOS0dsFWxzlHP36OvhSXQ5OQxj9iQLIF2j56RHYfedcJjkb5KbnBanfNVWgOZnPtmsYFy6d1hjWsnvLPd5B1Jt2F+zAsQlFIkJ9jJOWd7+QpeeUi8AC1XMTjHkDnlkEROvk5JQYYNG+CHY9brTH/vCmT7gLHF6pOEBdjtLhoK7G8oB2Flmq7vZUyFbRMSjBvBiBwZZLdMtn1Zj9tEWmWHgcYcVyPN4QeIcjJI63le4UP4RkJKgRZBbspEZwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCVOFINDie1oi7tXIXnvc43aZMxgjojUp0JCkVMpNsbF34X1C09FA5CiIngISYtP4FF7tbMjq08FnbjOUUEzYqhjAWKXCRipEOAED1todVlu14AL4P66HLWXUq5pahuYKwzSs+f7Km3d2Ttfv0GeYHfHEhIc4xOTiEEQ2J2zZpdJaDgRxRVTGIC4GAAh13EGd2DZQi87tK5dxQ4Lrrae/ko+7JxWmHY24emCRQNB97huD4IHMXDU9geiBf4PVwueI7/FSPAiyCanCc5GpZdZMW3JBegsfNi64lm5MjGLhp2pD3dKq33lG4IoDt4kT9ta6TDk/JLLxNIkAAliGMT8qPZlVQMTqkMchKz4NaUZTz0K6cobkSYpo5OLdfT4ukcN/rIup4/ha0kXX7sj7sgDuUV7EtLkUJyNIZOdjphaBRdxyPjXLrrmpaBCyWZxz4CZCu4xhsV8LJvFnfC5nb+r13WpZLN2Mdv74z8LPZ6hxtCaVVgcnlWaO1SslpagDVE2t0s0PpJWivf9+wssIOK5fRyagTAdzSk+nDI0vPxcgnMsim4FfXaragepZomc6jOCELFJFCZ/qdoCbdfndxiKFtyO5vsfnt0+f29C6NJc4GDRdzaKFKY14uXxaK/H6EEqfHKDGdDY8nOi
- 6jCaLPUFw5hY05y5AyqNgwDK26yXPJlcQ==</ds:X509Certificate>
+ 6jCaLPUFw5hY05y5AyqNgwDK26yXPJlcQ==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml
index b1f047de..13030d35 100644
--- a/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw.ct.infn.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw.ct.infn.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-03T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml b/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml
index 0e798401..8a5d3593 100644
--- a/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml
+++ b/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://halfback.cnaf.infn.it/casshib/app2">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://halfback.cnaf.infn.it/casshib/app2">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-07-04T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
index 8b197be8..d6ad1a9e 100644
--- a/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
@@ -141,19 +141,19 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
<md:ContactPerson contactType="administrative">
<md:Company>University of Borås</md:Company>
<md:SurName>IT-avdelningen</md:SurName>
- <md:EmailAddress>it-avdelningen@hb.se</md:EmailAddress>
+ <md:EmailAddress>mailto:it-avdelningen@hb.se</md:EmailAddress>
<md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>University of Borås</md:Company>
<md:SurName>Per-Olof Axelsson</md:SurName>
- <md:EmailAddress>Per-Olof.Axelsson@hb.se</md:EmailAddress>
+ <md:EmailAddress>mailto:Per-Olof.Axelsson@hb.se</md:EmailAddress>
<md:TelephoneNumber>+46 33 435 4697</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>University of Borås</md:Company>
<md:SurName>IT-avdelningen</md:SurName>
- <md:EmailAddress>it-avdelningen@hb.se</md:EmailAddress>
+ <md:EmailAddress>mailto:it-avdelningen@hb.se</md:EmailAddress>
<md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..6b9c64f1
--- /dev/null
+++ b/swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hidp.ucc.ie/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-10-25T00:00:00Z"/>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucc.ie</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University College Cork</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="ga">Coláiste na hOllscoile Corcaigh</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.ucc.ie/en/sit/</mdui:InformationURL>
+ <mdui:Logo height="71" width="200">https://edugate.heanet.ie/rr3/logos/ucc.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:GeolocationHint>geo:51.893285131676606,-8.492431640625</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUJ3jATJ9q82dE+ma0p9zSXbsubOUwDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQbWFlbHN0cm9tLnVjYy5pZTAeFw0xMDEyMjAxMTQ0MDRa
+Fw0zMDEyMjAxMTQ0MDRaMBsxGTAXBgNVBAMTEG1hZWxzdHJvbS51Y2MuaWUwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCB90H3EcbGIbs1MYIbcGF8RAT8
+JZyn4G6XUBrgBebshGsiPqO/9bJ5om/vvO+fgIyrMFHVKRYyH9coSJgGSWN+FWDT
+y/ez3/s9X5kZ2rniZUpbS/7g1wezuxpDfBvaPoOfIIEtVpW9rbVGXTpSrQnMrIRb
+dF1wBJgi9s8dVgGzz6qIVYJdmTMnOxI7iX2OhxYFOXzF6vSkiKKujWGT1q/ty9Hf
+v3ZNzZeiQcpEbaXyFCyLiTFyJqYpLhEH6F4JKnNwpGsBrRVzuYErvQRGBFQxJYSg
+Nq4Vh7yfSc3vS19DsSIBvXK/9scjb0RmB2u0j+jN+gfMireDZJ/a974/yil7AgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEG1hZWxzdHJvbS51Y2MuaWWGJ2h0dHBzOi8vbWFl
+bHN0cm9tLnVjYy5pZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUysqfxq96kxiv
+chu/icPiuQA+YB0wDQYJKoZIhvcNAQEFBQADggEBABZETTa2/zk6c4gzvI7v+P/z
+bPEud4kXGZaXMO+ISMwXFra+xq961++7609SXklwW2UMatcwPl4H+72ionc69Cel
+lMnV3tNNkJsc+a5YNFw6sBmlQAoQoyKcZPYrghcFf9YUuuzyKMSyoHFibsPfDiQq
+sCOjwT0V8PGx79b88ZJp1Na/QBrsl3UWpCDtQCxgCu/PWDE23tWc9s29XIOIUEO1
+sUm5ezY/tfP6H2REvnOkBZ4Y1zDFoEjJojHOQQgRHOagmeItT/XhBP1bVOPKoyMd
+jtlb4YINkQ8aWIF5en7doTGXzvLeD5H1Oj8gm9iB2J+5eSzcj0g3ONNkBjSscoE=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hidp.ucc.ie/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST/SLO"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hidp.ucc.ie/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hidp.ucc.ie/idp/profile/Shibboleth/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University College Cork</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University College Cork</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ucc.ie/en/sit/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Denis</md:GivenName>
+ <md:SurName>O'Sullivan</md:SurName>
+ <md:EmailAddress>mailto:denis@ucc.ie</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Hostmaster</md:GivenName>
+ <md:SurName>UCC</md:SurName>
+ <md:EmailAddress>mailto:Hostmaster@ucc.ie</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>sne@ucc.ie</md:SurName>
+ <md:EmailAddress>mailto:sne@ucc.ie</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..892b18a0
--- /dev/null
+++ b/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hpc-wayf.sdu.dk/module.php/saml/sp/metadata.php/default-sp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-05-27T10:41:03Z" registrationAuthority="https://www.wayf.dk">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:Description xml:lang="da">Formålet er at administrere bruger-adgangen til HPC-centret.</mdui:Description>
+ <mdui:Description xml:lang="en">The purpose is to manage user access to the HPC centre.</mdui:Description>
+ <mdui:DisplayName xml:lang="da">DeIC Nationale HPC-Center, SDU</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">DeIC National HPC Centre, SDU</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFKjCCBBKgAwIBAgISESG8oe2A3UrywJInFn6XTDG1MA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTIxMDAzMDcxNTAyWhcNMTUxMTIyMTQyNzMxWjB2MQswCQYDVQQGEwJESzEPMA0GA1UECAwGT2RlbnNlMQ8wDQYDVQQHDAZPZGVuc2UxEzARBgNVBAsMCklULVNlcnZpY2UxHTAbBgNVBAoMFFN5ZGRhbnNrIFVuaXZlcnNpdGV0MREwDwYDVQQDDAgqLnNkdS5kazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOSixcAMIwcdGI+eGJpauzfO1jmIW1eTle/F9w9BMcutXM1fWRzeQKVjG8s/w7BJOSVrVZS8V/pHais31JXIQf0vrgacit7yDNiOzN6ONqeMdzV1jGFQ2+1/rg0doS3pKLbhlqYPaVYFjBLmwBxmA1Wgzg0xmYhqxtiDXCxj4wGRva0NO61PHQtZAyULF48LJzvzFeCZBwNop5P6C0BZhdC4D1KuexlB7n/to7k/td3AZaoBS7xGWCyStxrrg8MWvdPCks/MU3GISRek8Qe4GGsC3G2NxuJ/Nuib5T90B+wjseDRL9IJVTgzQ7bTm8N0NiMXC82uUdxnWBuAk+kc+K8CAwEAAaOCAckwggHFMA4GA1UdDwEB/wQEAwIFoDBMBgNVHSAERTBDMEEGCSsGAQQBoDIBFDA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAbBgNVHREEFDASgggqLnNkdS5ka4IGc2R1LmRrMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nvcmdhbml6YXRpb252YWxnMi5jcmwwgZYGCCsGAQUFBwEBBIGJMIGGMEcGCCsGAQUFBzAChjtodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZhbGcyLmNydDA7BggrBgEFBQcwAYYvaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzb3JnYW5pemF0aW9udmFsZzIwHQYDVR0OBBYEFHDOpvlIsWc6UG/xYFK1ck9/ENEdMB8GA1UdIwQYMBaAFF1Gso3ES3Qcu+31c7Y6tziPdZ5+MA0GCSqGSIb3DQEBBQUAA4IBAQAfAwQ9beN889VqRAa28+l6NMNvmrO7XZ35HR2k/YBwCm1S5mVKjSIg+Pg9x4v52TJgHG4V3CLsPUFDMq9I3wMo9mJ73ouInAyzGKuDJbUXcqGATjqD/boRZh1W+ArKtwpMdaa5mE+8Diesvz+anmiy3bQymgB4vgquM5IYT3R9ERS24ISCLwDmoAra5+W7zqfJjFmmnmG6BfVfOq+aHkABDv5E2bplwfpLdy7c9CYw7E0sZvaFyB1ze0MmJNnEcXvFNZh8BAt4Y/z03DL3ea1YV2MxBMnmdQtpuwv6licA7Da1iYULkx2a9QCvWIEcHOb2+4E22SsZkvl2nLVMLyTu</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-acs.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" index="1" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml1-acs.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="2" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-acs.php/default-sp"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="da">DeIC Nationale HPC-Center, SDU</md:ServiceName>
+ <md:ServiceName xml:lang="en">DeIC National HPC Centre, SDU</md:ServiceName>
+ <md:ServiceDescription xml:lang="da">Formålet er at administrere bruger-adgangen til HPC-centret.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">The purpose is to manage user access to the HPC centre.</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="da">Syddansk Universitet</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University of Southern Denmark</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="da">Syddansk Universitet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Southern Denmark</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="da">http://sdu.dk</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.sdu.dk/en/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>WAYF</md:GivenName>
+ <md:SurName>Operations</md:SurName>
+ <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml
index 7d63473a..7abdf705 100644
--- a/swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml
@@ -14,36 +14,36 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDQzCCAiugAwIBAgIUUCR0nbDS1EjDLxTwsqHxFHPSU70wDQYJKoZIhvcNAQEF
- BQAwITEfMB0GA1UEAxMWaHNjLXNoaWIuYWRzLnF1Yi5hYy51azAeFw0xMjExMTUx
- MTQwNTlaFw0zMjExMTUxMTQwNTlaMCExHzAdBgNVBAMTFmhzYy1zaGliLmFkcy5x
- dWIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/jdWz2mJl
- mIh7ojDKV20RYhhnhhHiyICzKaNBnJk0kh6C6Cgb6OsWGLffzFQ/N/pdaN+zvgrV
- MCHXkerqcKM3symZjsGiIWNTZxOK3ZqzbjxUhi1+NCXRHdDo/pn5GkMMSwpUJVzF
- 3u0g8UE8WzDQDP4mwoUEmH28mho14dGUMKg82ODy2jlMI03G3LzlAYObiTb04qXv
- 1EIeAk+1SLwe+rrYNwHIcwO7qUM79B3xG6uUk858fhfodDx4mtffLHn0xGUv/+Lz
- LzazvXwlQ9GPzzxsrbCIh+9FKG1d6GGJCUQipe9phPYRCwceLjnaLxg8InnPWhIc
- D34tvrRMY00RAgMBAAGjczBxMFAGA1UdEQRJMEeCFmhzYy1zaGliLmFkcy5xdWIu
- YWMudWuGLWh0dHBzOi8vaHNjLXNoaWIuYWRzLnF1Yi5hYy51ay9pZHAvc2hpYmJv
- bGV0aDAdBgNVHQ4EFgQUaH8xASkLOLt7Ro7bwsrM881RkXUwDQYJKoZIhvcNAQEF
- BQADggEBABCQFkzyCIUfIJdAEskROk7tj1QjByMskkONo7NEdNGyJBygmw6mJ9a6
- /khyl66FnUdsVOYoklo5Sa/FpGvY3rgH8lnW0kdC4akcTLa/PJjuz0Ng8cKkZYjk
- dzIWjZ9UfU8kRrlh1EUWmjPndSVP2Ambfn8ZD0lhiQm3hP784AH0Skot74hEEatl
- tSA5IRwWXolSHLF0tFF/gkcKGo3rCR21BKI9l4EERzKq3jhbsPj0ebP2SaU/p+aF
- PRRi7jeZXQ9BdCz8GNbhop9K1SLoh/RGorAghyk3UomeFLLFfnkR4LOxKrlWOVuR
- o6PZAqmRF/YOpMqnhCly7UOxEA4HmIE=
+ MIIDMzCCAhugAwIBAgIUZayvO9xYY8CR1y0pwTGPs9KIzC0wDQYJKoZIhvcNAQEF
+ BQAwHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVrMB4XDTE1MTExMDA4MTk0
+ M1oXDTM1MTExMDA4MTk0M1owHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiL/Lr+7KiGp3LM2YZYEQ
+ JGwPGfKZnu9fUWORH5Bj7yCSDyU1efyxjnAvwgVeArgliZNJh2ux6Hm8izqeDWuL
+ ShCq9rAHyTa8s68abT47OiOIdqGtYVcWueOPljOghiloNQw3b025jdSuyk9pTMAU
+ saoUkTBbdrKwIXigKlUCQ1y6bc2e8PCdOrLs2n5QL7JGCns7/eK+ZVXywAjUAChW
+ ZYHEwijiDx/E4WSHbG1eTH+ep9gOy8P3e05/LrSiDp3ZfBlp74UqBVj+tyTut0nw
+ ZormRTd9yGO26/mwWeeQrfhPAhEUs0r12lD1G1tbUCFRxlWbceBUzVa9QfbD/0QV
+ qwIDAQABo2swaTBIBgNVHREEQTA/ghJoc2Mtc2hpYi5xdWIuYWMudWuGKWh0dHBz
+ Oi8vaHNjLXNoaWIucXViLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQR
+ SXVKceopY/texxj9jBmxSjCsbzANBgkqhkiG9w0BAQUFAAOCAQEAbm2e/5gMgp79
+ SVOxVfxcBD4MxNgangNQ1l3v83NGhzXKKDnFwup5Nllq9S9P4IiTsB4avy8D+XBr
+ KRERQmh65FYcBhELHMtd6CD+qiMftPcWtom747fp8cnM6shaehrsgg4a9J7t5IBB
+ pMFvKinh78DghwuA+h96XoqVv3+KJdR8Vrx0gcTWrlZiIc710gz470q+fhNwkcYd
+ VaVeY9/1bRYtkS8Xehr5lLBLYixCqaHFki/qu0IezZ0GzTGVP3x5ZaGz1up4ysdd
+ xD/wWsUwD8KQDwanJormGA7fh42ZkmnnQAEjgVmUxMFv0eTrald6mZ78fWQqBC5A
+ tzZmZKhhgA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hsc-shib.ads.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsc-shib.ads.qub.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hsc-shib.ads.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsc-shib.ads.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hsc-shib.ads.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsc-shib.ads.qub.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hsc-shib.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsc-shib.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hsc-shib.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsc-shib.qub.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
@@ -53,30 +53,30 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDQzCCAiugAwIBAgIUUCR0nbDS1EjDLxTwsqHxFHPSU70wDQYJKoZIhvcNAQEF
- BQAwITEfMB0GA1UEAxMWaHNjLXNoaWIuYWRzLnF1Yi5hYy51azAeFw0xMjExMTUx
- MTQwNTlaFw0zMjExMTUxMTQwNTlaMCExHzAdBgNVBAMTFmhzYy1zaGliLmFkcy5x
- dWIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/jdWz2mJl
- mIh7ojDKV20RYhhnhhHiyICzKaNBnJk0kh6C6Cgb6OsWGLffzFQ/N/pdaN+zvgrV
- MCHXkerqcKM3symZjsGiIWNTZxOK3ZqzbjxUhi1+NCXRHdDo/pn5GkMMSwpUJVzF
- 3u0g8UE8WzDQDP4mwoUEmH28mho14dGUMKg82ODy2jlMI03G3LzlAYObiTb04qXv
- 1EIeAk+1SLwe+rrYNwHIcwO7qUM79B3xG6uUk858fhfodDx4mtffLHn0xGUv/+Lz
- LzazvXwlQ9GPzzxsrbCIh+9FKG1d6GGJCUQipe9phPYRCwceLjnaLxg8InnPWhIc
- D34tvrRMY00RAgMBAAGjczBxMFAGA1UdEQRJMEeCFmhzYy1zaGliLmFkcy5xdWIu
- YWMudWuGLWh0dHBzOi8vaHNjLXNoaWIuYWRzLnF1Yi5hYy51ay9pZHAvc2hpYmJv
- bGV0aDAdBgNVHQ4EFgQUaH8xASkLOLt7Ro7bwsrM881RkXUwDQYJKoZIhvcNAQEF
- BQADggEBABCQFkzyCIUfIJdAEskROk7tj1QjByMskkONo7NEdNGyJBygmw6mJ9a6
- /khyl66FnUdsVOYoklo5Sa/FpGvY3rgH8lnW0kdC4akcTLa/PJjuz0Ng8cKkZYjk
- dzIWjZ9UfU8kRrlh1EUWmjPndSVP2Ambfn8ZD0lhiQm3hP784AH0Skot74hEEatl
- tSA5IRwWXolSHLF0tFF/gkcKGo3rCR21BKI9l4EERzKq3jhbsPj0ebP2SaU/p+aF
- PRRi7jeZXQ9BdCz8GNbhop9K1SLoh/RGorAghyk3UomeFLLFfnkR4LOxKrlWOVuR
- o6PZAqmRF/YOpMqnhCly7UOxEA4HmIE=
+ MIIDMzCCAhugAwIBAgIUZayvO9xYY8CR1y0pwTGPs9KIzC0wDQYJKoZIhvcNAQEF
+ BQAwHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVrMB4XDTE1MTExMDA4MTk0
+ M1oXDTM1MTExMDA4MTk0M1owHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiL/Lr+7KiGp3LM2YZYEQ
+ JGwPGfKZnu9fUWORH5Bj7yCSDyU1efyxjnAvwgVeArgliZNJh2ux6Hm8izqeDWuL
+ ShCq9rAHyTa8s68abT47OiOIdqGtYVcWueOPljOghiloNQw3b025jdSuyk9pTMAU
+ saoUkTBbdrKwIXigKlUCQ1y6bc2e8PCdOrLs2n5QL7JGCns7/eK+ZVXywAjUAChW
+ ZYHEwijiDx/E4WSHbG1eTH+ep9gOy8P3e05/LrSiDp3ZfBlp74UqBVj+tyTut0nw
+ ZormRTd9yGO26/mwWeeQrfhPAhEUs0r12lD1G1tbUCFRxlWbceBUzVa9QfbD/0QV
+ qwIDAQABo2swaTBIBgNVHREEQTA/ghJoc2Mtc2hpYi5xdWIuYWMudWuGKWh0dHBz
+ Oi8vaHNjLXNoaWIucXViLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQR
+ SXVKceopY/texxj9jBmxSjCsbzANBgkqhkiG9w0BAQUFAAOCAQEAbm2e/5gMgp79
+ SVOxVfxcBD4MxNgangNQ1l3v83NGhzXKKDnFwup5Nllq9S9P4IiTsB4avy8D+XBr
+ KRERQmh65FYcBhELHMtd6CD+qiMftPcWtom747fp8cnM6shaehrsgg4a9J7t5IBB
+ pMFvKinh78DghwuA+h96XoqVv3+KJdR8Vrx0gcTWrlZiIc710gz470q+fhNwkcYd
+ VaVeY9/1bRYtkS8Xehr5lLBLYixCqaHFki/qu0IezZ0GzTGVP3x5ZaGz1up4ysdd
+ xD/wWsUwD8KQDwanJormGA7fh42ZkmnnQAEjgVmUxMFv0eTrald6mZ78fWQqBC5A
+ tzZmZKhhgA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hsc-shib.ads.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsc-shib.ads.qub.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
diff --git a/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml b/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml
index 0bb5864a..b6652dae 100644
--- a/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml
@@ -9,9 +9,12 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auf.org</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Agence universitaire de la Francophonie (AUF)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Agence Universitaire de la Francophonie (AUF)</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGFBMVEX///+zs7PY2Ngdndn/1QCNviNwIoPlJyeeATQOAAAAkklEQVQ4y2P8////fwYKAAsDAwPDli1b4AI+Pj4MyGI+Pj4o7Js3bzLcvn0bzmdC1oxuGDYA0wwDTOg2EwNUVVXh6pnI8fft27fhLmVioBAwEet3dIDhBVLCAKsLKPYCLkDIa0z4ogofHwYYKU7KcvNuwTmPLNTh7L6XynD245QEOLuUdQmcLXXjBh0CkRCgOAwAGl44oeCo9bsAAAAASUVORK5CYII=</mdui:Logo>
<mdui:InformationURL xml:lang="fr">http://www.auf.org</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Employees of the Agence universitaire de la Francophonie</mdui:Description>
<mdui:DisplayName xml:lang="fr">Agence universitaire de la Francophonie (AUF)</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Employés de l'Agence universitaire de la Francophonie</mdui:Description>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
@@ -39,11 +42,14 @@ flcTH2tpneZeVm9kXovpBSKYeQ7AUu8asTwVXKY2JopEvxOOo76T
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.auf.org/idp/saml2/slo"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.auf.org/idp/saml2/slo"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.auf.org/idp/saml2/slo/soap"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.auf.org/idp/saml2/sso"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.auf.org/idp/saml2/sso"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.auf.org/idp/saml2/sso"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.auf.org/idp/saml2/slo/soap"/>
</md:IDPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">Agence universitaire de la Francophonie (AUF)</md:OrganizationName>
@@ -51,11 +57,6 @@ flcTH2tpneZeVm9kXovpBSKYeQ7AUu8asTwVXKY2JopEvxOOo76T
<md:OrganizationURL xml:lang="en">http://www.auf.org</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Jean Christophe André</md:SurName>
- <md:EmailAddress>jean-christophe.andre@auf.org</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:SurName>Moussa Nombré</md:SurName>
- <md:EmailAddress>moussa.nombre@auf.org</md:EmailAddress>
+ <md:EmailAddress>ressources-informatiques@auf.org</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.uni.lu-idp.xml b/swamid-interfederations-2.0/id.uni.lu-idp.xml
new file mode 100644
index 00000000..660dcfd5
--- /dev/null
+++ b/swamid-interfederations-2.0/id.uni.lu-idp.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.uni.lu/idp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-11-12T16:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-10.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIDBUc8MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkxVMRYwFAYDVQQKEw1MdXhUcnVzdCBTLkEuMR4wHAYDVQQDExVMdXhUcnVzdCBRdWFsaWZpZWQgQ0EwHhcNMTIxMTI4MDg0OTQ5WhcNMTUxMTI4MDg0OTQ5WjCBsDELMAkGA1UEBhMCTFUxEzARBgNVBAgTCkx1eGVtYm91cmcxEzARBgNVBAcTCkx1eGVtYm91cmcxITAfBgNVBAoTGFVuaXZlcnNpdHkgb2YgTHV4ZW1ib3VyZzEdMBsGA1UECxMUU2VydmljZSBJbmZvcm1hdGlxdWUxETAPBgNVBAMUCCoudW5pLmx1MSIwIAYJKoZIhvcNAQkBFhNjZXJ0aWZpY2F0ZXNAdW5pLmx1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx7I7hBbO60P7dLN40GIbAE3foBXJYpvBUPmPQ7RLd9XVsalzXyIsRFo4f0PHfwNq33dzcnKW8fAcAqhjDSB2BGjNdntXHyXN79aejifNp0XkKizMXTeJwo9Glk+QUAtwXMUdQSoc6l77uUYkrtASQmPEQcRffsB//lhstNZuk/aXu4C4hle5yQDLweEmLZ3W0vuTVZL+7ZvJv1Jswv4Ftyp8bIvZKkkcrOUtyxytPEUkT373OtM+c41s5dm89pL5OTQVbXCb51V7bG0sGjSla0dC8oWGSrdkQ5CYqFmtYQ1qrj8uM57+MurkZ0Cw2qARHgM3KwdJynO3xkzySYzJgwIDAQABo4ICNzCCAjMwDAYDVR0TAQH/BAIwADBgBggrBgEFBQcBAQRUMFIwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmx1eHRydXN0Lmx1MCsGCCsGAQUFBzAChh9odHRwOi8vY2EubHV4dHJ1c3QubHUvTFRRQ0EuY3J0MIIBAAYDVR0gBIH4MIH1MIHoBggrgSsBAQIGATCB2zCBrQYIKwYBBQUHAgIwgaAagZ1MdXhUcnVzdCBTZXJ2ZXIgQ2VydGlmaWNhdGUuIE5vdCBzdXBwb3J0ZWQgYnkgU1NDRCwgS2V5IEdlbmVyYXRpb24gYnkgU3Vic2NyaWJlci4gR1RDLCBDUCBhbmQgQ1BTIG9uIGh0dHA6Ly9yZXBvc2l0b3J5Lmx1eHRydXN0Lmx1LiBTaWduZWQgYnkgYSBRdWFsaWZpZWQgQ0EuMCkGCCsGAQUFBwIBFh1odHRwOi8vcmVwb3NpdG9yeS5sdXh0cnVzdC5sdTAIBgYEAI96AQMwEQYJYIZIAYb4QgEBBAQDAgXgMA4GA1UdDwEB/wQEAwIEsDAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMB8GA1UdIwQYMBaAFI2QowfdGhN3mUySq01D3j/NKWQFMDEGA1UdHwQqMCgwJqAkoCKGIGh0dHA6Ly9jcmwubHV4dHJ1c3QubHUvTFRRQ0EuY3JsMB0GA1UdDgQWBBS2o4jPLL1nP8gTGV5uScNo06jzajANBgkqhkiG9w0BAQUFAAOCAQEAc22D7Hdvn8Nyz2Zzh9JYfFOEYg4Sb6yyfPBjjJtDSFAq4asIoMG7b/TRbASX6VX/NGkOw3OhlKF15tPqNpG481K8xmgonA7b95eks0JeYX0Mvub+eYxDcatXPa/WXxTnRlDU7/ihZvyBwALDSSLyQ+NK31iTt5uBaQnChgyGYvIqB3j0zbPfUoX0v+SW/hy+tczC8XA/lv10W4VQ3LrELkRgK4CrOVDNp4IV+43TCFVKO3+ddVGo8Kjw4nJJ4HzPKLpU89GXscLu5wOKTjPLM8fmMCGszZuY1ZOtR2BaTws/38OjgY5O1MBBWMoqrfy7Do8JiMswQjbSHAUKKX4YZQ==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.uni.lu/saml/idp/profile/post/sls" ResponseLocation="https://id.uni.lu/saml/idp/profile/post/slr"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.uni.lu/saml/idp/profile/redirectorpost/sso"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uni.lu/saml/idp/profile/redirectorpost/sso"/>
+ </md:IDPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..69cb1522
--- /dev/null
+++ b/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.uni.lu/simplesaml/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-12-07T08:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-10.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of Luxembourg</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity provider for members of the University of Luxembourg</mdui:Description>
+ <mdui:Keywords xml:lang="en">Uni.lu+login</mdui:Keywords>
+ <mdui:Logo width="73" height="78" xml:lang="en">https://id.uni.lu/uni.lu.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>158.64.76.0/16</mdui:IPHint>
+ <mdui:IPHint>158.64.77.0/16</mdui:IPHint>
+ <mdui:IPHint>158.64.79.0/16</mdui:IPHint>
+ <mdui:IPHint>2001:a18:a/48</mdui:IPHint>
+ <mdui:DomainHint>uni.lu</mdui:DomainHint>
+ <mdui:DomainHint>www.uni.lu</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:49.507027, 5.997479</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEXzCCA0egAwIBAgIJAKDm6mKXJYiwMA0GCSqGSIb3DQEBCwUAMIHFMQswCQYDVQQGEwJMVTEhMB8GA1UECAwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMRkwFwYDVQQHDBBFc2NoLXN1ci1BbHpldHRlMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEx1eGVtYm91cmcxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMRIwEAYDVQQDDAlpZC51bmkubHUxIjAgBgkqhkiG9w0BCQEWE2NlcnRpZmljYXRlc0B1bmkubHUwHhcNMTUxMjAyMDkxMDMxWhcNMjUxMjAxMDkxMDMxWjCBxTELMAkGA1UEBhMCTFUxITAfBgNVBAgMGFVuaXZlcnNpdHkgb2YgTHV4ZW1ib3VyZzEZMBcGA1UEBwwQRXNjaC1zdXItQWx6ZXR0ZTEhMB8GA1UECgwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMR0wGwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTESMBAGA1UEAwwJaWQudW5pLmx1MSIwIAYJKoZIhvcNAQkBFhNjZXJ0aWZpY2F0ZXNAdW5pLmx1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ZMI3ywdamSEBCfIWxqsES7P0nZCMgd9Qw+mIe6p4pBbP6+mRdqgoZeyrBsHYf+nSMGq5Ac1h+0OyKhpVf7bW7E0MFUbAxl14dlc6J6QkDexCQbxxQNZQu89zSggdyOhp8dv/1z37vLMR2JDNBqiu9KmpptSyqPQwXE4+DFipMjvWSXsie+eMh4LTs5wunoVdIyA34lwxseWUg+l5NEfR0MfmOVBpLYmA5rxf5c2p0htMUk9UnaEm/ZiaAqvzOBEzO8HxQaE4PJVi6wx/RKdTMR2yesjf8faHAT5AmFSjGr/N+TZJHy/tndzfusCX1u9hrGABWyo7eyyjGLtJOLG+QIDAQABo1AwTjAdBgNVHQ4EFgQU6lnJmhtoUhVPR80x/CqoH7oPzNUwHwYDVR0jBBgwFoAU6lnJmhtoUhVPR80x/CqoH7oPzNUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVbf3wP9fXOjWAGL32mRZ5PuW8ZsyL+cYGLu6fS8diqTu7fCkQWLwjzXIHWSMgRyflDv6BLmVuAVz/wOnDUb4tRl/FYxShpHjQ1LbyqO2MJmtQxw/v+vjb25Gr/9cPPCDtUrdOcGhK3Hz/p5+6ti+qaZdSLFo1/S6q2UWoYvVq1WhRzC5SyLRrFUS09S8bABDSYiLKNwJwhoiP3LpUuXtG37ai8xojQcjAwWiuw73MYcCH+909HKvRUcgiJoIdYoEV1Nh/Fz5CtIBC3TCvF84UXn5ycB0GU7qL9o04O7tYgtW0w5sCCxvD5ks03KYY1JKY1UV2n0ITA/rhHw82yMTwA==</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>MIIEXzCCA0egAwIBAgIJAKDm6mKXJYiwMA0GCSqGSIb3DQEBCwUAMIHFMQswCQYDVQQGEwJMVTEhMB8GA1UECAwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMRkwFwYDVQQHDBBFc2NoLXN1ci1BbHpldHRlMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEx1eGVtYm91cmcxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMRIwEAYDVQQDDAlpZC51bmkubHUxIjAgBgkqhkiG9w0BCQEWE2NlcnRpZmljYXRlc0B1bmkubHUwHhcNMTUxMjAyMDkxMDMxWhcNMjUxMjAxMDkxMDMxWjCBxTELMAkGA1UEBhMCTFUxITAfBgNVBAgMGFVuaXZlcnNpdHkgb2YgTHV4ZW1ib3VyZzEZMBcGA1UEBwwQRXNjaC1zdXItQWx6ZXR0ZTEhMB8GA1UECgwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMR0wGwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTESMBAGA1UEAwwJaWQudW5pLmx1MSIwIAYJKoZIhvcNAQkBFhNjZXJ0aWZpY2F0ZXNAdW5pLmx1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ZMI3ywdamSEBCfIWxqsES7P0nZCMgd9Qw+mIe6p4pBbP6+mRdqgoZeyrBsHYf+nSMGq5Ac1h+0OyKhpVf7bW7E0MFUbAxl14dlc6J6QkDexCQbxxQNZQu89zSggdyOhp8dv/1z37vLMR2JDNBqiu9KmpptSyqPQwXE4+DFipMjvWSXsie+eMh4LTs5wunoVdIyA34lwxseWUg+l5NEfR0MfmOVBpLYmA5rxf5c2p0htMUk9UnaEm/ZiaAqvzOBEzO8HxQaE4PJVi6wx/RKdTMR2yesjf8faHAT5AmFSjGr/N+TZJHy/tndzfusCX1u9hrGABWyo7eyyjGLtJOLG+QIDAQABo1AwTjAdBgNVHQ4EFgQU6lnJmhtoUhVPR80x/CqoH7oPzNUwHwYDVR0jBBgwFoAU6lnJmhtoUhVPR80x/CqoH7oPzNUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVbf3wP9fXOjWAGL32mRZ5PuW8ZsyL+cYGLu6fS8diqTu7fCkQWLwjzXIHWSMgRyflDv6BLmVuAVz/wOnDUb4tRl/FYxShpHjQ1LbyqO2MJmtQxw/v+vjb25Gr/9cPPCDtUrdOcGhK3Hz/p5+6ti+qaZdSLFo1/S6q2UWoYvVq1WhRzC5SyLRrFUS09S8bABDSYiLKNwJwhoiP3LpUuXtG37ai8xojQcjAwWiuw73MYcCH+909HKvRUcgiJoIdYoEV1Nh/Fz5CtIBC3TCvF84UXn5ycB0GU7qL9o04O7tYgtW0w5sCCxvD5ks03KYY1JKY1UV2n0ITA/rhHw82yMTwA==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uni.lu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uni.lu/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University of Luxembourg</md:OrganizationName>
+ <md:OrganizationName xml:lang="fr">Universit&amp;#233; du Luxembourg</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Uni.lu Users</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uni.lu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.uni.lu</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Uni.lu</md:GivenName>
+ <md:SurName>SIU SNS</md:SurName>
+ <md:EmailAddress>siu-sns@uni.lu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml
index b1dd7c82..c4ef8622 100644
--- a/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idea.ifc.cnr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idea.ifc.cnr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..39263637
--- /dev/null
+++ b/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem-idp.ilc.cnr.it/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-13T13:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilc.cnr.it</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">CNR Institute for Computational Linguistics "Antonio Zampolli"</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for CNR Institute for Computational Linguistics "Antonio Zampolli" users</mdui:Description>
+ <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ilc.cnr.it/en/content/idem-federation</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="it">http://www.ilc.cnr.it/it/content/federazione-idem</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.ilc.cnr.it/en/content/idem-federation-privacy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="it">http://www.ilc.cnr.it/it/content/privacy-federazione-idem</mdui:PrivacyStatementURL>
+ <mdui:Logo height="16" width="16" xml:lang="en">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_16x16.png</mdui:Logo>
+ <mdui:Logo height="16" width="16" xml:lang="it">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_16x16.png</mdui:Logo>
+ <mdui:Logo height="60" width="80" xml:lang="en">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_80x60.png</mdui:Logo>
+ <mdui:Logo height="60" width="80" xml:lang="it">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_80x60.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:GeolocationHint>geo:43.718450,10.421310</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDNzCCAh+gAwIBAgIUXkyFgauxs3Gvhmwuh/SlNXsNSc0wDQYJKoZIhvcNAQEF
+BQAwHjEcMBoGA1UEAxMTaWRlbS1pZHAuaWxjLmNuci5pdDAeFw0wOTA0MTcxNTM5
+MzlaFw0yOTA0MTcxNTM5MzlaMB4xHDAaBgNVBAMTE2lkZW0taWRwLmlsYy5jbnIu
+aXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldH2pporkbRUOfzYX
+Wk0eARcI/cJeLA1IoAG/UY0fqsWvcNeL5XpJfd/0k6dUW6Rs/FxJ4TMqpwlo8wzX
+8FPHOX4LgZyMyhTL4iSt+aQGL/hkUPhljKblOTNHFZb/wd0K0wAU2qpTHhkMxQw2
+aQNf9jwWF3RJZjfKa3vyXzJJiwp/w2ZRGdX3DX3tLVDqMGZKjn9nSKJ/0RGq3moT
+3XmDi58xnro1YOo5XeTfwoXwNoj/OQEkC09xE7ziXWgSm6X9I2WQz3qeCeTkQz6X
+lrs8EcBXk13A+nRiCvh4EakvkkvR0MndmgjGU4SviQOBC3lW8bHrnZ2umeAydA/d
+KHIhAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkZW0taWRwLmlsYy5jbnIuaXSGKmh0
+dHBzOi8vaWRlbS1pZHAuaWxjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+FgQUolK5cLQOplyydlyGGibaknSuMpwwDQYJKoZIhvcNAQEFBQADggEBADf3UkpS
+n1jL36PgbCKtDRkzdsOZybkaDixZw1zZ/AFX7cfJ0E/9/jveXzbIxF1VxHbZvQtl
+woq3TK2t3R3sr9BN+uF0C/fMXYfwKxTUVwm9z/QxkXrzZWbfrMvLlZaaE4HyeLTk
+VP1W/JE/J2pT9ohGd0qYMoecrcQJRuiSSnb0wXEZqHFROcirBcvtoitOtESU1JQ6
+5eYHD7pnBG2EiQK5oPXh2U1qphgYCliTuWz4PNv5KtQuBJmH3TBeWj8Ku1V/FVdz
+KB5CmOx6J8t5wNaPfSwzWnk1WWNCfw9mSGWS5deY4w9NCNaGTJLA78MOMuvh7uKh
+4oS/xrwwW80e7RU=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem-idp.ilc.cnr.it/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilc.cnr.it</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDNzCCAh+gAwIBAgIUXkyFgauxs3Gvhmwuh/SlNXsNSc0wDQYJKoZIhvcNAQEF
+BQAwHjEcMBoGA1UEAxMTaWRlbS1pZHAuaWxjLmNuci5pdDAeFw0wOTA0MTcxNTM5
+MzlaFw0yOTA0MTcxNTM5MzlaMB4xHDAaBgNVBAMTE2lkZW0taWRwLmlsYy5jbnIu
+aXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldH2pporkbRUOfzYX
+Wk0eARcI/cJeLA1IoAG/UY0fqsWvcNeL5XpJfd/0k6dUW6Rs/FxJ4TMqpwlo8wzX
+8FPHOX4LgZyMyhTL4iSt+aQGL/hkUPhljKblOTNHFZb/wd0K0wAU2qpTHhkMxQw2
+aQNf9jwWF3RJZjfKa3vyXzJJiwp/w2ZRGdX3DX3tLVDqMGZKjn9nSKJ/0RGq3moT
+3XmDi58xnro1YOo5XeTfwoXwNoj/OQEkC09xE7ziXWgSm6X9I2WQz3qeCeTkQz6X
+lrs8EcBXk13A+nRiCvh4EakvkkvR0MndmgjGU4SviQOBC3lW8bHrnZ2umeAydA/d
+KHIhAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkZW0taWRwLmlsYy5jbnIuaXSGKmh0
+dHBzOi8vaWRlbS1pZHAuaWxjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+FgQUolK5cLQOplyydlyGGibaknSuMpwwDQYJKoZIhvcNAQEFBQADggEBADf3UkpS
+n1jL36PgbCKtDRkzdsOZybkaDixZw1zZ/AFX7cfJ0E/9/jveXzbIxF1VxHbZvQtl
+woq3TK2t3R3sr9BN+uF0C/fMXYfwKxTUVwm9z/QxkXrzZWbfrMvLlZaaE4HyeLTk
+VP1W/JE/J2pT9ohGd0qYMoecrcQJRuiSSnb0wXEZqHFROcirBcvtoitOtESU1JQ6
+5eYHD7pnBG2EiQK5oPXh2U1qphgYCliTuWz4PNv5KtQuBJmH3TBeWj8Ku1V/FVdz
+KB5CmOx6J8t5wNaPfSwzWnk1WWNCfw9mSGWS5deY4w9NCNaGTJLA78MOMuvh7uKh
+4oS/xrwwW80e7RU=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="it">CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CNR Institute for Computational Linguistics "Antonio Zampolli"</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="it">http://www.ilc.cnr.it</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.ilc.cnr.it/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Alessandro</md:GivenName>
+ <md:SurName>Enea</md:SurName>
+ <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Riccardo</md:GivenName>
+ <md:SurName>Del Gratta</md:SurName>
+ <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml
index 0abe1541..45ee2cd3 100644
--- a/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem-idp.imtlucca.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem-idp.imtlucca.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-09T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml
index de5b4df1..f64f3e23 100644
--- a/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.ced.inaf.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.ced.inaf.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-03-22T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml
index 91775074..e83c7011 100644
--- a/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unina2.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unina2.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-07T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml
index f69ca5ed..2cc9669c 100644
--- a/swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.uniroma2.eu/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.uniroma2.eu/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-17T10:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml
index ee85ff27..ccc63bc0 100644
--- a/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unisa.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unisa.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-09-03T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
index 8802d0ec..2ca4e045 100644
--- a/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unisalento.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unisalento.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml
index ab328a38..4e83bfc0 100644
--- a/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.univpm.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.univpm.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
index 76d443d7..382c314c 100644
--- a/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemfero.units.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemfero.units.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-11T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml
index dcb4fba1..0ab34693 100644
--- a/swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemidp.unipmn.it/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemidp.unipmn.it/simplesaml/saml2/idp/metadata.php">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-01-20T14:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml
index 56b00473..292d03c2 100644
--- a/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemshibb.unina.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemshibb.unina.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-12-22T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml b/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml
new file mode 100644
index 00000000..25ded13a
--- /dev/null
+++ b/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identite.intranet.univ-lille.fr/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-15T14:45:34Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>https://federation.renater.fr/category/web</saml:AttributeValue>
+ <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Université de Lille - plate-forme charte digitale (identité)</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="fr">http://identite.univ-lille.fr</mdui:InformationURL>
+ <mdui:Description xml:lang="en">This platform allows the responsables of the communication to load digital identification elements they need</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Université de Lille - plate-forme charte digitale (identité)</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Cette plate-forme permet aux responsables de communication de charger les éléments d'identification numérique</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDFTCCAf2gAwIBAgIJALIbtMdZhxM2MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+BAMTGmRydXBhbC13ZWIxLnVuaXYtbGlsbGUxLmZyMB4XDTE0MDgwMTA3NDM1NloX
+DTI0MDcyOTA3NDM1NlowJTEjMCEGA1UEAxMaZHJ1cGFsLXdlYjEudW5pdi1saWxs
+ZTEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrnebq+nhIUfCL
+6I0Zs/hG4XeRItJBgsQQ2AB2JndoMZaRewzKT/9Ht/EqObllh5C3qFhMDitBd5Au
+E6/+Dhff00q4GGskt3Nf0qsV9EuOvyr2z2kx94wnilABMm+dZo4j0NBLuGo+vPNc
+sbjUjmo/fmD5N47iI3+UqcZPmKlp5mnfJ/QfMWYhkE9xSknu+jwr85mtYPJlMLLR
+bYwaVoCpNNn/dI9AmKPV0j4Hy7Wi3ZHehqg1e2qHaejGdTt61W5hzVfzXgc/VznF
+kISdtz8ohNq5NqXNKdddyDY60miygAtY/3BVf5/FQklalDtVWnVbFR2iqDLiRhpm
+XKBzPwIbAgMBAAGjSDBGMCUGA1UdEQQeMByCGmRydXBhbC13ZWIxLnVuaXYtbGls
+bGUxLmZyMB0GA1UdDgQWBBR4MjERy9HNblRVIBMMXv6lw+oJxjANBgkqhkiG9w0B
+AQUFAAOCAQEAJhvOYbbYtxKGw3GfYyAIag15zgdx/Zv0R8/aMtq4lum5ibJeh559
+tpJBBtqclTvMPzA0pjO61NWavFC+ROU4FMDL4HZF2fJN44VBloK2qSExD+jU3ARy
+iH7gAMMeRvnUUanQaefaacSKvrIL1EU2PCcaTHyRGqzILBi6ZbvmmZLhFB1OmlYH
+FwPWP4omGY8/MYNYuW5oU/HtpkdLWUed9DqGQSJDodBVdJHyjWEzNwf+mxBlwSXa
+4VEJouPfrQAD6PqFhsz9qQpx8gYuNN3iUVSL0CIjthzBGp/B2d+813Haio+5qsOL
+Dj+RBXEEXq6BPJ4ZI/vQ8DB6K34mTzfQKg==
+ </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>
+ MIIDFTCCAf2gAwIBAgIJALIbtMdZhxM2MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+BAMTGmRydXBhbC13ZWIxLnVuaXYtbGlsbGUxLmZyMB4XDTE0MDgwMTA3NDM1NloX
+DTI0MDcyOTA3NDM1NlowJTEjMCEGA1UEAxMaZHJ1cGFsLXdlYjEudW5pdi1saWxs
+ZTEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrnebq+nhIUfCL
+6I0Zs/hG4XeRItJBgsQQ2AB2JndoMZaRewzKT/9Ht/EqObllh5C3qFhMDitBd5Au
+E6/+Dhff00q4GGskt3Nf0qsV9EuOvyr2z2kx94wnilABMm+dZo4j0NBLuGo+vPNc
+sbjUjmo/fmD5N47iI3+UqcZPmKlp5mnfJ/QfMWYhkE9xSknu+jwr85mtYPJlMLLR
+bYwaVoCpNNn/dI9AmKPV0j4Hy7Wi3ZHehqg1e2qHaejGdTt61W5hzVfzXgc/VznF
+kISdtz8ohNq5NqXNKdddyDY60miygAtY/3BVf5/FQklalDtVWnVbFR2iqDLiRhpm
+XKBzPwIbAgMBAAGjSDBGMCUGA1UdEQQeMByCGmRydXBhbC13ZWIxLnVuaXYtbGls
+bGUxLmZyMB0GA1UdDgQWBBR4MjERy9HNblRVIBMMXv6lw+oJxjANBgkqhkiG9w0B
+AQUFAAOCAQEAJhvOYbbYtxKGw3GfYyAIag15zgdx/Zv0R8/aMtq4lum5ibJeh559
+tpJBBtqclTvMPzA0pjO61NWavFC+ROU4FMDL4HZF2fJN44VBloK2qSExD+jU3ARy
+iH7gAMMeRvnUUanQaefaacSKvrIL1EU2PCcaTHyRGqzILBi6ZbvmmZLhFB1OmlYH
+FwPWP4omGY8/MYNYuW5oU/HtpkdLWUed9DqGQSJDodBVdJHyjWEzNwf+mxBlwSXa
+4VEJouPfrQAD6PqFhsz9qQpx8gYuNN3iUVSL0CIjthzBGp/B2d+813Haio+5qsOL
+Dj+RBXEEXq6BPJ4ZI/vQ8DB6K34mTzfQKg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://identite.intranet.univ-lille.fr/Shibboleth.sso/SAML/POST" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identite.intranet.univ-lille.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="fr">Université de Lille - plate-forme charte digitale (identité)</md:ServiceName>
+ <md:ServiceName xml:lang="en">Université de Lille - plate-forme charte digitale (identité)</md:ServiceName>
+ <md:ServiceDescription xml:lang="fr">Cette plate-forme permet aux responsables de communication de charger les éléments d'identification numérique</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">This platform allows the responsables of the communication to load digital identification elements they need</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>VIEVILLE CLAUDE</md:SurName>
+ <md:EmailAddress>claude.vieville@univ-lille1.fr</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>WALLON ANTOINE</md:SurName>
+ <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
index 9816c524..2cfae49b 100644
--- a/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
@@ -10,6 +10,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-lyon.fr</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Ecole Centrale de Lyon</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98KBw0LB42T+3kAAAITSURBVDjLdZNBaBNREIa/3QatJeoeBL0UUxFKUEJQKejBxj0JElvFq1hyeCAqih6VHgpexaIi+w6lLfXioQ3koocuwYi0QuretBfNIqFgBTcRaiyh8eBseUYdeCwz+7//zfwzY3U6HQvDtNZZIAJSgC9hF6gBKaVU2cRbJoHWegoYi8H8aXFsWilViIOJLlB8yQEeAq/EPy3EANm/MpCXs3KmgdtKqairNAd4IEQBECilCpbneWeMWstKKdfvG9wauHuDqLIMQDKT5vPjGdyNVVtr7QO5WJuefD5vASOSdqparYZH9h0YGbh3Hbu3l2Qmzf5L52g3miysfQyBm4YmkwmpOwUUhXl8bW6Bb5W3tKPvv4VydtMK63Dizrh0qAyMAinbSH8WOAYEyUyaU+99hpaKZJ4/of/alViKQDCz4vuW53kdcS4qpYoAft/g1tBSkWQmDUArrPMm7eJurNoi6CgwD2DLkMSt2rb10iIA7UaTT/cfkdi7x/wdY92EiFEDxrTWE8DUoV07t19uN5qslxbZ3PyJ1noeKBjDVjNFBFgBitHwcbeun40DuaiyjL0jUY5OHp0AzgvGibvWUyqVwmq1elDUzQIffhzun7kw99R7d/ZyoxXWXw5/Da6+bnyJpN05EfOFUmqyexdWhCSSieweZScetv/tQmAQ3JJjLpMj339vo2SRMzave50dpVRg4n8Bxo3SMex00ZQAAAAASUVORK5CYII=</mdui:Logo>
<mdui:InformationURL xml:lang="fr">http://www.ec-lyon.fr</mdui:InformationURL>
<mdui:DisplayName xml:lang="fr">Ecole Centrale de Lyon</mdui:DisplayName>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml
index 35f3d64b..ebfd36e0 100644
--- a/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.istat.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.istat.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
index 2cb1431e..3514ec6e 100644
--- a/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
@@ -106,19 +106,19 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
<md:ContactPerson contactType="administrative">
<md:Company>Mälardalen University</md:Company>
<md:SurName>Peter Falck</md:SurName>
- <md:EmailAddress>peter.falck@mdh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:peter.falck@mdh.se</md:EmailAddress>
<md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Mälardalen University</md:Company>
<md:SurName>MDH Drift</md:SurName>
- <md:EmailAddress>drift.ita@mdh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:drift.ita@mdh.se</md:EmailAddress>
<md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Mälardalen University</md:Company>
<md:SurName>Helpdesk MDH</md:SurName>
- <md:EmailAddress>helpdesk@mdh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@mdh.se</md:EmailAddress>
<md:TelephoneNumber>+46 16 101550</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..5662e308
--- /dev/null
+++ b/swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.ugent.be/simplesaml/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Ghent University</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="nl">Universiteit Gent</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Ghent University is a top 100 university founded in 1817. As one of the major universities in Belgium, our 11 faculties offer a wide range of courses and conduct in-depth research in both exact and social sciences.</mdui:Description>
+ <mdui:Description xml:lang="nl">De Universiteit Gent (UGent) werd opgericht in 1817 door koning Willem I van Oranje. Vandaag is de UGent een top 100 universiteit een van de grootste universiteiten in het Nederlandse taalgebied. Meer dan 100 vakgroepen bieden ruim 230 opleidingen aan. Disciplines als biotechnologie, aquacultuur, micro-elektronica en geschiedenis genieten wereldfaam. De UGent is een creatieve gemeenschap van medewerkers, studenten en alumni, verbonden door engagement, openheid en pluralisme.</mdui:Description>
+ <mdui:Logo height="68" width="95" xml:lang="en">https://identity.ugent.be/images/universiteit_gent.gif</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>157.193.0.0/16</mdui:IPHint>
+ <mdui:DomainHint>ugent.be</mdui:DomainHint>
+ <mdui:DomainHint>www.ugent.be</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:51.0473100,3.7281500</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</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>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.ugent.be/simplesaml/saml2/idp/ArtifactResolutionService.php" index="0"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.ugent.be/simplesaml/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.ugent.be/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">UGent</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">UGent</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ugent.be</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Frank</md:GivenName>
+ <md:SurName>Meisschaert</md:SurName>
+ <md:EmailAddress>Frank.Meisschaert@UGent.be</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml
index 306a8154..794b5f10 100644
--- a/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.unife.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.unife.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-03-05T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..845d1575
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-campus-condorcet.renater.fr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-01T12:05:03Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campus-condorcet.fr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">CAMPUS CONDORCET</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAACESURBVDhPY7jGIPufEkw9A25JGv8nBWAY8MAhDCpFHMAwgFj8uqEPuwHEuACk7uuB43A2dQ2AOQ1Ew8SwYZxeQDcARCNjkM0wDAIgF+M1gBCA6cPrApAt6BimHobhBsCcBqJhikGGYDMIZgmKASBBUgBOA5Bdgg3DXIVhALmYQgNk/wMAQ2Cys1X73UcAAAAASUVORK5CYII=</mdui:Logo>
+ <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Utilisateurs Campus Condorcet</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">CAMPUS CONDORCET</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Utilisateurs Campus Condorcet</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDaTCCAlGgAwIBAgIUUbskQm6flzcLwm00UebURsVlOqowDQYJKoZIhvcNAQELBQAwKjEoMCYGA1UEAwwfaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mcjAeFw0xNTEyMDExMDQ2MDRaFw0zNTEyMDExMDQ2MDRaMCoxKDAmBgNVBAMMH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVdtz5q49daXITC5ulby/+ec+hxd3z24LWZwMkGJuPo1toKdEAmzKfRvwV5jiWMlj2AVTRB20qA0YfhcB8DOdeWdcOn+ioyumjzgEyIu5CpFhQEk47C+t/PsHAhz4W+gPKjz/FLXMNHzb9gqWB4X3twaCywFbwp0pazvnXFPNCps1hpQZg91HgmUeKuG7D5ph2hWNeZsafeSTAuOUfI6K3mBuqyX5gooUjkmC2yChehI8M4vOrCDbpduNHSpIvcyh1lWQYgOFOsrvmPxcvX6FS6D332fr5pk8rH/n/ZVTjhXJQGjhXsE66D7Prl9G0u0fyxjo1wk3hbzZ6SNT2cMT/AgMBAAGjgYYwgYMwHQYDVR0OBBYEFOAGUo52UE2qpWvbFZUrCS9fBRECMGIGA1UdEQRbMFmCH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnKGNmh0dHBzOi8vaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATuf7qRpXVm9OPx4ZktinHIJI+YHlCUCbl+t28Nb2sJqqv/hSHKnm9DClLp8/ewlVY1Mb/vYtJz6byHuHzwzTf1POsVoV8WZwgg4loAarIIAO5nS9pwhAr86uK40bD0L2y+YIw+ltXxL5+YTwxkdYYyAEnin0lCclr8NQDSP3cYRPbCgAdTHBsX1o4yatgcC0Yf9nmIrrgpa7HYksjZNLiasjWjQeKsra1b/ifjrSFLwXgWkXSkjo7xWUIRfwvbBMFvbQc1NuZa4egPeyraK5ImrrhjaX9+jJrgw84aIrvkyaEClGMtH4nmc/LJAZexmwDgYutes8KufHfDLKAKmSvw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-campus-condorcet.renater.fr/idp/profile/Shibboleth/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campus-condorcet.fr</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDaTCCAlGgAwIBAgIUUbskQm6flzcLwm00UebURsVlOqowDQYJKoZIhvcNAQELBQAwKjEoMCYGA1UEAwwfaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mcjAeFw0xNTEyMDExMDQ2MDRaFw0zNTEyMDExMDQ2MDRaMCoxKDAmBgNVBAMMH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVdtz5q49daXITC5ulby/+ec+hxd3z24LWZwMkGJuPo1toKdEAmzKfRvwV5jiWMlj2AVTRB20qA0YfhcB8DOdeWdcOn+ioyumjzgEyIu5CpFhQEk47C+t/PsHAhz4W+gPKjz/FLXMNHzb9gqWB4X3twaCywFbwp0pazvnXFPNCps1hpQZg91HgmUeKuG7D5ph2hWNeZsafeSTAuOUfI6K3mBuqyX5gooUjkmC2yChehI8M4vOrCDbpduNHSpIvcyh1lWQYgOFOsrvmPxcvX6FS6D332fr5pk8rH/n/ZVTjhXJQGjhXsE66D7Prl9G0u0fyxjo1wk3hbzZ6SNT2cMT/AgMBAAGjgYYwgYMwHQYDVR0OBBYEFOAGUo52UE2qpWvbFZUrCS9fBRECMGIGA1UdEQRbMFmCH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnKGNmh0dHBzOi8vaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATuf7qRpXVm9OPx4ZktinHIJI+YHlCUCbl+t28Nb2sJqqv/hSHKnm9DClLp8/ewlVY1Mb/vYtJz6byHuHzwzTf1POsVoV8WZwgg4loAarIIAO5nS9pwhAr86uK40bD0L2y+YIw+ltXxL5+YTwxkdYYyAEnin0lCclr8NQDSP3cYRPbCgAdTHBsX1o4yatgcC0Yf9nmIrrgpa7HYksjZNLiasjWjQeKsra1b/ifjrSFLwXgWkXSkjo7xWUIRfwvbBMFvbQc1NuZa4egPeyraK5ImrrhjaX9+jJrgw84aIrvkyaEClGMtH4nmc/LJAZexmwDgYutes8KufHfDLKAKmSvw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">CAMPUS CONDORCET</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">CAMPUS CONDORCET</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Anass Chabli</md:SurName>
+ <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml
index ec5a5735..0afd0741 100644
--- a/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml
@@ -43,6 +43,9 @@ t07R76998/yfPxz/Dakn82YII+tPFsgpgJXT4g==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/SOAP/SLO"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/POST/SSO"/>
diff --git a/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
index 804b38ec..54a88042 100644
--- a/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-css.irccs.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-css.irccs.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:29Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml
index e69b117a..e6a348c2 100644
--- a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dgnocchi.irccs.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dgnocchi.irccs.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:14Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml
index e64bc388..f12a819e 100644
--- a/swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-emedea.irccs.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-emedea.irccs.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T08:30:34Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..ec8abe54
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-hosting.renater.fr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-11-17T17:56:03Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">genci.fr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">GENCI</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
+ <mdui:Description xml:lang="en">IdP Hosting</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">GENCI</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">IdP Hosting</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDQzCCAiugAwIBAgIUZRhn1oG2f7FG4yfsnI73Z2W/5jswDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLWhvc3RpbmcucmVuYXRlci5mcjAeFw0xNTExMTcx
+NjM4NDVaFw0zNTExMTcxNjM4NDVaMCExHzAdBgNVBAMMFmlkcC1ob3N0aW5nLnJl
+bmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCLq4oRzxaf
+XL5i0ZfOQhGvcAW7awDjuMgYzi1geOxe1aTlCrYFosPkzSY9J/HarXGc8pS6VY2q
+brHh7wHTxP2QPw64CaQYUumOhZRvlkSGdj0vKYn7DBKewYfHND1nr+TN4ZybZVCe
+GvpIQBhwN2SARKPAxjVZIpwcKskLcHsakh2TNknkxSsu4LBkx6VYzQr8JCcH+YCx
+rVTGHoMdjNDlrEkKBJrReB7VpC1yKdXDXsQNtWKojiQvbI3Zau2gduxaAUAs4Wlz
++3gC3poaANXsRbYO5t8PU8VLulVx1j8SkRcyAunXXGLuPIZ0AwX6cREM77vuMoF1
+rgc6sdu8WEmTAgMBAAGjczBxMB0GA1UdDgQWBBRHn9jRWEpSgGuXm+Fcat1vfMSM
+ZzBQBgNVHREESTBHghZpZHAtaG9zdGluZy5yZW5hdGVyLmZyhi1odHRwczovL2lk
+cC1ob3N0aW5nLnJlbmF0ZXIuZnIvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAIiIsPKolz/Ct7HOQDvJXJ3VT2ov8TQT2DA75cJ9qK1TVEQTnZtsla2x
+heA2WFYt2Hf1/N/y9salEo1r5zXlaTi/D3QQBjl8jQK9uibY3Ta4bk27XePxAv8I
+MAWWy529LU5M7/AViEMkPT96kPcOJST5XgXzZN2I8dkVQ+L6SUutqvvVju7MDwP/
+dSqzvGLJpKzSnmgITqMT/RBPbgJUsETAr/5gOnfkJ1RQfbKjl/QzuQTKYPu4XeKJ
+z7+v1Ag9m2btxCUdJMaMDn/FUJKSzxOogW3vJ1ZIAXFMnEgSuhrM5/GoyiEqyCfj
+eTynT1A7tmOPmxyMyv76cficIt0xGao=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-hosting.renater.fr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-hosting.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-hosting.renater.fr/idp/profile/Shibboleth/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">genci.fr</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDQzCCAiugAwIBAgIUZRhn1oG2f7FG4yfsnI73Z2W/5jswDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLWhvc3RpbmcucmVuYXRlci5mcjAeFw0xNTExMTcx
+NjM4NDVaFw0zNTExMTcxNjM4NDVaMCExHzAdBgNVBAMMFmlkcC1ob3N0aW5nLnJl
+bmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCLq4oRzxaf
+XL5i0ZfOQhGvcAW7awDjuMgYzi1geOxe1aTlCrYFosPkzSY9J/HarXGc8pS6VY2q
+brHh7wHTxP2QPw64CaQYUumOhZRvlkSGdj0vKYn7DBKewYfHND1nr+TN4ZybZVCe
+GvpIQBhwN2SARKPAxjVZIpwcKskLcHsakh2TNknkxSsu4LBkx6VYzQr8JCcH+YCx
+rVTGHoMdjNDlrEkKBJrReB7VpC1yKdXDXsQNtWKojiQvbI3Zau2gduxaAUAs4Wlz
++3gC3poaANXsRbYO5t8PU8VLulVx1j8SkRcyAunXXGLuPIZ0AwX6cREM77vuMoF1
+rgc6sdu8WEmTAgMBAAGjczBxMB0GA1UdDgQWBBRHn9jRWEpSgGuXm+Fcat1vfMSM
+ZzBQBgNVHREESTBHghZpZHAtaG9zdGluZy5yZW5hdGVyLmZyhi1odHRwczovL2lk
+cC1ob3N0aW5nLnJlbmF0ZXIuZnIvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAIiIsPKolz/Ct7HOQDvJXJ3VT2ov8TQT2DA75cJ9qK1TVEQTnZtsla2x
+heA2WFYt2Hf1/N/y9salEo1r5zXlaTi/D3QQBjl8jQK9uibY3Ta4bk27XePxAv8I
+MAWWy529LU5M7/AViEMkPT96kPcOJST5XgXzZN2I8dkVQ+L6SUutqvvVju7MDwP/
+dSqzvGLJpKzSnmgITqMT/RBPbgJUsETAr/5gOnfkJ1RQfbKjl/QzuQTKYPu4XeKJ
+z7+v1Ag9m2btxCUdJMaMDn/FUJKSzxOogW3vJ1ZIAXFMnEgSuhrM5/GoyiEqyCfj
+eTynT1A7tmOPmxyMyv76cficIt0xGao=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-hosting.renater.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">GENCI</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">GENCI</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Anass Chabli</md:SurName>
+ <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml
index 0e489c2e..502c5cb4 100644
--- a/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-iccu.beniculturali.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-iccu.beniculturali.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-05-16T09:30:33Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml
index c222532f..e7a4548d 100644
--- a/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-iov.irccs.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-iov.irccs.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-30T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml
index 7bf01c23..215132e3 100644
--- a/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-oasi.irccs.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-oasi.irccs.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-11-26T09:11:49Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml
index 25cc4694..fca12354 100644
--- a/swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-portici.izs.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-portici.izs.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-05-06T12:28:54Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml
index 9cc141a0..8cab4816 100644
--- a/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-sicilia.izs.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-sicilia.izs.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-01-31T10:02:41Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
@@ -98,7 +98,7 @@ DXuwjmwjokkHQaTBMi+WlFlUWfdpPOQVT9f/Iw==
<md:OrganizationName xml:lang="it">IZS Sicilia</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">IZS Sicilia</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="it">IZS Sicilia</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.izssicilia.it/index.php/en</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.izssicilia.it/idem/idem-info-en</md:OrganizationURL>
<md:OrganizationURL xml:lang="it">http://www.izssicilia.it</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
index 13573a96..03fa5632 100644
--- a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-ssbar.beniculturali.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-ssbar.beniculturali.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-23T06:04:04Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml
index 70a16283..2ad85b7d 100644
--- a/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-staf-prod.cineca.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-staf-prod.cineca.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-05-25T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml
index c897a429..834498e2 100644
--- a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-stellamaris.irccs.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-stellamaris.irccs.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-29T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml
index 690582dd..75710243 100644
--- a/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml
@@ -17,6 +17,31 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">llgc.org.uk</shibmd:Scope>
</Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDJzCCAg+gAwIBAgIUf+ROdABvulYM0eBNBrr08C6TvOswDQYJKoZIhvcNAQEF
+ BQAwGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMB4XDTE1MDUwNTEwNDI1NFoX
+ DTM1MDUwNTEwNDI1NFowGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMIIBIjAN
+ BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIPzF237qyE3Px+37CeRobRfkDWI
+ PvHdJlD5nJkW8U+PTWnJ8At4PXC3gqV80EjSQHIFcyXkO261EHlA8SNWEcHRgpCj
+ viziINYRCPAzdtGmx75iqiFVwEskj1PODD4NjHRdCs4F3QQxmLZxlT2e2qufzuLm
+ 0xcW7sopBpni3DOSLhy4EmaVXOe2WJFSWpLeAJYqBykWp53M2yfa7YM9i0DYiGee
+ sKFdTmP6N650488Aolw9PbECYZfVeqEhT5GbOZMZyE0Uhorjf3zvEGG8nPwEmF5x
+ hdx8dwUpnEByoLYZ1dz+S6TfKsckFxLpCk+AbFSTFTcqazUK3WO3aBzXUwIDAQAB
+ o2UwYzBCBgNVHREEOzA5gg9pZHAubGxnYy5vcmcudWuGJmh0dHBzOi8vaWRwLmxs
+ Z2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQxx9cjObvnnBMR+VUm
+ LHVQdWfcUzANBgkqhkiG9w0BAQUFAAOCAQEAisO2C392/EeLBOD69GQ/4Xu7W9IQ
+ OdTV18rWXJVEPYDP7YmrcSk818fRVqK/jmxPtD6ue11ahS4ANoWYfL961uerYBy3
+ dH9DaLES8Z1q0Ph/9FaCToX54Qf3QZjeC+Z2cJxdU3GKW+jcAC2MA6xn8EZrav6o
+ wOtPF5sGumbFgmTsexNsy1yuavRO5Ss4L0PW6QaqZOnf6/qE84KxVz17F6liGtO5
+ jTr3pKI/A3iBWZt2V88lvRAxEQET8C6M9GnrRkSuLQUs6GWDbXKZHZPIs/qCvPG9
+ ZKiIFQhzp7jfUxRJaFznq0Ysg4Ftq0JIV+j8n7+JE4dO9Dp4c/rj6uzjDQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -59,6 +84,31 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">llgc.org.uk</shibmd:Scope>
</Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDJzCCAg+gAwIBAgIUf+ROdABvulYM0eBNBrr08C6TvOswDQYJKoZIhvcNAQEF
+ BQAwGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMB4XDTE1MDUwNTEwNDI1NFoX
+ DTM1MDUwNTEwNDI1NFowGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMIIBIjAN
+ BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIPzF237qyE3Px+37CeRobRfkDWI
+ PvHdJlD5nJkW8U+PTWnJ8At4PXC3gqV80EjSQHIFcyXkO261EHlA8SNWEcHRgpCj
+ viziINYRCPAzdtGmx75iqiFVwEskj1PODD4NjHRdCs4F3QQxmLZxlT2e2qufzuLm
+ 0xcW7sopBpni3DOSLhy4EmaVXOe2WJFSWpLeAJYqBykWp53M2yfa7YM9i0DYiGee
+ sKFdTmP6N650488Aolw9PbECYZfVeqEhT5GbOZMZyE0Uhorjf3zvEGG8nPwEmF5x
+ hdx8dwUpnEByoLYZ1dz+S6TfKsckFxLpCk+AbFSTFTcqazUK3WO3aBzXUwIDAQAB
+ o2UwYzBCBgNVHREEOzA5gg9pZHAubGxnYy5vcmcudWuGJmh0dHBzOi8vaWRwLmxs
+ Z2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQxx9cjObvnnBMR+VUm
+ LHVQdWfcUzANBgkqhkiG9w0BAQUFAAOCAQEAisO2C392/EeLBOD69GQ/4Xu7W9IQ
+ OdTV18rWXJVEPYDP7YmrcSk818fRVqK/jmxPtD6ue11ahS4ANoWYfL961uerYBy3
+ dH9DaLES8Z1q0Ph/9FaCToX54Qf3QZjeC+Z2cJxdU3GKW+jcAC2MA6xn8EZrav6o
+ wOtPF5sGumbFgmTsexNsy1yuavRO5Ss4L0PW6QaqZOnf6/qE84KxVz17F6liGtO5
+ jTr3pKI/A3iBWZt2V88lvRAxEQET8C6M9GnrRkSuLQUs6GWDbXKZHZPIs/qCvPG9
+ ZKiIFQhzp7jfUxRJaFznq0Ysg4Ftq0JIV+j8n7+JE4dO9Dp4c/rj6uzjDQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -92,7 +142,8 @@
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">National Library of Wales</OrganizationName>
- <OrganizationDisplayName xml:lang="en">National Library of Wales / Llyfrgell Genedlaethol Cymru</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">National Library of Wales test IdP - DO NOT USE</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="cy">IdP prawf Llyfrgell Genedlaethol Cymru - PEIDIWCH DEFNYDDIO</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.llgc.org.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml
index 3869d403..46faf1e6 100644
--- a/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-unito-prod.cineca.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-unito-prod.cineca.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-02-18T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml
index ef6a9c99..685df22c 100644
--- a/swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-unitus-prod.cineca.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-unitus-prod.cineca.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-20T08:30:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
index 179c4313..f9fa20d2 100644
--- a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
@@ -33,6 +33,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preserjeradomlje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobravlje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-starse.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-starse.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vist.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscg-info.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preddvor.si</shibmd:Scope>
@@ -53,6 +54,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmesto.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-breg.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-raka.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-raka.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslava.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tabor1.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gpetrovci.si</shibmd:Scope>
@@ -82,6 +84,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-franaerjavca.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brusnice.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjernej.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-sentjernej.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszuzemberk.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cirkovce.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno-sg.si</shibmd:Scope>
@@ -90,6 +93,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vstp.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjanz.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorjup.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.osgorjup.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mostnasoci.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirkulane-zavrc.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osblanca.si</shibmd:Scope>
@@ -251,11 +255,13 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slomskov-zavod.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfpmaribor.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">prvagim.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dijaki.prvagim.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mg-lj.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospodzemelj.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os4ms.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossecovlje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grm-nm.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.grm-nm.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osprule.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tabor.si</shibmd:Scope>
@@ -283,7 +289,9 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inz.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podbrdo.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zgnl.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.zgnl.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-koper.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-koper.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-iskvarce.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-loskipotok.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospvmb.si</shibmd:Scope>
@@ -321,16 +329,114 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-marijevere.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osribnicanapohorju.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">makspecar.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.makspecar.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskoroskabela.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vipava.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssof.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hajdina.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">acs.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimvic.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pedag.gimvic.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.gimvic.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sticna.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jakobaaljaza.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospolje.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-strazisce-kr.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcc.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossentvid.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-petrovce.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stanislav.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvic.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vv.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mirna.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossavskonaselje.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbogojina.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jd.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-vodice.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-skofljica.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ev-prade.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solavidem.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mk.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenci.os-mk.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glazer.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kdk.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenci.os-kdk.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iosce.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskrize.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnovna-sola-idrija.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-novefuzine.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbenedikt.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hrpelje.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossjsmlednik.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iios-rogaska.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerkvenjak.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kobarid.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ivanjkovci.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vrhovci.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">1osrogaska.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">3os-celje.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zssm.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osapace.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zadobrova.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-borcev.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjkb.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zirovnica.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmklj.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmezica.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-franakranjca.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svsgl.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osszkr.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gozdis.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-branik.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">opvbistricams.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobova.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dravograd.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslivade.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskobilje.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osziri.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">antonukmar.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-col.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mladika.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimng.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szks.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerkno.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dekani.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osartice.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smartnolitija.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-fgp.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-stranje.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslivada.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospodgorje.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-komen.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-trzin.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmuta.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospesnica.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmmsentjanz.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-poljane.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-selnica.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-frankolovo.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-globoko.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jela-janezica.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slodrs.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostpavcka.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-konjice-zrece.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cresnjevec.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssgt-mb.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gim-ms.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrzisce.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossredisceobdravi.si</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
<mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
<mdui:Description xml:lang="en">Identity provider for organization Arnes</mdui:Description>
<mdui:Description xml:lang="sl">Ponudnik identitet organizacije Arnes</mdui:Description>
- <mdui:Keywords xml:lang="en">arnes idp identityd</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">arnes idp identity</mdui:Keywords>
<mdui:Keywords xml:lang="sl">arnes idp identiteta</mdui:Keywords>
<mdui:Logo height="135" width="150">data:image/png;base64,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</mdui:Logo>
<mdui:InformationURL xml:lang="en">http://www.arnes.si/en.html</mdui:InformationURL>
<mdui:InformationURL xml:lang="sl">http://www.arnes.si/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.arnes.si/en.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sl">http://www.arnes.si/</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
@@ -359,16 +465,16 @@
<md:OrganizationURL xml:lang="en">http://www.arnes.si/en.html</md:OrganizationURL>
<md:OrganizationURL xml:lang="sl">http://www.arnes.si/</md:OrganizationURL>
</md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>AAA</md:GivenName>
- <md:SurName>Podpora</md:SurName>
- <md:EmailAddress>mailto:aaa-podpora@arnes.si</md:EmailAddress>
- </md:ContactPerson>
<md:ContactPerson contactType="support">
<md:GivenName>Arnes</md:GivenName>
<md:SurName>Helpdesk</md:SurName>
<md:EmailAddress>mailto:helpdesk@arnes.si</md:EmailAddress>
</md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>AAA</md:GivenName>
+ <md:SurName>Podpora</md:SurName>
+ <md:EmailAddress>mailto:aaa-podpora@arnes.si</md:EmailAddress>
+ </md:ContactPerson>
<md:ContactPerson contactType="administrative">
<md:GivenName>Arnes</md:GivenName>
<md:SurName>Arnes</md:SurName>
diff --git a/swamid-interfederations-2.0/idp.aai.um.si-idp.xml b/swamid-interfederations-2.0/idp.aai.um.si-idp.xml
new file mode 100644
index 00000000..8baf4b7a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aai.um.si-idp.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aai.um.si/idp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-10-29T16:10:11Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.um.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.um.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-m.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.u-m.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.u-m.si</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of Maribor</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sl">Univerza v Mariboru</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity provider for organization University of Maribor</mdui:Description>
+ <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Mariboru</mdui:Description>
+ <mdui:Keywords xml:lang="en">Identity provider for organization University of Maribor</mdui:Keywords>
+ <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Mariboru</mdui:Keywords>
+ <mdui:Logo height="300" width="300">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAYAAAB5fY51AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAIz9JREFUeNrsnWmYXNV1rt/qbg0tJHULSaABMRmQLGYZBAJswAbMFBMDDsZOLrGNEzvGOM7FcW4IN5fEsePcxCaOwdcJnjA4HhhtJmOmMMgMAgxikEDMEgIJJKRGQ6vVXffH+k7qqFRzVUvdVd/7PPX0UOfsOnX2Pt9ee+21185ks1mMMWY40OZbYIyxYBljjAXLGGPBMsYYC5YxxliwjDEWLGOMsWAZY4wFyxhjwTLGGAuWMcZYsIwxFixjjLFgGWOMBcsYY8EyxhgLljHGWLCMMRYsY4yxYBljjAXLGGPBMsYYC5YxxliwjDEWLGOMsWAZY4wFyxhjwTLGGAuWMcaCZYwxFixjjLFgGWMsWMYYY8EyxhgLljHGgmWMMRYsY4yxYBljLFjGGGPBMsYYC5YxxoJljDEWLGOMsWAZYyxYxhhjwTLGGAuWMcaCZYwxFixjjLFgGWMsWMYYY8EyxhgLljHGgmWMMRYsY4yxYBljLFjGGGPBMsZYsIwxxoJljDEWLGOMBcsYYyxYxhhjwTLGWLCMMcaCZYwxFixjjAXLGGOGEB2VHpg596u+W63LGOCfgT8A3m5gRzcAjANWAmcCi3yrW5Ps5X/dWMEyrd2egCnARL0azQSg3bfZeEhoGsEG4IeDWP41wAu+zcaCZRrFA8Dzg1T2DRJFYyxYpiGsAm4ahHLXAvN9e00l2IdlKmUz8GPgdGAS9Tvfs8Bk4JvAct9eY8EyjeZV4GqgG1jdAMGaBjwM9PnWGguWaRTdwBeB04CxEpt6yRIzg3OATwCXAnf5VhsLlqmHU4C/k7AMFnsB7wV+CvwDsMK33RTCTndTjE7g68CVgyxWCTsB5wO3Ae/z7TcWLFMpM4CfARdoOLgtOVCW1tmuBuMhoSnHLOCqbWRVFWMq8G/qUK9ylRhbWKYQewwBsUqYCHwb+LirxViwTD5jge8NEbFK6CbitE5w9RgLlknIAH8PHDsEr20y8B1gF1eTsWAZiLQxnx3C17cn8DW3V2Onu+ki4qxG1VnOUuAtIrfVO/pfFhhPONF3A3aoo/yzgZuB/3SVWbBM63IesE8d5z8BPEQsjt5LAtUlseqXeN1DrEWcRcRYjazhc9qBvwVuJZYFGQuWaWIywCHE+r0b9L/dgS/UUebVwGLgUOBoIhEfQI/a1ggiALUXeBn4LfAMkV10ag2fNxP4GLGMB33udOAWfYZpcuwTaB1GAxcC/5T631mEU7sWriVSGp9FOOvXAfcDtwNPAs8RawNvBR4nMjz8qYTqRuCNGj/3LHLBrB8nIvF3dvXawjLNV9cTiBzqnfr7lDrKe0AW217AHRoC7k/kfx+vIVwPkZhvpURrKnCMLKS1NQrNPOAIwp/VTfjF3I4tWKYJh4TtwEZgE7EEZm4d5X2U8E0tAQ6SeOTnZU8c+TOAvWWF3QgcTDjha22zp0iwkvIn4RTLHhKapuucdpZg9RP+n3pmBueovGeIqPRym0iMA14Dngb2pTbHe9rK6tR3gfpmH40FywxRRsrKGU+kc6mHN4iso9OrOGdXwmdWrzU0i3DA9+jv8a5aC5ZpLkbLIsoQgZi71VneMpU1o4pzuogQiheoLwlgp4azibW4o6vXgmWai/bU0GweuRCEWsgSvqt3Uf0s42wiwPTZOr/Pbnq1U3/Qq7FgmSHGJCIuKvFl1TOMWkZkBZ1Rw7nTZZm9WKeVNZ2IKYNI/ue2bMEyTUSX6rtND3h3HWW9Istmeg3njiFmKBeSW8JTC5NlLYJnuy1YpulIz6R1U/ss3SZiQ9WZKcGolr0I31M923t1E365xHp0W7ZgmSZion6OJ1K19NdYzhtEIOjUOq5lHwlOPTtJp8MoOjXMNBYs0ySMznvQk63hq/UjvSiL5t11Xs/ewEt1nD8iz3q0YLUAHvu3Tse0Z+rhvhd4hPAlvVlhxzVSIvck9S3pSZgH3AT8C7EIe10VojOSCED9Y/29uztfC5ZpHrLEouTDCYf5auAwwgE+sYKHPathV+JzalTcUycwQMRTbazwnH7C4f4mcAWxuetPcbYGC5ZpKsHqJJzkHYTT+wM1lNMrK2tdA65pFRFecTa1ZYzYTMRyjSZiyrKu5tYYKpjmZyzwJWL935lEiMOdNZTTA/TRGH9RVuXUEtqwSKL5GWKZzl8QayONBcs0AeOJdXxIJMaQc7rXIjSNIKOyailvmay9ztTQcidXswXLNAcDKYHql1iMGMbfZzQx29mnvzfpZSxYpkkEa2AQrCRjLFim4WRSdZ0sz2mvsb20N6jdJNeRqeP7ZFJ/GwuWaRI6UkPAjIZUtSS9y+i8MQ0S0Qy1zVR35Iluu0WrdRqyaX7WAN8nAiw3AA9KtB6nshCFrI5/B5hPRKnvrb+rFYoBYpZyOZFi+W0icr6SsvqJUIhHiZCGHgnxSGJfRGPB+m/2J/IO9fu2DQuyskL6iTCA7xFBoptSlsk9VVhDSRhCu8obSP2/Wssqm7KufpT6O1vBuQOpYemlEqw1RCDpLCLWrFGhF2bwaSdmfBc2WrB+TSx4tcN2eAnWeuBI4K+ILbIGmuhhTr7jg8D5EuX9muw7NjsZWdvTGi1YbakPMMOjIZCyRrJ59dhM37FNbbm9Cb9jK9DW8AM9FBy29LN1WEOzsYnq1iOaoddGGy5YxgxlSytj69+mmDHGWLCMMcaCZYyxYBljjAXLGGMsWGY7UmueK2NK4rWEJkusL3yJWN4yldjReXSV5WzW+U8DrxFZTvchtpPvrLJzHCAi9J8n1hjuTqRRHunqsmCZ1mUjsZh5KRHDtBF4GXiIWNx8QBnhykpQVgCPEZtbTCLyxS8DFqj83YD3qKxymR56iKU2L0ug+vV7G7HsZibDO/mgsWCZGugBbiY2RT0Z2CP13rMSrcXAh4jsCmn6gLeAJTomo/NPINIxI0vtYGIfw6eAXxALk2cR6Zq7C7S/lcB1eu94WXpItJ4gdv5ZpOsd4yq0YJnWYD3wSwnDWQXen6nXjyUSp5PLprACeJjYLmwcsb/g7CKf007s0LMXsXxmAbGv4QJguqyunWQ99QK/IhbBnlqgnc6R2P0Hsa/icdSWhNBYsMwwHArurSFWKU6XtZWkdOmXtbQe+DDVbVc/EjhCr6USnceBY/XeO8TON/uXKGMM8HHCR9ZnwbJgmdZgR2BuBcftoGFdur28vwGfvwuxHyHkZhMn6lWOSXqZFsRhDWZ74wXLxhaWqZjEJwUxi7dZQ8CDygz5Xgd+q+HcaJ3TC+xLzoH/BpHOuF2vjYQvax4wpUTZLxC+rk6d945+n8vWEwDGgmVaiNuAT6YEq0/DtO8Anyhx3p2EP2lEnmBdTGQ3bQPuBs7JE6w+4CrgY0XK3UykTf5KnmB1AdcD73OVWbBM67KB3Iakfan/l0uGty51TrHzNkrEip1biCzh1B/IO66nSFmmhbAPyxSLZyoX6V4seLOTnF9qZJXnQm4rsXzG4Uh3C5ZvQcuTrfL/tZZXbxlen2gsWMYYC5YxxliwjDEWLGOMsWCZIV/XbTW2jVLnZeooOzMI12qaBMdhtY5YJRup9ucJy/oi5yQxTwNFyisWE5WOw9pUZdkZIlC00DWtIxfvNUDMGCbilsULoS1YpmnEKkMskdmDWIoDEQs1kchnNbnAeS8Ad0k8+vNEZSqRDbTQecuB/9LnFiv7eSLFzHK2DFXoIDKVvlHgvE4iu8M4fYd+XUsXkbtrk9uzBcsMf5I8VuuJBHmbUlbOWuC9RLK89LFJ9tEVFF6cvIRYD/j+1Hlp6+l1/X4ocHTqvUScNqiMQkO5HuAjxLKf9HkZWVkvpEQ4ic3aIKvLC6ktWGaYkyxmPpHIHtqM7ENkT/XSnRYYLpjmt7AgFhBvK96muP9qMFhF+Lfcnm1hmRbhdcLn9L46hlbPAguJ3XNGEamR9yNSMdfCYpV1ZAWi7OGgBcu0CHcSmztkCYf4URpmVTrkfJDwLfUSDvm5hA/sWYnOBCJP1swKy8wSaW+eIiYHXib8ZVNcVRYs07qsBn6godRJxIYQTwF3yFI6VZZSId4E7gNeJWbq9iT2D9wldcx+RP72V4kc7ncTM5XziNm+QiwFbiEyNpxG7MLzOJFDayZbb1BhLFimBXhUltW7NAxM8qkfJeGZD1wBHENsWJGwTOf1ELnV36fjC2UCHQe8W6/lOvc5ldutsqenjn9Q13UAkUs+SX1zHLE12H3AZcDvkdsCzFiwTJOzkZg5PB44sMD7uwC/D/yOLYM4e4l9BidLbHam8hxVU/WaTYRXLJJ4TSSX6bSD2NvwXQXO34fYAuxhwsk+HTvZLVimJRhJ5GzvKHPMXLbMJjqC2B9wdB1iMYbYCXoGET81MtUWD6J0xPpYYluwXuxkt2CZlqGtCsEZkXfemAZeQzqzaIbKl9eMchVasExr8zTwEuGPml3FeUs0tJsiC6mQ5fMU4XjfjfBnVUI/4fhfTjjb93QVGfsATD/wMyLW6RQNua6r8NybCKf7ycSOzj9g6zTG1+mYkwiH/tWUT3W8GfhXHX8yEdJwr6vKWLDMo8CfE9HpEOsHLyDiqkrxLPBFWUAQjvwvE/sJpo85n3CSo59fksVVjCwRVvGX5HbNeVnnrXJ1WbBMa7OQ3GLlhBeA+8ucN19DwTRvSmwSC+phIq4qzUtEdoVSFt/dbJkhAuAZYtbSWLBMC1PMj1lu7WGxYd2q1HvFjsnUcE3eNcdYsEzRNlBuX8JMifOS99prFKxC19SOk/S5sfoWmCotKGMsWMYYY8EyxliwjDHGgmUGg1IJ7tqr/H+6zHJtqqPKc0t9dqntv9rdllsDL81pDbHKktt+q0c/RxJr8lYUOW+1fq4ntx1XltwawA1Fzns7JUhrihyTnLuOLTePaNd1rS5wzrpUeemdfMalrtELoi1YZpiTWCvzifxVq1P/Hy0BOz31v0Sc3gF+TuRmT8dVZYgF0KuJFDRtOi+rczt0XkZieEbKwuvXMauBayQ02ZTQZCRYnSo7WXjdp9+fJ5b2bEhd0zgiQLWXLRdqGwuWGYYklshBxJZbPSnxgchrNSrPGkNCtb6I1ZIl1gd+Pm+IlyXWASZBp8eyZVxWepuvUilijpf45J/Xm7LOMinBagNu1WcbC5YZxiQP+45EuuHxVZy7Y42f2V3m/bE1llvsvJ3zrEPTpNhR6c6pGRiRZx0aN2IzTElm194iFif3N2Gnu5LSs4jGgmWGCclQ6R5io4g3aa7ZtPGE0/0dKs8vbyxYZoiSTPcfABzGtt0BeluQOPXnY6e7Bcs0hWBB7DrTrGmGNxJ+LAtWk+Mxf2uQDhxtRnqIWC0HjlqwjBnyZCxWFixjjBlS2Idl0qyi9mDRDcBPgceIMAOIQM/9gLOBnbbDNRkLlmlCHgQuJNb+TSO22JpZxfnXAF8ldsPpLTBcuxz4AnBuFWXeClxMLA96N/ANXZuxYJkW5kVim68H9PdC4DMSoUosm6uA88htE5ZPltj663xifeKfVVDmI8A55DJJPEEsiP4ujrVqaezDMvNTYpVwt16VnPvlEmKVP2S8qIJy+4Fb2DrtzY0SLmPBMi1MX5H/ryxzXhb4EbCsis9aBXyf0mv+shoG5rOxQmE0FizTgm6Bcrml1hCbm1bL85TfwXlEkeu0C8OCZUxNrGdrB3sl9BO+LGMsWGabUevGpm1ud8aCZYyxYBljjAXLGGMsWKZKhmJa4YFhcp3GgmW2McUS+q3bjte0tsD/1tDcKXJMBTiuxewPnEWs+euQdTNAZCjdXp3oUcByYhlOhgifGAvs5uqyYJnW5gjgPeQ2ccjqtb3W7LUBHwZOIcImMkQm0TZy+ycaC5ZpYbdA5xBsl+m26QXP5r8bqzHGWLCMMcaCZYyxYBljjAXLGGO2sWBZ3IZvHQ/GNli1Zl0YjGwNSZntru7m1qFqGs4439dhyWjV8w4NLndSjQLRrnMbyTgi9GG8q3tYUrG2VBOH9X1gCoXT15qhyUjV1wrgNgnXW3WWmSW27HoDeLWG818FfgjsrOuq1/IbD/xO5V4JzKL4ciMz9BgDvF7pwZlstrI1pZlzv+pba4wZFLKX/3XDh4TGGLNdsWAZYyxYxhhjwTLGWLCMMcaCZYwxFixjjAWrOBkiSrlakUtS72YG+btsq88x24akPmvdsDVNe+o1lNpHR4nvNgv4NHC4DYstb1il7AP8KfAK8F1gQ4WN7veADwK3ADcO4nc5BjgDuAf4uat22HMYkWt+EzAC+BnwYA3lnACcCPTpwf858PAQ+H57A+frebpE15fmZODrwOXAY0ReewtWFcfOBr4ILAF+UqFgtQMnAZ/R74MpWCcAnwP2sGA1BQcDf576e3d1SNVs99UNfBl4f+p/S4eIYB0MnAc8A/w7sStQ/rPTYeuq9iFhssVSv3q9SsimeobB3lduKbAYeMrV2jRDQlId48FUv5PPYcQOPBtT5QwVS2U58BywiNhkI59+/RxwU6jNwhrqfA+4BuhxtTZVZ3or0CUr6STg8SoE73hiAfj3gWkaGg4V5ktMN7N994BsWgtrqLORWPXtym8OEov8ReA/9PtpVJ6KZAZwptrFpYSvaCjRT2SrWOWqbk3BaqZhkMkJ1kjgDgnO4RrmVcKhxMar9wGPDuM6HqByF4yHhNuAI2Xy36y/95C/YgrheMwCbwN3E36qYuwiH8dzeiWN/QBgV+BeYGUF13MIke/p4SLHdwPv0+cl17cGWEjkZSpGF7FhaY8eoMRHMRk4lfCtXK3GOVtDmHUU9/0lm512AE8T+alIfe8Z+h4T9NkTyGUf3Qg8C/xXDfXVpTrr1bCm3ORLt4Y+bwIPUb1PZozq4TrgCyrr9jLndBIOeohZY4j8W6WYJoEbr3s1gZidHNCw7TXgV5T2xc4EDgQeyLPo3k3MYj8lAc3qc+YBa3V8sXLX6L2ZRKjDNF3XZtXjAuCJCu7jVAn+ZGJD2kxqVHK3rqMYU3Tuc2zpI95Fw+y1ujcbVPbBusYFZdrHNGCOynxxOAjWDsTU7aHAP+jvj+lG5LOAmPG5s0hZZ6mMHxHhFwnnAecAXwPKJd3ZF7heD8kZwF157/8+MXN1dIFzl+uzv1JkWHoUkbhuiRrqVOBcYvr6cAnAr9SQLtcxpVivxjBC3+0fU+8dB3wLeFeJ89fqei+kOr/fbsAVEsWT9QCW4kzg/6neTqxRIAHul2B9HPhOnkDnM1111QP8Wv8bXeL4WYT/c1aZUccNxEx5sYfrXOACtblL1a4/RYT17A5cpY4T1fn16rxOKNBmshLLk9WJHyPhyOcF4N+I0Ihi/AkR03VIkffvBP4v4S8sxIeBywhf4Kf0fF6gazpQnd8dao8ziBCUTcDp6sgp8cx+Hfgq8H+Gg2CNVEMaCVys/z0H/EDW1Eb1dB/Vzb5KD2OhmcCJUvd0T7pJVs85ujmXlbHSjlBjf6zAZ5xOZLTslHjeovIzaugfA/6KSP/7Z2wdVzMe2FE95V/qeubovaUSs42qkwXkZmOzecOJfvk99lFPllgUaUboAbgPeFni1ENk4uwD5qoRfl7/v7CKOnsZeFKiXU6wdgA+Ikt0IbXNeI1IWUqvAHtJzK8vcc5xuifzgUdSQ6tSVlybrOoXZNFv0L3ZIMH4E/nQNquuCw3TEv/a+9UeP08uHfQjEsWkPseq7XeVeA77JQgHEhlVf5qqz9G6ngOAbwKr1QHl80XgG/p9vsRpk8ruAv6Hrvc9+v2XBcpIUk/PldHwR+rckVhdSi7L60iNaNboeSzFJNVv13AZEg6QC5e4TVbB4wVE5Tqp+0zgbOBvCpTVq0rItxZuV2XuofOXlhhGnJjqcVbkmfrf1TGXyYpannq/HbhJlse5+i6/yCt/gxraePUq6JgbJJCLdD/61CjGFHko+mVdXS/BelgWTJrfSPTW67sXekAvlMX5aV334grrbI3q42gJ/FiKpyTeRb3wWt2fenxZbwDXysI9Q99xXRGR/AP9fk1q6F2KJ2XlbCBSSBcant0ry+4M+dHuLXBM0pY/pA6uD/gnXetitkwpvSH1M1vE19UB/FYjh6clVmnh/Z7E6HTgf8pCSlueB8n6RqL2j3ntGoncJcSM6rc0PF1RwJpHrorEkr9MdfqsRg0Jyaznugp8b715GlCWoeB0b0/d0JuKCMp8IlgVPaSjqyj/OflqMsCxJY6bqPfXFhgKflK9wW3AX+SJVSIiP5FpjnqqjhLf91o98J+U1fh0XkNMHpyeAq/1EuyT5X/4VIHrWQ8sKyJWyfv/qnszWdZaNTysa5yrRlyMw9XjPqkHr15ulDieUWR4lLSPI+VzurnCcjdJTN4s4Uu6SsNSKB4PlpzbpyHOHHU+t1Nb/vsMEd1/k4ahAwWs3W+oE9lfQ9A0H5KVc4+s+hUFPuNpIuD6VQ33T2briYFMSoy+rc85X/d3SZnrbyhDaZaw3HDhgVSvvWMV5famGtqcAsOntPN/ghy89+UNW5Ox/79TOvDw2tTnzCpyv5fJSriH2jZL+GM9DANqhAtrvN8bU53DyCrPXSJHbyfw3hLDrFNT/scNDWgj96U+99giI4aT9X3uVO/fSBLf1agiD2PyPF0hF8eTDXKblKqfheSc7vvkdYyHqZ3cTuHg1PxOPd3JFOJ+ddgLKrRcaWbBKmc1rUk5YavdcuyxlON73yL3IZkuv4Mtl0nslnJel5vJWCbLaEdZLoV6nA0lLJ9yHCLzvV0965V13O8xGs5B9asQVqas0LlFOoFxavxrSjhzq6U3ZTWdWqAd7Kjh0Sb5GBsdJZ62NLIlLKy3GvyMlrJU1sqahJgVJuUjm61rfaaCz3mU3GxkMcHqKeCb3aYMpUj3cg9N0khqyRjxjHqFQ2T9LMh7P4mkTqbq00zQg9Cjzx1TpAFl9f/XZJ6PKtEAR9VgXU2TWHVpaHRxBfdsnK5lLw2hdiRmJ6fp56waBSuroUpWls6ebD1Jcais4Wdp7Nq9uzV0O4VYQJyOsZqnB25hjSLZqTIPlItgku7VFP2+d4WjgZHb+NlJRGRndfwb1ca6yAWoluMtlTOW4hkktrtedAwBIaqUd4jZsfYaynxNQ7BDiBmkK9lyf8XZaqTLU0PPdK89Wvfq+pQwFfqebWrg/Q22XkcQzs4jZb5/uczQtINwPF8ksdqoa8rqtbEBPeUCidR+Eomn8kT5qJT/8c0G3ov5EsCTJFqPkYtJO0nH3EJ1EeQZnXuxOrTk/mRTrzUMXZalhoGZOp69bAnrcUjQsQ1EqL9BDrgkLiVTR0NPAg9nsOWs2Af08xG2ni1LLLoBWVlJupNCltMmCeFr1OZkLUYylbyemCp/uszxn9aQsV3+i9vUqN/WcO4ZcsG6c2q8pqW6X/sRM0w3pOp6LLkQgIcGoQO8johtOpPwK76hjuIMfcdfV1nmcbr+dl3vr+Sne1uWxyoi3OHbhIO6fYg9x12pe5MtMITNVvFM1/ucZoaKYLWlvlh/Fed0p4Z09d6ITB3q/1uJ0WxZHYtT13iMBOnuAuetVm/bT+T2WiLBylbg52gEpwFf0vX9rwoexp2IOLDRwL8QAX6FGE/9mQtuJ2Lc5ulzk9nKWXq9LrFsNLeq/g6QZXwbsfpgEhFucFcVZY0jZrw6iDCIM0scO9SEKqE71VZ7C4hQNdddb5LDTKqDb7ilVm3G0WR4MraKsfWu+n17L/J8LeVLOS71ffYl4lXWF3m4etQQdiDn5O2TIBV69aWGE/Wys/xW44lYq29VcM4BsiA3ELFrpeq+XpfAk7JuDmTLyYwT9PNx4PlBqMtXySXzO07f5Szd819Wee/Hq4weCgdebnMrooZnOJmwWpn67hv0dwcRDF2OMTr2HeqbrFinIXVmewvWq3oQJ1E8xD+fSfJv9FHhWqFB5r5UI5+m3w+TED1Z5OFamrIcpm/Dax1PRPzvLmvif1cxZOqQ36jUbORAA6zAp1OdwLxUezpGFulNg3h/btH1n0KEVhwq8by6ynLayU2CLK1w2NQ/hARr19Sw/uU84XhW32+vCso5UMcurtPyXkf4+8ZSfv3m5sEUrMVqnF0amnRXcM7fkgvT/80QqNyF8kvsR27JxLF6wO9iS0d8ekiYhEWctw2v9SuEI3gxsS6umqnyzRqilbKEV6QazNs1XuMmchHfp8j6nkAEb/aSW3g8GNxIrA6YRURdT5b/6aUqy9ksseqm9NrLxGqBbeuA76N0xPgZesbWkluGlHRID+kZ/2CZYeEO5FZ5PEx92SH6CX9pF+XXw7ZVa4m1Vdk4L9HvRwD/SUTSTi/gQzmaWMaQPOBXVtF71Uupch5NWQTv1bUepXNKPVw/088PEkGbU0ocO4HCcUnVfL9z5YfapM5hkRpAt352kVubmKzHSnhGlsYoYpKhkOl/ELHucf9U71or9+oBnqOO4AO6tkU0JnCz2H1br+FfG7lo+6trKG8NERDZSQTl5ockjJAonk1MLkDEntXblrMVvl/sgZ4MfJaYkIHIGfZc3jHXSmTn6XnctUA5M4klPnvIKr+jwOdlq/he68j5EM8hYvHyOZiYvPgoufWxFVGND2OAWPt2EfD3UuQTicXFyYLMMbopB6UeoqtlaRUTzFGpB6ncte6g8XGh3mKU/j++TG/1oBre14isDrtKTO8vcd4dsnj+Rt8lmU5fqRs+TcPKdv3+c+CfCwjFDnrQSvlAuglHebLLy3kSr+4CjTfpoS4jMjwkvrqfSFg/p4a9WPUxRQ00f3nTRWqwV+T10pWQLBg+mFi+kizmvYf6otuTtllqYewv9B27JJC/LHFs8n3HFnjALlVbPoUIXXlE93mqhlP7E3FZCZ9Tff4wr6MbWcE1k9feRxdpD4m/9DTV/SpZghl1UgenXDP3qb1tLjBkv0jvfVqGxgPEZMiA2sMHiDg6iL0XXipigSXXVM4i2qx28FlZrDfKuFmtTmFfGQtjC9RNQwUrPVRZQsymHC9xOqiA6Xy3LvaHFM+106sebiPlnfLvyHLIUjgdyhs6plw4wXVEjNLuaowrgR9TOsXKABGjs4JY/3dIGT9eoQwGq9RQXiozdu+QwEySuB2lByGJj0lPVY9I9bZpLtF7nye3EDjdW95FzIi9SoRLfISYKVtdg2BtVqc0XfezV9df74YjPbrWUmvVnlQ73EmCVWqotlIWa6EgypvVSVygYfhJee8vkIXyqNr8Z4FPyMJNC1YytK4ku+lqPRerigzBVqiDnQH8YZEyFhHhGJeobRXim/qcc4g4vkIrPX5NLO6/rkgZb+oZqDRr6yK1u7/TZ+a7Up7SNe9OLFN7ezAFC2Kd1lg1qNm6qcmDtFwNab4coz1lLJ7f6eeKCgRrvqyKQqv0X9LwpNwmFCv0wE5Tme2UTryXfjB/Q0Rvj5NDMZMaLq/Qd11L4YRqr8uKSyYvKDHUeVBmcpJGpJ2tZ26yem8EW8dl9eha91UP2qbjX5Mf704i1miNrIg56m1rTSP8OLEWrUPfbTW5YMZaWa76/F2ZOnlQn1tuxf9CWUmvFOmQ7tB9ODVlwa9Ue7qXmEF+ITWMmltgCPa8LJhKMl+slNg9X6QDe1Ed3yS1uY6UVd0vIb9X9biyTGd7J7mEmPumXEEDaju3lhlhvKLPerwK18YTRNjLROlD4t9aLIG8iZjRPoQqZpIz2eyQDWo1xpitfEjGGGPBMsYYC5YxxoJljDEWLGOMsWAZYyxYxhhjwTLGGAuWMcaCZYwxFixjjLFgGWMsWMYYY8EyxhgLljHGgmWMMRYsY4yxYBljLFjGGGPBMsYYC5YxxoJljDEWLGOMsWAZYyxYxhhjwTLGGAuWMcaCZYwxFixjjAXLGGMsWMYYY8EyxliwjDHGgmWMMRYsY4wFyxhjLFjGGGPBMsZYsIwxxoJljDEWLGOMBcsYYyxYxhhjwTLGWLCMMcaCZYwxFixjjAXLGGMsWMYYY8EyxliwjDHGgmWMMRYsY4wFyxhjLFjGGGPBMsZYsIwxxoJljLFgGWOMBcsYYyxYxhgLljHGWLCMMcaCZYyxYBljjAXLGGMsWMYYC5YxxliwjDGmSv7/AIVwb0oH+ZVTAAAAAElFTkSuQmCC</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://www.um.si</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sl">http://www.um.si</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIQBo+ihSvv1AM22JegJK80uzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMTIwMDAwMDBaFw0xODEwMTYxMjAwMDBaMHYxCzAJBgNVBAYTAlNJMRAwDgYDVQQIEwdNYXJpYm9yMRAwDgYDVQQHEwdNYXJpYm9yMRwwGgYDVQQKExNVbml2ZXJ6YSB2IE1hcmlib3J1MQ0wCwYDVQQLEwRSQ1VNMRYwFAYDVQQDEw1pZHAuYWFpLnVtLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqUTJlMY3iryERJfgAOyN2Z9RqItpG9UZ63QyTlSewr32Nod/F/mo1D/gaKsz4qYxpn6eFbPRHtIN7/lumrvFqQpeeA8NmMofSwMCQMEOwHJljFjXNVSqUHE6a2ITNZBFbMo3anAHF0szsuJrD5Zj/ySpnEwhkujrFuB6zD0Gryy/6wUgbqr1T7uZ8Y+YXn6PlzgwGi6WPK85rECPwL2GM/2FqOj1ETMaU3zns8gkOzx+Dg8itMdCQ2R3KslwCTfSH0Hnq1/TpNGNNKpTNCmGV5PzF+xKF6tpY8feSMnwTBJrMkLj8yI/SKRds+LrwKz5WrYakUvt+03zUMbpU1L9iQIDAQABo4IBxjCCAcIwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFBYZXkaBvHQ/t/2l0BQv6GGzXcOVMBgGA1UdEQQRMA+CDWlkcC5hYWkudW0uc2kwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHzsWmpmNEXZTh43jRCebi1s2maPZjf9s9L4Tq53Ojlg1VCYmLbBAKlasxivlUWNuaOL/IdU/ZS8vet8I3bqc4aLum7J0wyJ4cXLv9KlO1kxSIlKRDKN6xOxxKAg3wLZwrxgn86guncXIsr8qokuBxJyQVEBXgtpd6okVHSXo0XgbNLup7dgJHUIW4KodEPcPG03RA/qPD9lMBDCUrcKTOLd4+Ip3xaEXl3WIuKgS9wangJwxZ/ySzFBwZ7tAe8D0x9P3bB/XjNeXyURp4vvbrminhdTpsgxwU37xRzoczV9+HV5DAErDJ3+BKP7dZ1l2ILvXd5+8NRGftwdEnyQVoM=</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>MIIFLDCCBBSgAwIBAgIQBo+ihSvv1AM22JegJK80uzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMTIwMDAwMDBaFw0xODEwMTYxMjAwMDBaMHYxCzAJBgNVBAYTAlNJMRAwDgYDVQQIEwdNYXJpYm9yMRAwDgYDVQQHEwdNYXJpYm9yMRwwGgYDVQQKExNVbml2ZXJ6YSB2IE1hcmlib3J1MQ0wCwYDVQQLEwRSQ1VNMRYwFAYDVQQDEw1pZHAuYWFpLnVtLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqUTJlMY3iryERJfgAOyN2Z9RqItpG9UZ63QyTlSewr32Nod/F/mo1D/gaKsz4qYxpn6eFbPRHtIN7/lumrvFqQpeeA8NmMofSwMCQMEOwHJljFjXNVSqUHE6a2ITNZBFbMo3anAHF0szsuJrD5Zj/ySpnEwhkujrFuB6zD0Gryy/6wUgbqr1T7uZ8Y+YXn6PlzgwGi6WPK85rECPwL2GM/2FqOj1ETMaU3zns8gkOzx+Dg8itMdCQ2R3KslwCTfSH0Hnq1/TpNGNNKpTNCmGV5PzF+xKF6tpY8feSMnwTBJrMkLj8yI/SKRds+LrwKz5WrYakUvt+03zUMbpU1L9iQIDAQABo4IBxjCCAcIwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFBYZXkaBvHQ/t/2l0BQv6GGzXcOVMBgGA1UdEQQRMA+CDWlkcC5hYWkudW0uc2kwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHzsWmpmNEXZTh43jRCebi1s2maPZjf9s9L4Tq53Ojlg1VCYmLbBAKlasxivlUWNuaOL/IdU/ZS8vet8I3bqc4aLum7J0wyJ4cXLv9KlO1kxSIlKRDKN6xOxxKAg3wLZwrxgn86guncXIsr8qokuBxJyQVEBXgtpd6okVHSXo0XgbNLup7dgJHUIW4KodEPcPG03RA/qPD9lMBDCUrcKTOLd4+Ip3xaEXl3WIuKgS9wangJwxZ/ySzFBwZ7tAe8D0x9P3bB/XjNeXyURp4vvbrminhdTpsgxwU37xRzoczV9+HV5DAErDJ3+BKP7dZ1l2ILvXd5+8NRGftwdEnyQVoM=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.um.si/idp/simplesaml/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.um.si/idp/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Univerza v Mariboru</md:OrganizationName>
+ <md:OrganizationName xml:lang="sl">Univerza v Mariboru</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Univerza v Mariboru</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sl">Univerza v Mariboru</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.um.si</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sl">http://www.um.si</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Izidor</md:GivenName>
+ <md:SurName>Golob</md:SurName>
+ <md:EmailAddress>mailto:izidor.golob@uni-mb.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Helpdesk</md:GivenName>
+ <md:SurName>Helpdesk</md:SurName>
+ <md:EmailAddress>mailto:skrbnik@um.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Gorazd</md:GivenName>
+ <md:SurName>Ropoša</md:SurName>
+ <md:EmailAddress>mailto:gorazd.roposa@um.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Danijel</md:GivenName>
+ <md:SurName>Rebolj</md:SurName>
+ <md:EmailAddress>mailto:danijel.rebolj@um.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Janez</md:GivenName>
+ <md:SurName>Brezovnik</md:SurName>
+ <md:EmailAddress>mailto:janez.brezovnik@um.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Albin</md:GivenName>
+ <md:SurName>Bregant</md:SurName>
+ <md:EmailAddress>mailto:albin.bregant@um.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Gorazd</md:GivenName>
+ <md:SurName>Ropoša</md:SurName>
+ <md:EmailAddress>mailto:gorazd.roposa@um.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Izidor</md:GivenName>
+ <md:SurName>Golob</md:SurName>
+ <md:EmailAddress>mailto:izidor.golob@um.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Eneko</md:GivenName>
+ <md:SurName>Anorga Irigoyen</md:SurName>
+ <md:EmailAddress>mailto:eneko.anorga@um.si</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.abcolstudents.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.abcolstudents.ac.uk-shibboleth.xml
index 1fe1c981..e027de15 100644
--- a/swamid-interfederations-2.0/idp.abcolstudents.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.abcolstudents.ac.uk-shibboleth.xml
@@ -94,7 +94,7 @@
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">North East Scotland College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">North East Scotland College</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">North East Scotland College OLD</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.abcol.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ee533f87
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.accross.ac.uk/shibboleth">
+ <!--
+ This is a Shibboleth IdP for Accrington and Rossendale College.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-22T16:16:19Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">accross.ac.uk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Accrington &amp; Rossendale College</mdui:DisplayName>
+ <mdui:Logo height="60" width="80">https://idp.accross.ac.uk/images/accross-logo-80x60.png</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://idp.accross.ac.uk/images/accross-logo-16x16.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVAMq0Vv+YzRX5vh1Y4Lz5r1/3SHdQMA0GCSqGSIb3DQEB
+ CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
+ MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEf3f2kDlcQudZo2BnnfZT
+ o+vRcMMqKaQUOZNtQD0iivKzOYrXPcDm+CMAEpN87i1RCFJy1M9QiQ8Mtxmz7vsI
+ bo+zvEag/AXcYeHw2MJ2dPosbcMAyvpACm+ggaiP8ztSDNHBoPlMO2G/CEVHDwSa
+ xR/sYYwY2hBsx7R0qj0YjjFOHN2oxOLl38ZhJRMysJlIY/u/e+/2ILn8PP/db7yW
+ pz3IBqa3ZMiLVuG5nor7fDi0H9197SUho0jxOfSa2w21Z3Zdrx63Ka/X62N1eLac
+ Ir8DCMGfZpteEU66nPic1M8Xzy1LPopRZfS/ZLBIav0wTXvTH7HDYaprV4fjVg2/
+ AgMBAAGjZTBjMB0GA1UdDgQWBBT3IpR0IYKNNbwPaxuzlDSfVa3rNjBCBgNVHREE
+ OzA5ghFpZHAuYWNjcm9zcy5hYy51a4YkaHR0cHM6Ly9pZHAuYWNjcm9zcy5hYy51
+ ay9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAbTKEBm/sKKxkxLAjL7LTx
+ qE9AVbOg/uvlmTL4pxbnThjx8fd2TgmfcRMBwP9LD+lVm/+pGL+g1Soh89B7cKlD
+ HQBfNfaO0fNonctx6BSm4guSCWHY36kJpGPpIEHGddDrodFKoUYr/O31xOlSY7Xf
+ ioOjA5atLkYpYe4x5hRnbqQqnYrHpbO8MQU+zMXjI08WOfYKuOKRdu1NlE65f8cI
+ tHR3hAmLNxQ4sbUmRJV6QzY9lbrEyI1fpwSFW0ly/RrvzaDSXeaCvfe8OzVcLubM
+ 4S3BP+CQStlZdm89skKfpQuf+o7uQWXoM1IYlPfkjUY2sTh6y4fl7HAjLXoLWDa5
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDKzCCAhOgAwIBAgIUL734gRp+xFc7syC52EK33icqG0wwDQYJKoZIhvcNAQEL
+ BQAwHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWswHhcNMTUxMDI3MTUxMTMw
+ WhcNMzUxMDI3MTQxMTMwWjAcMRowGAYDVQQDDBFpZHAuYWNjcm9zcy5hYy51azCC
+ ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKiskedri/4S0ZaAkzb04v4J
+ r4lZrQRE6Eva7bOHswGhr8OjOHOOFJEp8kQCj6ESQDevjWXNo8bIBKH2OV2cq0V8
+ CBzquhgLS037NWR1ay11YowkUxbSvv7LbVbqu3itrtciCtENmILDRWi+Al7tC0iY
+ jQ9UJH7A3L0vXagu+UWR9t7H5zkDzoMOaTETq+kU4Jz2vF5YiIEBMwpSnA0QibtV
+ XLUbKm5eyuxmIPD4Z+uYUpZi5vCssFh5Aanr8ZOIzAzywgFuQzY7bb76JY4NS5W2
+ W7uST4/DdcQbmDP337oj/wFieSPwhtGmozic0s+155NqN1NKvXB6O6keQaYDje0C
+ AwEAAaNlMGMwHQYDVR0OBBYEFG2PqgAQLBQ38kIwFP0AH2CMSnL1MEIGA1UdEQQ7
+ MDmCEWlkcC5hY2Nyb3NzLmFjLnVrhiRodHRwczovL2lkcC5hY2Nyb3NzLmFjLnVr
+ L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAD8z8ok3fxo9p6cQfkMNcFxN
+ g8iADZJoS5Mqdpfu/BR+s0Z0LFELHsAJux7DIWwxqMnY4pd4LpyhN5HZhSG8pCQw
+ zkDO1S1Bxew7VjM+FNpMonQduCZSQ7EZmvJ+zSrotdy1XfuNmn3PnPs9ku7MzJEq
+ SCodGjndUk+PMY7u6GAhkEUv0nS6gXSqJBe9sdq0Vt/Oe6O4Bp4sZa+arc+3U/QK
+ HH7m3nc5OkK4HzPj+3ttOdXsoM7prcEziHkXbO/yxUp0j3s2oLgqZWHOwEqzY0a+
+ IRRswVGPP8t4dQnVn8iyvb3Omzzk/tgM/VO4yfA+vG5ILv/moWR9ppjEaeHdj+Y=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVALHFYHDwuzoc1vC86QChN5nghZOFMA0GCSqGSIb3DQEB
+ CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
+ MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCob8/Gmg9U/DPhw8H9PXG1
+ mEyn+QNb3c33qcyIZXw/0UWs2HKZXCOF8QjXYgZW1zIhC9ibvLkbvdZbOmH1FJYL
+ nm4A1rORc5Ow5nOHkHdN56dwwgbaJsR1rTmuP3WGU6Pvua+Nqjbg4ndzRdUcwbWl
+ W8JAoGZrbLT0HddsS4nMYmRLYKlN6/Es3nICz2mCsdz36C0mNCYMwBXAoxGmOqaE
+ R68Z1lIZCD8ywzOYke8fBsMztyK8UXytKkz/CGDrJWhvOlsaoBdbpZqeCr0GFoTL
+ GJ1cKXD7Td+NMsAtRBh1Wxo5buyqTTxjddLayVAYgMwkjc3xVRPXP4n3qPYw/spv
+ AgMBAAGjZTBjMB0GA1UdDgQWBBQYskrYA5h5kOnt5tEJzmD1Sd3/OzBCBgNVHREE
+ OzA5ghFpZHAuYWNjcm9zcy5hYy51a4YkaHR0cHM6Ly9pZHAuYWNjcm9zcy5hYy51
+ ay9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBolSV/bXek2SBV8CgbLm0z
+ DuT+eMdm6f+qJ2FkosenPbM/0s68vxf3/ryr25n1RTggANdD5BZGUYDZzxAB9t9s
+ ZssCldB6LApXDZhUtnGbgnynlY8v2SrMvBGbDfS+A/3CMJ+VWZVQ348Dge7m03ty
+ yFhzTModCkKjDd5E9xHt9cSfImH6vYIWvenDdSUhQqf9SUXk44+mk7vuo4bykIhW
+ pI/E1tMBlsPPGnq2dJWNouCPVS8VeIrYX4mmdBp2pW7GY5QsUp+zjM7J8xSLLuiO
+ P2UJp9bK8uFepWiwmKCO4nroELlmRYJOpJebxeA8OI8dGguscbzpHCJLDQEJIp2G
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.accross.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.accross.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.accross.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.accross.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol:urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">accross.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVAMq0Vv+YzRX5vh1Y4Lz5r1/3SHdQMA0GCSqGSIb3DQEB
+ CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
+ MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEf3f2kDlcQudZo2BnnfZT
+ o+vRcMMqKaQUOZNtQD0iivKzOYrXPcDm+CMAEpN87i1RCFJy1M9QiQ8Mtxmz7vsI
+ bo+zvEag/AXcYeHw2MJ2dPosbcMAyvpACm+ggaiP8ztSDNHBoPlMO2G/CEVHDwSa
+ xR/sYYwY2hBsx7R0qj0YjjFOHN2oxOLl38ZhJRMysJlIY/u/e+/2ILn8PP/db7yW
+ pz3IBqa3ZMiLVuG5nor7fDi0H9197SUho0jxOfSa2w21Z3Zdrx63Ka/X62N1eLac
+ Ir8DCMGfZpteEU66nPic1M8Xzy1LPopRZfS/ZLBIav0wTXvTH7HDYaprV4fjVg2/
+ AgMBAAGjZTBjMB0GA1UdDgQWBBT3IpR0IYKNNbwPaxuzlDSfVa3rNjBCBgNVHREE
+ OzA5ghFpZHAuYWNjcm9zcy5hYy51a4YkaHR0cHM6Ly9pZHAuYWNjcm9zcy5hYy51
+ ay9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAbTKEBm/sKKxkxLAjL7LTx
+ qE9AVbOg/uvlmTL4pxbnThjx8fd2TgmfcRMBwP9LD+lVm/+pGL+g1Soh89B7cKlD
+ HQBfNfaO0fNonctx6BSm4guSCWHY36kJpGPpIEHGddDrodFKoUYr/O31xOlSY7Xf
+ ioOjA5atLkYpYe4x5hRnbqQqnYrHpbO8MQU+zMXjI08WOfYKuOKRdu1NlE65f8cI
+ tHR3hAmLNxQ4sbUmRJV6QzY9lbrEyI1fpwSFW0ly/RrvzaDSXeaCvfe8OzVcLubM
+ 4S3BP+CQStlZdm89skKfpQuf+o7uQWXoM1IYlPfkjUY2sTh6y4fl7HAjLXoLWDa5
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDKzCCAhOgAwIBAgIUL734gRp+xFc7syC52EK33icqG0wwDQYJKoZIhvcNAQEL
+ BQAwHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWswHhcNMTUxMDI3MTUxMTMw
+ WhcNMzUxMDI3MTQxMTMwWjAcMRowGAYDVQQDDBFpZHAuYWNjcm9zcy5hYy51azCC
+ ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKiskedri/4S0ZaAkzb04v4J
+ r4lZrQRE6Eva7bOHswGhr8OjOHOOFJEp8kQCj6ESQDevjWXNo8bIBKH2OV2cq0V8
+ CBzquhgLS037NWR1ay11YowkUxbSvv7LbVbqu3itrtciCtENmILDRWi+Al7tC0iY
+ jQ9UJH7A3L0vXagu+UWR9t7H5zkDzoMOaTETq+kU4Jz2vF5YiIEBMwpSnA0QibtV
+ XLUbKm5eyuxmIPD4Z+uYUpZi5vCssFh5Aanr8ZOIzAzywgFuQzY7bb76JY4NS5W2
+ W7uST4/DdcQbmDP337oj/wFieSPwhtGmozic0s+155NqN1NKvXB6O6keQaYDje0C
+ AwEAAaNlMGMwHQYDVR0OBBYEFG2PqgAQLBQ38kIwFP0AH2CMSnL1MEIGA1UdEQQ7
+ MDmCEWlkcC5hY2Nyb3NzLmFjLnVrhiRodHRwczovL2lkcC5hY2Nyb3NzLmFjLnVr
+ L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAD8z8ok3fxo9p6cQfkMNcFxN
+ g8iADZJoS5Mqdpfu/BR+s0Z0LFELHsAJux7DIWwxqMnY4pd4LpyhN5HZhSG8pCQw
+ zkDO1S1Bxew7VjM+FNpMonQduCZSQ7EZmvJ+zSrotdy1XfuNmn3PnPs9ku7MzJEq
+ SCodGjndUk+PMY7u6GAhkEUv0nS6gXSqJBe9sdq0Vt/Oe6O4Bp4sZa+arc+3U/QK
+ HH7m3nc5OkK4HzPj+3ttOdXsoM7prcEziHkXbO/yxUp0j3s2oLgqZWHOwEqzY0a+
+ IRRswVGPP8t4dQnVn8iyvb3Omzzk/tgM/VO4yfA+vG5ILv/moWR9ppjEaeHdj+Y=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVALHFYHDwuzoc1vC86QChN5nghZOFMA0GCSqGSIb3DQEB
+ CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
+ MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCob8/Gmg9U/DPhw8H9PXG1
+ mEyn+QNb3c33qcyIZXw/0UWs2HKZXCOF8QjXYgZW1zIhC9ibvLkbvdZbOmH1FJYL
+ nm4A1rORc5Ow5nOHkHdN56dwwgbaJsR1rTmuP3WGU6Pvua+Nqjbg4ndzRdUcwbWl
+ W8JAoGZrbLT0HddsS4nMYmRLYKlN6/Es3nICz2mCsdz36C0mNCYMwBXAoxGmOqaE
+ R68Z1lIZCD8ywzOYke8fBsMztyK8UXytKkz/CGDrJWhvOlsaoBdbpZqeCr0GFoTL
+ GJ1cKXD7Td+NMsAtRBh1Wxo5buyqTTxjddLayVAYgMwkjc3xVRPXP4n3qPYw/spv
+ AgMBAAGjZTBjMB0GA1UdDgQWBBQYskrYA5h5kOnt5tEJzmD1Sd3/OzBCBgNVHREE
+ OzA5ghFpZHAuYWNjcm9zcy5hYy51a4YkaHR0cHM6Ly9pZHAuYWNjcm9zcy5hYy51
+ ay9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBolSV/bXek2SBV8CgbLm0z
+ DuT+eMdm6f+qJ2FkosenPbM/0s68vxf3/ryr25n1RTggANdD5BZGUYDZzxAB9t9s
+ ZssCldB6LApXDZhUtnGbgnynlY8v2SrMvBGbDfS+A/3CMJ+VWZVQ348Dge7m03ty
+ yFhzTModCkKjDd5E9xHt9cSfImH6vYIWvenDdSUhQqf9SUXk44+mk7vuo4bykIhW
+ pI/E1tMBlsPPGnq2dJWNouCPVS8VeIrYX4mmdBp2pW7GY5QsUp+zjM7J8xSLLuiO
+ P2UJp9bK8uFepWiwmKCO4nroELlmRYJOpJebxeA8OI8dGguscbzpHCJLDQEJIp2G
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Accrington and Rossendale College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Accrington &amp; Rossendale College</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.accross.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Carol</GivenName>
+ <SurName>Visser</SurName>
+ <EmailAddress>mailto:cvisser@accross.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Mike</GivenName>
+ <SurName>Shipway</SurName>
+ <EmailAddress>mailto:mshipway@accross.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
index 8c6c7cb3..d54a51f0 100644
--- a/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
@@ -17,7 +17,7 @@
<mdui:DisplayName xml:lang="en">ACOnet staff</mdui:DisplayName>
<mdui:Description xml:lang="de">Identity Provider des ACOnet-Teams</mdui:Description>
<mdui:Description xml:lang="en">Identity Provider for ACOnet staff</mdui:Description>
- <mdui:Logo width="137" height="60">https://www.aco.net/fileadmin/aconet/Logos/Banner/137x60.gif</mdui:Logo>
+ <mdui:Logo width="137" height="60">https://idp.aco.net/logos/137x60.gif</mdui:Logo>
<mdui:Logo width="16" height="16">https://eduid.at/style/aconet16x16.gif</mdui:Logo>
<mdui:InformationURL xml:lang="de">http://www.aco.net/organisation.html</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.aco.net/organisation.html?L=1</mdui:InformationURL>
diff --git a/swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml
index 3118447b..6400cfac 100644
--- a/swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aegean.gr/idp/shibboleth">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
<mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
@@ -14,6 +9,21 @@
<md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aegean.gr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of the Aegean</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Αιγαίου</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.aegean.gr/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="el">http://www.aegean.gr/</mdui:InformationURL>
+ <mdui:Logo height="54" width="125">https://ype.aegean.gr/logo/mdui_aegean_logo_125x54.png</mdui:Logo>
+ <mdui:Logo height="64" width="65">https://ype.aegean.gr/logo/mdui_aegean_logo_65x64.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>admin.aegean.gr</mdui:DomainHint>
+ <mdui:DomainHint>noc.aegean.gr</mdui:DomainHint>
+ <mdui:IPHint>195.251.128.0/18</mdui:IPHint>
+ <mdui:IPHint>2001:648:2050::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:39.085161,26.568544</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml
index 18401bdc..a019d5b1 100644
--- a/swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml
@@ -11,6 +11,7 @@
<mdui:DisplayName xml:lang="ga">Institúid Teicneolaíochta Bhaile Átha Luain</mdui:DisplayName>
<mdui:InformationURL xml:lang="en">http://www.ait.ie/informationforcurrentstudents/</mdui:InformationURL>
<mdui:Logo height="73" width="211" xml:lang="en">https://edugate.heanet.ie/rr3/logos/ait.png</mdui:Logo>
+ <mdui:Logo height="73" width="211" xml:lang="en">data:image/png;base64,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</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:GeolocationHint>geo:53.4108177,-7.8923645</mdui:GeolocationHint>
diff --git a/swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..638a3a0b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ap-hm.fr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-10-23T17:04:52Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ap-hm.fr</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aphm.ap-hm.fr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/x-icon;base64,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</mdui:Logo>
+ <mdui:InformationURL xml:lang="fr">http://fr.ap-hm.fr/</mdui:InformationURL>
+ <mdui:Description xml:lang="en">French public hospital of Marseille</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Assistance Publique - Hôpitaux de Marseille</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Employés de l'Assistance Publique Hôpitaux de Marseille (AP-HM)</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDHDCCAgSgAwIBAgIVAOhqE6xG9Jim8D5otVZZ5i3uzRwKMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMMDGlkcC5hcC1obS5mcjAeFw0xNTEwMTUxMzU4NDZaFw0z
+NTEwMTUxMzU4NDZaMBcxFTATBgNVBAMMDGlkcC5hcC1obS5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIY+rUb89aEIChTwFLs99gcGQ5EtHJaulqox
+MSUiWmEXfCCBQKGFS1mAU+ZguVmKgO/6m9l0Yo1PtR5w8w0+RpA3MYoodWbLbYeX
+oZwjBpfUuExo33jVXLE/mfp5qIWkXx3U48znJaeBvSsE+V2zhobM1bgMcRCLTYOz
+BbyO+BjUeWO0RMw1iEy3T1sRXE/R73x7gYllpDmL7KSLg7HV5p7IGWyRicVtkzZd
+CBtt8mvvsYfRUcU+bSL0Ihjg6V34WG7WfvKNyxOkA/6hEB/2uV0VQpT+Y+YLJIgi
+eq8CUbZIuopfiUP/cRDuLfZHQX+zjGLG4zALWo4C5nEPgMH0PS8CAwEAAaNfMF0w
+HQYDVR0OBBYEFG9t3xe+StEVwDkJANyAvP/sZft8MDwGA1UdEQQ1MDOCDGlkcC5h
+cC1obS5mcoYjaHR0cHM6Ly9pZHAuYXAtaG0uZnIvaWRwL3NoaWJib2xldGgwDQYJ
+KoZIhvcNAQEFBQADggEBAGK9aEzoWXWZioZQ0977aE6liNJ7gtaNEvzJ/5nJ/l2R
+Ee/zTfDr7kZCtwSga+cJMONNM6DIh6yIceHo8iIQYARQJ8FbsZkr0wMUDqeSva4I
+dUzkSiFNLDl0G/pQHnpc9zjtVAkGGRxyF4FH4UQw5Dk2Mw6EJbQumh4YXaeZ2zrP
+fv3rQ2OiSWaCaqlaS3NZ5FrBQ3qak8qdgbEEJMfXZn5Sktz8x+HgaSw8VaJy/9eo
+1lDRwcJL6+TF26PhCgpxAuG57NVtKW/HFGtvKdQ5ViHJ/8KfSErtB4l9akt7cHYW
+dmh1bRX6hc+FqDavw7bMJS6CyMnsnGL6oVO75Q3H/Is=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ap-hm.fr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ap-hm.fr/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://fr.ap-hm.fr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>systunix@ap-hm.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..52adbbe6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aueb.gr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aueb.gr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Athens University of Economics and Business</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.aueb.gr/index_en.php</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="el">http://www.aueb.gr/</mdui:InformationURL>
+ <mdui:Logo width="83" height="83">https://idp.aueb.gr/logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>195.251.248.0/21</mdui:IPHint>
+ <mdui:IPHint>195.251.232.0/22</mdui:IPHint>
+ <mdui:IPHint>83.212.204.0/22</mdui:IPHint>
+ <mdui:DomainHint>aueb.gr</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:37.593870,23.435599</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEYzCCA0ugAwIBAgIQMkBM34MgBP6WOyvexdVHxDANBgkqhkiG9w0BAQUFADA2
+ MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+ U1NMIENBMB4XDTEzMDYxNzAwMDAwMFoXDTE2MDYxNjIzNTk1OVowOTEhMB8GA1UE
+ CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuYXVlYi5n
+ cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOfIC/gPjg+7dui8kUXs
+ aFkPywX/bAknzwhwr8Q1pq6L9tjSWXnJQm4K9MZCtOl6oKlFSb9/XjsD6V6cf+Yd
+ pf0U9Va7nDNDvGXhBLKoXF92s6qGQa3rFM6l4y0ReRsjMa8U5XTtDrgcR4XVcWp2
+ Z7Y19J6I4uhbjZpz1t4DaDWp3VEDH2czxVV4Iguqo8+g7ZbQNE0UKW8FNBUO6G+R
+ 3L4itrm6kxAqmATAEAzuLO5qcZz0qgCOnAI+darK+LYm7ea5Go9FU8iTRb5kTg2V
+ vEb56q3wK+pirgAM9CZFpruzLOJrLFkvMl5UIDwcr1X7URmkPn0K9hGayd29UZ4C
+ GE0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+ MB0GA1UdDgQWBBT/nu7O+ufwZ5Uguq8QAOFZvR/6wjAOBgNVHQ8BAf8EBAMCBaAw
+ DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
+ VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
+ K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+ KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+ b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+ LnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLmF1ZWIuZ3IwDQYJKoZIhvcNAQEF
+ BQADggEBAH0+NT4B1JPMraU0ddjLW9pHK1O26iPvhQ8kLPvy6xorXq69tgnkQfpW
+ r+AcASJHzvtBRvGJbE88YItIiXaX5MPkLlVx+VP8PqYpyG9FuHE6x40jbIgCVZh8
+ gvTWNIFj4CGP+RzGj++SqIaYiRDmjEwO6aBQWdt+9dAcSHwDepCKhiMOnxo3KjU/
+ EOL74P1xOJ8Yiata5m14tUtgH3sT4HMBLL+NOcA141SCOxATMDqA14J/YKH7qBmD
+ ra+kKyuWg+uN0sCITnS3SE0TkcHSgLPTUZmtEeDW30p2X/9VODp79ypkyPBIzQe5
+ 0Mzg/vjsooFHC3rLHgFtsJIKEBgHv+4=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aueb.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aueb.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aueb.gr/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aueb.gr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aueb.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aueb.gr/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aueb.gr</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEYzCCA0ugAwIBAgIQMkBM34MgBP6WOyvexdVHxDANBgkqhkiG9w0BAQUFADA2
+ MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+ U1NMIENBMB4XDTEzMDYxNzAwMDAwMFoXDTE2MDYxNjIzNTk1OVowOTEhMB8GA1UE
+ CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuYXVlYi5n
+ cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOfIC/gPjg+7dui8kUXs
+ aFkPywX/bAknzwhwr8Q1pq6L9tjSWXnJQm4K9MZCtOl6oKlFSb9/XjsD6V6cf+Yd
+ pf0U9Va7nDNDvGXhBLKoXF92s6qGQa3rFM6l4y0ReRsjMa8U5XTtDrgcR4XVcWp2
+ Z7Y19J6I4uhbjZpz1t4DaDWp3VEDH2czxVV4Iguqo8+g7ZbQNE0UKW8FNBUO6G+R
+ 3L4itrm6kxAqmATAEAzuLO5qcZz0qgCOnAI+darK+LYm7ea5Go9FU8iTRb5kTg2V
+ vEb56q3wK+pirgAM9CZFpruzLOJrLFkvMl5UIDwcr1X7URmkPn0K9hGayd29UZ4C
+ GE0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+ MB0GA1UdDgQWBBT/nu7O+ufwZ5Uguq8QAOFZvR/6wjAOBgNVHQ8BAf8EBAMCBaAw
+ DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
+ VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
+ K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+ KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+ b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+ LnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLmF1ZWIuZ3IwDQYJKoZIhvcNAQEF
+ BQADggEBAH0+NT4B1JPMraU0ddjLW9pHK1O26iPvhQ8kLPvy6xorXq69tgnkQfpW
+ r+AcASJHzvtBRvGJbE88YItIiXaX5MPkLlVx+VP8PqYpyG9FuHE6x40jbIgCVZh8
+ gvTWNIFj4CGP+RzGj++SqIaYiRDmjEwO6aBQWdt+9dAcSHwDepCKhiMOnxo3KjU/
+ EOL74P1xOJ8Yiata5m14tUtgH3sT4HMBLL+NOcA141SCOxATMDqA14J/YKH7qBmD
+ ra+kKyuWg+uN0sCITnS3SE0TkcHSgLPTUZmtEeDW30p2X/9VODp79ypkyPBIzQe5
+ 0Mzg/vjsooFHC3rLHgFtsJIKEBgHv+4=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aueb.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aueb.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Athens University of Economics and Business</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Athens University of Economics and Business</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.aueb.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.aueb.gr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Yiorgos</md:GivenName>
+ <md:SurName>Alexandris</md:SurName>
+ <md:EmailAddress>alexandr@aueb.gr</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>Athens University of Economics and Business</md:Company>
+ <md:EmailAddress>noc@aueb.gr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml
new file mode 100644
index 00000000..1556f6fc
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ayrcoll.ac.uk/entity">
+ <!--
+ This is an IdP (owned by Eduserv) for Ayrshire College.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ayrcoll.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
+ DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
+ BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
+ MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
+ cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
+ SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
+ ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
+ ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
+ c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
+ jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
+ 7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
+ udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
+ MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
+ hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
+ UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
+ fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
+ +zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
+ d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
+ 31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
+ 4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
+ NE4=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ayrcoll.ac.uk/c/ukfed"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ayrcoll.ac.uk/c/ukfed"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Eduserv</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Ayrshire College</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ayrshire.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Athens Helpdesk</GivenName>
+ <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Athens Helpdesk</GivenName>
+ <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml
new file mode 100644
index 00000000..5dca3bcd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bbmri-eric.eu/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-10-15T10:10:02Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://eduid.cz/uri/idp-group/other</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bbmri-eric.eu</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">BBMRI-ERIC</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">BBMRI-ERIC</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for BBMRI-ERIC</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider BBMRI-ERIC</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.bbmri-eric.eu/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://www.bbmri-eric.eu/</mdui:InformationURL>
+ <mdui:Logo height="176" width="531">https://idp.bbmri-eric.eu/idp/images/BBMRI-ERIC_3lines.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAItr4H0b26J+BZNSg6o1nw3b7SBZMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDc0
+M1oXDTM1MDkxNzEzNDc0M1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiUBpLbWqjyjRh/ga8bSYo
+6kV+GZm3QieBLmWY7eB2S4yNzAp2oA7bAq/3Gpqs7/+T2rRtDXbwQrOnCfVobevh
+ALWLZ3ZpY0WmGDJIQizXHFe4pv05BKVxXg1loBJxHyYC87YmZdKtar7gXcOGOG66
++fEWuUz0VRZc+hnamkguKYFg/45ZMs6neblBdeYc01qj18LdkGS/VRWoK2zCvqPI
+WW72/VJt2+SvnIMX0JIeeIJUz/zk3Ay1p/LP53IlhLaGY5k0vbN3G1K8vCbaV3Uv
+CfyEXRUfG4FxULQk48Iy30dJMdoV44BJqQnQvJErXko0523c9BQAe7VEnFX7ZF6p
+AgMBAAGjaTBnMB0GA1UdDgQWBBQr1SV/uokWTbctT6SrOjrSqBDaizBGBgNVHREE
+PzA9ghFpZHAuYmJtcmktZXJpYy5ldYYoaHR0cHM6Ly9pZHAuYmJtcmktZXJpYy5l
+dS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAQetx10CWgE5kitDC
+wVpIzugr7OUcyweNhXj42doeC7rFcoqc4ejUvJmq9sVxHLNTAktJ8+r/gr03MLEP
+ToLY1llky7TfJhKcZ/p8mfIurVXxQKlGlXbsiYWm4APDntUWi6OzRI9yslTBTI6d
+ZN5qf7OxYnXaRAhfxQT51DfpBdjUhxDGC2Z+VnTVYSmNItRxX24mW5LN6ik0ZEis
+Ls/XqOydBMvp9i4A5kYYXXCT/TMVoaTbPFOqq2F6yFVzuUeTtToB4aCBEnNqL+ps
+xovLThSc13PPlfcRv72JKYFcO6pabOeMJwwhQ/p5WMILbSl+sPlscEW0c+7oJXvz
+cnEwlw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVANM3aONpPS/BDOU54pnvNyySwvuOMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDcz
+N1oXDTM1MDkxNzEzNDczN1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHm/dRHIesayMcqVEcNvZZ
+KRaJH4ZbOwp9j+d9hqQcagnS9XV11UmqVxsES12M++h9NzfRZhWdU54TYVL+FqR8
+MU74L0q4IFKrXMwsGzXHbvFCdMBKYM0P04PkbH9E6b/yG/kpeSpFZoLPXCaB1omB
+qFLW/gCEhGUTt2XgsMLmtArI9aF05M45k99bMHJaDC3xGKztU7J8OmjfGT/nIEfz
+pfgI2kAlmZlXjSuWRdLlJjE5K1asTUK8SfqEAs3XiiXoBwa2ZDyWf78tq3Eop2Rv
+auYJV+rG07whtPNrU1KSJdfjq6eRfR6eGfY5i8nOGIJhYZyYzOeXboX+FAdqx2r1
+AgMBAAGjaTBnMB0GA1UdDgQWBBQZqO66zPnH8lTjRTAYWlXRK0djLzBGBgNVHREE
+PzA9ghFpZHAuYmJtcmktZXJpYy5ldYYoaHR0cHM6Ly9pZHAuYmJtcmktZXJpYy5l
+dS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAUY3QXtVsLwRMkm7m
+etZ6o8imeKTvMKs2u41mvrLl6YscRZf2CqRYTLdrd1i5SKpCaIynSBqXIED7QtlW
+ubcp85iTjgRMBR/KvzS3augBlGiPiNvsGBHUoMMixeDIRsArtHgM7s3STtor6suU
+SjaGOGvYOQg4olR947pzjB7E0eAGAzdfT8xHQkjysyeADPx/G/lUux1WfIcbA4BC
+NyXyU13Jj+eQlD4g/kNDlLG4cG0wg1RN9czgI6kKsI4Pn2qspOjzSwDHQ7bdcMRV
+0QbS/x2x/DAgBV0b1RKGTWHh+bokeB5IG3Il4pUs+4yVEihFgnzaQo96Pd5nOv+S
+p6gqsg==
+ </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>
+MIIDLzCCAhegAwIBAgIUdIWoF+CL+1dNJmpv1Np09b5b45kwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUwHhcNMTUwOTE3MTM0NzQx
+WhcNMzUwOTE3MTM0NzQxWjAcMRowGAYDVQQDDBFpZHAuYmJtcmktZXJpYy5ldTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnqshgMN56eFz2oUNtPd/hq
++BisHeX3mW1g8kLVgS6p5wNORZZ/7sHzKb6Yy3F3krUgNOwhcBO0uF9VBwVS06Fi
+Le1gh44CKnf4CJQdKaQEb848aDEbp9LKVnjyXGBXOQxQ9HfxedurXf70SYnzsGg3
+c8JURgJIisXU4bFUqyPCW+DnbCHzSjByyuOSHnM//aLIbDRYZfT1hVjg0MebYjmn
+oHu9rpe0KJ7abO2HTrfhjZpTQkRiAG+3Otv3Xp9E1OZ8LphtNs6786yH3ZLiEuKW
+y4NOa/a7+jR4ts3aNO73rNVH/36YTt41YPKahOg36b8HaJkTjCrxcC+gMGb2dCsC
+AwEAAaNpMGcwHQYDVR0OBBYEFOjpMeOkSkFRhwT3EHx7YEH3aCZ5MEYGA1UdEQQ/
+MD2CEWlkcC5iYm1yaS1lcmljLmV1hihodHRwczovL2lkcC5iYm1yaS1lcmljLmV1
+L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCOs7h7cyiemGVKdGYh
+4L1IYTQi3gDpC+5ajerQi3bPQrTrMvBK5b0XR5rvTFgkc2hfQOculd+yXcPCkBMP
+H39lVHIlekAV02m+RE9Lbh2mZTTD+q+ZW6kbMh6Wst0eQdiGMIomtvplTUScsh5j
+rjYOIEBK0y8pEICMChL1F05NX2cVxE1wkiwRbsanNm2kedRIYHHpODXLBk81oeKe
+BFQ09uQ7MqzlPcyRnkgJ4fjNqf8dnl6IACD1E7Qq3xbVfDD9UshJRIqiNe5O80jQ
+4EtMufd1/de2bNG37ttdxCSKrMevZJEh8lX+TmGZAUcYEZdhwfsOmC8njY5Qh+Xx
+Urzk
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bbmri-eric.eu/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bbmri-eric.eu</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAItr4H0b26J+BZNSg6o1nw3b7SBZMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDc0
+M1oXDTM1MDkxNzEzNDc0M1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiUBpLbWqjyjRh/ga8bSYo
+6kV+GZm3QieBLmWY7eB2S4yNzAp2oA7bAq/3Gpqs7/+T2rRtDXbwQrOnCfVobevh
+ALWLZ3ZpY0WmGDJIQizXHFe4pv05BKVxXg1loBJxHyYC87YmZdKtar7gXcOGOG66
++fEWuUz0VRZc+hnamkguKYFg/45ZMs6neblBdeYc01qj18LdkGS/VRWoK2zCvqPI
+WW72/VJt2+SvnIMX0JIeeIJUz/zk3Ay1p/LP53IlhLaGY5k0vbN3G1K8vCbaV3Uv
+CfyEXRUfG4FxULQk48Iy30dJMdoV44BJqQnQvJErXko0523c9BQAe7VEnFX7ZF6p
+AgMBAAGjaTBnMB0GA1UdDgQWBBQr1SV/uokWTbctT6SrOjrSqBDaizBGBgNVHREE
+PzA9ghFpZHAuYmJtcmktZXJpYy5ldYYoaHR0cHM6Ly9pZHAuYmJtcmktZXJpYy5l
+dS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAQetx10CWgE5kitDC
+wVpIzugr7OUcyweNhXj42doeC7rFcoqc4ejUvJmq9sVxHLNTAktJ8+r/gr03MLEP
+ToLY1llky7TfJhKcZ/p8mfIurVXxQKlGlXbsiYWm4APDntUWi6OzRI9yslTBTI6d
+ZN5qf7OxYnXaRAhfxQT51DfpBdjUhxDGC2Z+VnTVYSmNItRxX24mW5LN6ik0ZEis
+Ls/XqOydBMvp9i4A5kYYXXCT/TMVoaTbPFOqq2F6yFVzuUeTtToB4aCBEnNqL+ps
+xovLThSc13PPlfcRv72JKYFcO6pabOeMJwwhQ/p5WMILbSl+sPlscEW0c+7oJXvz
+cnEwlw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVANM3aONpPS/BDOU54pnvNyySwvuOMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDcz
+N1oXDTM1MDkxNzEzNDczN1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHm/dRHIesayMcqVEcNvZZ
+KRaJH4ZbOwp9j+d9hqQcagnS9XV11UmqVxsES12M++h9NzfRZhWdU54TYVL+FqR8
+MU74L0q4IFKrXMwsGzXHbvFCdMBKYM0P04PkbH9E6b/yG/kpeSpFZoLPXCaB1omB
+qFLW/gCEhGUTt2XgsMLmtArI9aF05M45k99bMHJaDC3xGKztU7J8OmjfGT/nIEfz
+pfgI2kAlmZlXjSuWRdLlJjE5K1asTUK8SfqEAs3XiiXoBwa2ZDyWf78tq3Eop2Rv
+auYJV+rG07whtPNrU1KSJdfjq6eRfR6eGfY5i8nOGIJhYZyYzOeXboX+FAdqx2r1
+AgMBAAGjaTBnMB0GA1UdDgQWBBQZqO66zPnH8lTjRTAYWlXRK0djLzBGBgNVHREE
+PzA9ghFpZHAuYmJtcmktZXJpYy5ldYYoaHR0cHM6Ly9pZHAuYmJtcmktZXJpYy5l
+dS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAUY3QXtVsLwRMkm7m
+etZ6o8imeKTvMKs2u41mvrLl6YscRZf2CqRYTLdrd1i5SKpCaIynSBqXIED7QtlW
+ubcp85iTjgRMBR/KvzS3augBlGiPiNvsGBHUoMMixeDIRsArtHgM7s3STtor6suU
+SjaGOGvYOQg4olR947pzjB7E0eAGAzdfT8xHQkjysyeADPx/G/lUux1WfIcbA4BC
+NyXyU13Jj+eQlD4g/kNDlLG4cG0wg1RN9czgI6kKsI4Pn2qspOjzSwDHQ7bdcMRV
+0QbS/x2x/DAgBV0b1RKGTWHh+bokeB5IG3Il4pUs+4yVEihFgnzaQo96Pd5nOv+S
+p6gqsg==
+ </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>
+MIIDLzCCAhegAwIBAgIUdIWoF+CL+1dNJmpv1Np09b5b45kwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUwHhcNMTUwOTE3MTM0NzQx
+WhcNMzUwOTE3MTM0NzQxWjAcMRowGAYDVQQDDBFpZHAuYmJtcmktZXJpYy5ldTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnqshgMN56eFz2oUNtPd/hq
++BisHeX3mW1g8kLVgS6p5wNORZZ/7sHzKb6Yy3F3krUgNOwhcBO0uF9VBwVS06Fi
+Le1gh44CKnf4CJQdKaQEb848aDEbp9LKVnjyXGBXOQxQ9HfxedurXf70SYnzsGg3
+c8JURgJIisXU4bFUqyPCW+DnbCHzSjByyuOSHnM//aLIbDRYZfT1hVjg0MebYjmn
+oHu9rpe0KJ7abO2HTrfhjZpTQkRiAG+3Otv3Xp9E1OZ8LphtNs6786yH3ZLiEuKW
+y4NOa/a7+jR4ts3aNO73rNVH/36YTt41YPKahOg36b8HaJkTjCrxcC+gMGb2dCsC
+AwEAAaNpMGcwHQYDVR0OBBYEFOjpMeOkSkFRhwT3EHx7YEH3aCZ5MEYGA1UdEQQ/
+MD2CEWlkcC5iYm1yaS1lcmljLmV1hihodHRwczovL2lkcC5iYm1yaS1lcmljLmV1
+L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCOs7h7cyiemGVKdGYh
+4L1IYTQi3gDpC+5ajerQi3bPQrTrMvBK5b0XR5rvTFgkc2hfQOculd+yXcPCkBMP
+H39lVHIlekAV02m+RE9Lbh2mZTTD+q+ZW6kbMh6Wst0eQdiGMIomtvplTUScsh5j
+rjYOIEBK0y8pEICMChL1F05NX2cVxE1wkiwRbsanNm2kedRIYHHpODXLBk81oeKe
+BFQ09uQ7MqzlPcyRnkgJ4fjNqf8dnl6IACD1E7Qq3xbVfDD9UshJRIqiNe5O80jQ
+4EtMufd1/de2bNG37ttdxCSKrMevZJEh8lX+TmGZAUcYEZdhwfsOmC8njY5Qh+Xx
+Urzk
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">BBMRI-ERIC</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">BBMRI-ERIC</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">BBMRI-ERIC</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">BBMRI-ERIC</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.bbmri-eric.eu/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Petr</md:GivenName>
+ <md:SurName>Holub</md:SurName>
+ <md:EmailAddress>petr.holub@bbmri-eric.eu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml
index 06e2abd5..a99b4564 100644
--- a/swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.braidense.it/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.braidense.it/simplesaml/saml2/idp/metadata.php">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-06-11T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml
index ee3cbec4..47d57e46 100644
--- a/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml
@@ -4,11 +4,6 @@
This is a Shibboleth IdP for Brunel University.
-->
<Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-23T11:55:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
@@ -16,7 +11,7 @@
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 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="en">Brunel University (New)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Brunel University</mdui:DisplayName>
<mdui:Description xml:lang="en">Brunel University identity provider</mdui:Description>
<mdui:Logo height="60" width="80">https://idp.brunel.ac.uk/logo/80x60.png</mdui:Logo>
<mdui:Logo height="16" width="16">https://idp.brunel.ac.uk/logo/16x16.png</mdui:Logo>
@@ -99,7 +94,7 @@
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">Brunel University</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Brunel University (New)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Brunel University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.brunel.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
index c308e901..0021971d 100644
--- a/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
<md:ContactPerson contactType="administrative">
<md:Company>Blekinge Institute of Technology- Personnel</md:Company>
<md:SurName>IT Helpdesk</md:SurName>
- <md:EmailAddress>ithelpdesk@bth.se</md:EmailAddress>
+ <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
<md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Blekinge Institute of Technology- Personnel</md:Company>
<md:SurName>IT Helpdesk</md:SurName>
- <md:EmailAddress>ithelpdesk@bth.se</md:EmailAddress>
+ <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
<md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Blekinge Institute of Technology- Personnel</md:Company>
<md:SurName>IT Helpdesk</md:SurName>
- <md:EmailAddress>ithelpdesk@bth.se</md:EmailAddress>
+ <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
<md:TelephoneNumber>+46 455 381500</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml
index 778740c9..248e52d6 100644
--- a/swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml
@@ -102,13 +102,13 @@
<OrganizationURL xml:lang="en">http://www.cadcol.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Kamran</GivenName>
- <SurName>Nasrullah</SurName>
- <EmailAddress>mailto:Kamran.nasrullah@cadcol.ac.uk</EmailAddress>
+ <GivenName>Naseer</GivenName>
+ <SurName>Iqbal</SurName>
+ <EmailAddress>mailto:Naseer.Iqbal@cadcol.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Kamran</GivenName>
- <SurName>Nasrullah</SurName>
- <EmailAddress>mailto:Kamran.nasrullah@cadcol.ac.uk</EmailAddress>
+ <GivenName>Naseer</GivenName>
+ <SurName>Iqbal</SurName>
+ <EmailAddress>mailto:Naseer.Iqbal@cadcol.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
index c5b07b53..f47ef07d 100644
--- a/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
@@ -349,10 +349,10 @@
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>Chalmers</md:Company>
- <md:EmailAddress>nrq@chalmers.se</md:EmailAddress>
+ <md:EmailAddress>mailto:nrq@chalmers.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Chalmers</md:Company>
- <md:EmailAddress>biorn@chalmers.se</md:EmailAddress>
+ <md:EmailAddress>mailto:biorn@chalmers.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml
index 952256ac..e1b33912 100644
--- a/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cnr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cnr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-06T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
index 727f86ba..66829c66 100644
--- a/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
@@ -1,90 +1,192 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.condorcet.be/idp/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.condorcet.be/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">condorcet.be</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">HEPH-Condorcet</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Students and Teachers from Haute-Ecole Provinciale de Hainaut-Condorcet</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">HEPH-Condorcet</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Etudiants et Enseignants de Haute-Ecole Provinciale de Hainaut-Condorcet</mdui:Description>
+ <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-condorcet-16x16.jpg</mdui:Logo>
+ <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-condorcet-291x88.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
+ <mdui:DomainHint>condorcet.be</mdui:DomainHint>
+ <mdui:GeolocationHint>50.41719089999999,4.448670300000003</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</md:Extensions>
- <md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIEmjCCA4KgAwIBAgIQDsq9gZQLUlBQpZUM30AfjTANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDExMjMwMDAwMDBaFw0xNzEyMDUyMzU5NTlaMD4xITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQaWRwLmNvbmRvcmNl
-dC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoaPpsKJBMsbjnR
-8J4kj4hqrCpAT6EIYwYe5gNTVWfYdDdN5fsqLGOsPek4wFtZKRB2PQ/7ymtqeyFi
-UxItaribFWejJUxvdgQvg/OPR0VRVUPgjJRDCRWi056YzTQA6JFSgPq0qBbg/MZp
-JGLWh+yoSZdo2pwEWUUseO51f6zpn7r8B5Ttiyf4qkXMFK8oBHBBYz3n5sx8oPHb
-qAFw3Gu20/L+Pvu1s58kz7rM2L2Ken3h6rXqyiaScSAYxr1sjPYfe+R8rYNFO2+O
-STwt3+nATalka67tQPJtf5Z9NHFK36/gTxdEVWSbuCU1Gk8a5dIx457L1+nLFvPT
-bTz0uwMCAwEAAaOCAWwwggFoMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw
-/ba9MB0GA1UdDgQWBBRu298TfoJotRm3ohTjLiftg1ne8zAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmww
-bAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVz
-dC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3Au
-dXNlcnRydXN0LmNvbTAbBgNVHREEFDASghBpZHAuY29uZG9yY2V0LmJlMA0GCSqG
-SIb3DQEBCwUAA4IBAQABnau5m7g3HpN7GVS5QEMKJbh89+rTeDZ49nbDBpOhV3QA
-dAaM3mIuYmZwaqvQGS3jocEl2Y+UefB5TVoEom7N2XiNYSI0h+ojrYnzusoeTju0
-3i8guDudOEjbE94fGl7j9G/G8hcrmFILkjv+B7f2MJ+lPl6aHh+hsh2iF1m9avvG
-Dhn1aNNn2m0LK4nqALPP0m3ryQCdzZPKPcB5DTPZgOwDQprkfFrHH3v1VKI46QUy
-wqLcG+m0nqfP2hJAMBXtfh6ffQvj65s/FxFb/ezzPqCsN9wcOGqtr0Y8x8VmBEVE
-PzOwLkJyCcoZRlNh8Y6dRl4UQvwXY6nCk1H9Lhkx
- </ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVALMBuiwacb0fss6ngQ0ewYTIrDGhMA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE5
+WhcNMzUxMjAzMjIzOTE5WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgvk9OnaDFkoCIOryGzIOF9Mq
+QL/TEkYPArKYUjj9wRZGeYgUcw2KOSr5EzSXBB64fDdxzhmwYBWligcvpCGxKwOJ
+iVpd7kvw01vK2DzhOm4FiDe8kUlxd554Yhq2EJE5wQzy/ny/KyF5nTegDZ8TkCua
+lpWPB0D+kRWf/xgFnpVJqTHBEpHVpw5DAqPufpAQWhZ9igzqWqrroCmrIv9+WQMb
+k79AbmYjJdKynjOGjc4UzrYkE7Hd3P8TOXCkr7sfC6qs8KsZveoJkZmvrXEe9njN
+uZtQH7oN7PuguCtStPnQMtPzyXWuC/BEQweGANyX3MagJsOM8rf+Kr1TTSacmwID
+AQABo2cwZTAdBgNVHQ4EFgQUg57FS35PSVovzamiYS9D38HM4JYwRAYDVR0RBD0w
+O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB0XKyy/ILdvSv1Y1acxGR0
+Cchq0uTo8w1dHc/cWskTkawb1o2IR/oogei4OM+lu1E9Ri6+2LRsQ54Wc69kdA26
+9XuG+o6RJ7UmUSnGkl08bpLNPed2Psrneb/7v8sn6G0zcpokhxLmFMMYKWmWAOW6
+SLy2w40fyTB8FxmO3/ZONg/rcz58I6JhVSanp6S/OaqjNGe+B4KSwmDS75suq0bS
+h3K1osgFBrZ3YK6BxS9ByhIBkmqOU0lF+upb529Mqeg29IkS7aNDZlxh/ZhP4JNE
+2UBsrhGATLxuAYrFlUQ+Vf+LLt/MNpRoQ1lnp5A5QDPHaksm6LOdxcCY8gNlk/kf
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAPBmR/6jQO37H6ozLvBQxojFpGugMA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
+WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmd+oyDtzupF9rGBLGW4MIHkx
+gR35uU3quBBNGvLLqq6fWDlDJMcwVbTUlseCyfrFhSMX+ptLdUbYAICydlIhIwCN
+cl1QUVg+wrkds6q2Ea698vTiwWIUMFWFo7xaz2TNUuSh2paiiETtIULEB2iQJ3a1
+H5FWI0Fp74HGek7cV2TCrG8yssELY0ilysUC/dFr6/iaxepiZehmnCysxXBsvuDR
+tyYNtcxbGi0BdRJ1IXegTofpAbaJDPp8D2gWlh+wA8mfqyc4svzOedwKJxGUAn+O
+yai0BVgnRAwh7kCg/vll/sS9S08aif1/ve+FnEECFJtJAOkuoKjVGAKCFPO9pQID
+AQABo2cwZTAdBgNVHQ4EFgQUrwNoXcSmCwJDz7YP5xx132nedmAwRAYDVR0RBD0w
+O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQApYNw6ZvbMVRsX7zTBvX+H
+zujWq+BytfDyCU5pGYeeyQItBb12ckOoHVCj1bLvDN4JZEXZjpO8xihlWgCSef4+
+YzDH4MBqxGurGB0hQ7UBb5UnXt2HguXL6IVOOjYIHtx6cqwJ4xOwLufdoFAY6KSH
+JKPMAY8gO2RTlBxQQ57bF7vgC1XxBgcynXCgsDr1UQWg9or9tXivzXR66wPpi1o7
+9fOjpyT43yy8NS6BxZLpbXJbLi2mDEthM3fyXkyi85LVHx+uwrhpy8MeGBhdqdiX
+aYNVyrYc5coxp6GPVBJv8YKHqNG3Dw9TqI4LTTyWcJA9Hwu/+qo6eh2nk5Ps9JVX
+ </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>
+MIIDLDCCAhSgAwIBAgIVAKzR+oWciVWzsTL99fnG6ihy4LtOMA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
+WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Xl9pWh2KY2ifAlxsox1IsSb
+cq9JclYprGeLU9RGynJbkA7F1+puwCuDa7/lHCYJpZDk6AmSxB0R02VpEE+CrQMt
+7xegealN2gEhRQWaEJ1H2bjWV6swVmo10AIkhmyUdKGBr+kChVYr0kq78JpRxEFA
+Z741/VOvamSVsYhXiUBaE/WnmUUCuJW/Bks+DbmNOF+W/vlQOgedL4Ox1Aj9gnCz
+sbSXpPjJcXv0aW9L7w03sJwE2M4kkWpp5DWdpXyVWjF8JvuFu8CHwTuSrJu8u0hZ
+eNRJt0c+G7JI+Hgr++8VnBdNbkprcCZQTK9NYyqCLW4J0XcaDkIJJCFJ8UmV0QID
+AQABo2cwZTAdBgNVHQ4EFgQUijIkcisJLNO4M/AZ/x1ZRzQjCIgwRAYDVR0RBD0w
+O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA2yyecgvrae2VNTaTyft2e
+nkXipQ6HnTCtKaJxDMlrUvUBobOWWklvd8O4hCTUL26nOIqN+X66AtRP01lwiOng
+/Xx22Vv86E37XD64oA6BOhgJVgOgelp+QzlTjdaw+1ryhCxCmkAbXIBH8yjVQ6Db
+2QZCPkNDkfPYWoldf/OUSreH9U3+PX6rY0ev/mzzZutxqMJHgEaA7IMqrR5PVzhU
+Qzo5DYd+FzazDipqCATv/67WjzZny4+/apNoKIrsh6zm/tOaeGx2h9TlLt+Rxqfd
+2KZ0zVbf8I3/d+fMjwQNaSKPKqQM4u+1Ji7o0czZdsegOS4V+m3NST/VR3mHpdcp
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.be/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be:8443/idp/profile/SAML2/SOAP/SLO"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.condorcet.be/idp/profile/Shibboleth/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.be/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be/idp/profile/SAML2/SOAP/ECP"/>
</md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">condorcet.be</shibmd:Scope>
</md:Extensions>
- <md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVALMBuiwacb0fss6ngQ0ewYTIrDGhMA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE5
+WhcNMzUxMjAzMjIzOTE5WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgvk9OnaDFkoCIOryGzIOF9Mq
+QL/TEkYPArKYUjj9wRZGeYgUcw2KOSr5EzSXBB64fDdxzhmwYBWligcvpCGxKwOJ
+iVpd7kvw01vK2DzhOm4FiDe8kUlxd554Yhq2EJE5wQzy/ny/KyF5nTegDZ8TkCua
+lpWPB0D+kRWf/xgFnpVJqTHBEpHVpw5DAqPufpAQWhZ9igzqWqrroCmrIv9+WQMb
+k79AbmYjJdKynjOGjc4UzrYkE7Hd3P8TOXCkr7sfC6qs8KsZveoJkZmvrXEe9njN
+uZtQH7oN7PuguCtStPnQMtPzyXWuC/BEQweGANyX3MagJsOM8rf+Kr1TTSacmwID
+AQABo2cwZTAdBgNVHQ4EFgQUg57FS35PSVovzamiYS9D38HM4JYwRAYDVR0RBD0w
+O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB0XKyy/ILdvSv1Y1acxGR0
+Cchq0uTo8w1dHc/cWskTkawb1o2IR/oogei4OM+lu1E9Ri6+2LRsQ54Wc69kdA26
+9XuG+o6RJ7UmUSnGkl08bpLNPed2Psrneb/7v8sn6G0zcpokhxLmFMMYKWmWAOW6
+SLy2w40fyTB8FxmO3/ZONg/rcz58I6JhVSanp6S/OaqjNGe+B4KSwmDS75suq0bS
+h3K1osgFBrZ3YK6BxS9ByhIBkmqOU0lF+upb529Mqeg29IkS7aNDZlxh/ZhP4JNE
+2UBsrhGATLxuAYrFlUQ+Vf+LLt/MNpRoQ1lnp5A5QDPHaksm6LOdxcCY8gNlk/kf
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAPBmR/6jQO37H6ozLvBQxojFpGugMA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
+WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmd+oyDtzupF9rGBLGW4MIHkx
+gR35uU3quBBNGvLLqq6fWDlDJMcwVbTUlseCyfrFhSMX+ptLdUbYAICydlIhIwCN
+cl1QUVg+wrkds6q2Ea698vTiwWIUMFWFo7xaz2TNUuSh2paiiETtIULEB2iQJ3a1
+H5FWI0Fp74HGek7cV2TCrG8yssELY0ilysUC/dFr6/iaxepiZehmnCysxXBsvuDR
+tyYNtcxbGi0BdRJ1IXegTofpAbaJDPp8D2gWlh+wA8mfqyc4svzOedwKJxGUAn+O
+yai0BVgnRAwh7kCg/vll/sS9S08aif1/ve+FnEECFJtJAOkuoKjVGAKCFPO9pQID
+AQABo2cwZTAdBgNVHQ4EFgQUrwNoXcSmCwJDz7YP5xx132nedmAwRAYDVR0RBD0w
+O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQApYNw6ZvbMVRsX7zTBvX+H
+zujWq+BytfDyCU5pGYeeyQItBb12ckOoHVCj1bLvDN4JZEXZjpO8xihlWgCSef4+
+YzDH4MBqxGurGB0hQ7UBb5UnXt2HguXL6IVOOjYIHtx6cqwJ4xOwLufdoFAY6KSH
+JKPMAY8gO2RTlBxQQ57bF7vgC1XxBgcynXCgsDr1UQWg9or9tXivzXR66wPpi1o7
+9fOjpyT43yy8NS6BxZLpbXJbLi2mDEthM3fyXkyi85LVHx+uwrhpy8MeGBhdqdiX
+aYNVyrYc5coxp6GPVBJv8YKHqNG3Dw9TqI4LTTyWcJA9Hwu/+qo6eh2nk5Ps9JVX
+ </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>
-MIIEmjCCA4KgAwIBAgIQDsq9gZQLUlBQpZUM30AfjTANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDExMjMwMDAwMDBaFw0xNzEyMDUyMzU5NTlaMD4xITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQaWRwLmNvbmRvcmNl
-dC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoaPpsKJBMsbjnR
-8J4kj4hqrCpAT6EIYwYe5gNTVWfYdDdN5fsqLGOsPek4wFtZKRB2PQ/7ymtqeyFi
-UxItaribFWejJUxvdgQvg/OPR0VRVUPgjJRDCRWi056YzTQA6JFSgPq0qBbg/MZp
-JGLWh+yoSZdo2pwEWUUseO51f6zpn7r8B5Ttiyf4qkXMFK8oBHBBYz3n5sx8oPHb
-qAFw3Gu20/L+Pvu1s58kz7rM2L2Ken3h6rXqyiaScSAYxr1sjPYfe+R8rYNFO2+O
-STwt3+nATalka67tQPJtf5Z9NHFK36/gTxdEVWSbuCU1Gk8a5dIx457L1+nLFvPT
-bTz0uwMCAwEAAaOCAWwwggFoMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw
-/ba9MB0GA1UdDgQWBBRu298TfoJotRm3ohTjLiftg1ne8zAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmww
-bAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVz
-dC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3Au
-dXNlcnRydXN0LmNvbTAbBgNVHREEFDASghBpZHAuY29uZG9yY2V0LmJlMA0GCSqG
-SIb3DQEBCwUAA4IBAQABnau5m7g3HpN7GVS5QEMKJbh89+rTeDZ49nbDBpOhV3QA
-dAaM3mIuYmZwaqvQGS3jocEl2Y+UefB5TVoEom7N2XiNYSI0h+ojrYnzusoeTju0
-3i8guDudOEjbE94fGl7j9G/G8hcrmFILkjv+B7f2MJ+lPl6aHh+hsh2iF1m9avvG
-Dhn1aNNn2m0LK4nqALPP0m3ryQCdzZPKPcB5DTPZgOwDQprkfFrHH3v1VKI46QUy
-wqLcG+m0nqfP2hJAMBXtfh6ffQvj65s/FxFb/ezzPqCsN9wcOGqtr0Y8x8VmBEVE
-PzOwLkJyCcoZRlNh8Y6dRl4UQvwXY6nCk1H9Lhkx
- </ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAKzR+oWciVWzsTL99fnG6ihy4LtOMA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
+WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Xl9pWh2KY2ifAlxsox1IsSb
+cq9JclYprGeLU9RGynJbkA7F1+puwCuDa7/lHCYJpZDk6AmSxB0R02VpEE+CrQMt
+7xegealN2gEhRQWaEJ1H2bjWV6swVmo10AIkhmyUdKGBr+kChVYr0kq78JpRxEFA
+Z741/VOvamSVsYhXiUBaE/WnmUUCuJW/Bks+DbmNOF+W/vlQOgedL4Ox1Aj9gnCz
+sbSXpPjJcXv0aW9L7w03sJwE2M4kkWpp5DWdpXyVWjF8JvuFu8CHwTuSrJu8u0hZ
+eNRJt0c+G7JI+Hgr++8VnBdNbkprcCZQTK9NYyqCLW4J0XcaDkIJJCFJ8UmV0QID
+AQABo2cwZTAdBgNVHQ4EFgQUijIkcisJLNO4M/AZ/x1ZRzQjCIgwRAYDVR0RBD0w
+O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA2yyecgvrae2VNTaTyft2e
+nkXipQ6HnTCtKaJxDMlrUvUBobOWWklvd8O4hCTUL26nOIqN+X66AtRP01lwiOng
+/Xx22Vv86E37XD64oA6BOhgJVgOgelp+QzlTjdaw+1ryhCxCmkAbXIBH8yjVQ6Db
+2QZCPkNDkfPYWoldf/OUSreH9U3+PX6rY0ev/mzzZutxqMJHgEaA7IMqrR5PVzhU
+Qzo5DYd+FzazDipqCATv/67WjzZny4+/apNoKIrsh6zm/tOaeGx2h9TlLt+Rxqfd
+2KZ0zVbf8I3/d+fMjwQNaSKPKqQM4u+1Ji7o0czZdsegOS4V+m3NST/VR3mHpdcp
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -94,13 +196,16 @@ PzOwLkJyCcoZRlNh8Y6dRl4UQvwXY6nCk1H9Lhkx
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">Haute Ecole Provinciale de Hainaut - Condorcet</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">High School from Province de Hainaut</md:OrganizationName>
+ <md:OrganizationName xml:lang="fr">Enseignement Superieur de la Province de Hainaut</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">HEPH-Condorcet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fr">HEPH-Condorcet</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.condorcet.be</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
<md:GivenName>Technical Support</md:GivenName>
<md:SurName>Technical Support</md:SurName>
<md:EmailAddress>webmaster@condorcet.be</md:EmailAddress>
+ <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
index 12255c96..55f2ca49 100644
--- a/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
@@ -19,30 +19,24 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEeDCCA2CgAwIBAgIQf+6eC3eoq8nlGO+mc54ogjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxODAwMDAwMFoXDTE1MTIxODIzNTk1OVowUTELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIERJSk9OMQwwCgYDVQQLEwNEU0kxGzAZ
-BgNVBAMTEmlkcC5jcm91cy1kaWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANyo4kf9llcPjqVcO+vxWaz3i1SkL+QC+CE3tgiUEb46hF2kQHad
-HtTmjHyk990C4cVRFoKq6+Gj2N5axkxRnHUptz0guu33kzk8JxUkWF1vnb5faKdL
-CFtZRHUElPoONAadyHJchqVfb2IfGEsiG60XP23WiCVKOq5c3CRsxSKXig48/PFl
-c4TAwkGuAKB7Y2m4fXcAN6LAMo4WxMRuHay4oDdfDfQe0QvH0B6ZkcI2NGfpddLF
-D8pane6HfZQtyqYkX3GDI6dU5TyjeRComWtbVoAvSfl/rrKwyeTGOnww3mPmf1ES
-LGJed6zMJdxYmqQM+DuqkApNFjBa2j8BEUECAwEAAaOCAWUwggFhMB8GA1UdIwQY
-MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQG26cWzC6R1jFe8Gh
-iGyDLnQTAzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6
-BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAuY3JvdXMt
-ZGlqb24uZnIwDQYJKoZIhvcNAQEFBQADggEBAIRuZDitOJc9Xi9K6yuHv2Om0lrD
-wKZvwNq1hGmyO0zy1+uohXCjkfV5P8fNSDPhFom6xGXqDjXO6+S7cvyt8AbBKgjV
-PmJPgCLN54b60fEONGWsbRPlfcrT7rvz0h5ArMRU5ZntA5Yc/YLEmI+o57AKraUp
-ZyADGtvD12IY6WL2zFdjMRwqgGTmpIdz7Ab+lt7rzDDhGUHBkXkCQZZhGQZbgaaR
-FgFdbxqMVJ71Vz+iUOHcHZNmXLC7HBNvh87IGqmSIJUc7lijeaoHUtVovANM8X2W
-rEJaVJ/XHu7r2/Ui5qEpkWkldy75/hdLiLj4Wr5oqPlgHZfwHNvNdy4DoQk=
+ MIIDMzCCAhugAwIBAgIUXZf8djanPtL+INJI961K5kFsBf8wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZyMB4XDTE1MDgyNDE0NTU1
+NFoXDTM1MDgyNDE0NTU1NFowHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArVfO+wFeSZeOHnc1JAYL
+4i3MQbeQkQElEuN1f+GikD8A9UWn39PHAv/3IivGLm27yngEasC74zQaPlk6BS2c
+gLksqzoBWMdjVkuPXiGEBSSDKaxRplzTsAPPVdkyBlEQFqoPAZS/+wg5g7yU3SuK
+0BKKGyP+Izfn+MBMBFRjMuwhzV2wLqFZsgZF1YZiCzlpuiFn09N2p182ha9zqian
+0RTH2Lsq/rNip0DzeaNG4gfuRBdOZwraw1uBfB0yvHd0oZRrzeQCByBBjdKrj2Qt
+sng4zx9gwU0ghHvQNgi8DY/Yne9u6LGrwWwuX2Qv461P/G8pj1ecQadoNGDJElSB
+WQIDAQABo2swaTAdBgNVHQ4EFgQU+keN+vwttrmrAqr4XoFcSMrJWKwwSAYDVR0R
+BEEwP4ISaWRwLmNyb3VzLWRpam9uLmZyhilodHRwczovL2lkcC5jcm91cy1kaWpv
+bi5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAeD2xGUMdtpXi
+f33R0MT8fLTpvjZx22SkqZpmgMPN1Mv36pevCqM3DQglu53mUcp7uowpNlxKINfV
+wKsLB31Uu3ADLKWWOU1Zhmqa8R2V05odXecAQgdcojS162TSkwzTeI43/Nc9zrtC
+iO5xMR3wznB/kfmVpTvbEY8dsjZryxWnVsuFh23EbZc3r/W4JfE4cvfUNBVOJm0l
+55m1tP45kBigy5No2O7YC+TzGy+b2rABfPL6D0eYQhhvfBw5WbDCAtW+DaAV0AuB
+T+zF8GLFgOT6h68tIL0eLGprCAKV1x0RF2y2hYQMlxMfVQCobgHEtJoEudpNj0kN
+AWeDYzsI0g==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -95,30 +89,24 @@ iTNj
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEeDCCA2CgAwIBAgIQf+6eC3eoq8nlGO+mc54ogjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxODAwMDAwMFoXDTE1MTIxODIzNTk1OVowUTELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIERJSk9OMQwwCgYDVQQLEwNEU0kxGzAZ
-BgNVBAMTEmlkcC5jcm91cy1kaWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANyo4kf9llcPjqVcO+vxWaz3i1SkL+QC+CE3tgiUEb46hF2kQHad
-HtTmjHyk990C4cVRFoKq6+Gj2N5axkxRnHUptz0guu33kzk8JxUkWF1vnb5faKdL
-CFtZRHUElPoONAadyHJchqVfb2IfGEsiG60XP23WiCVKOq5c3CRsxSKXig48/PFl
-c4TAwkGuAKB7Y2m4fXcAN6LAMo4WxMRuHay4oDdfDfQe0QvH0B6ZkcI2NGfpddLF
-D8pane6HfZQtyqYkX3GDI6dU5TyjeRComWtbVoAvSfl/rrKwyeTGOnww3mPmf1ES
-LGJed6zMJdxYmqQM+DuqkApNFjBa2j8BEUECAwEAAaOCAWUwggFhMB8GA1UdIwQY
-MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQG26cWzC6R1jFe8Gh
-iGyDLnQTAzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6
-BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAuY3JvdXMt
-ZGlqb24uZnIwDQYJKoZIhvcNAQEFBQADggEBAIRuZDitOJc9Xi9K6yuHv2Om0lrD
-wKZvwNq1hGmyO0zy1+uohXCjkfV5P8fNSDPhFom6xGXqDjXO6+S7cvyt8AbBKgjV
-PmJPgCLN54b60fEONGWsbRPlfcrT7rvz0h5ArMRU5ZntA5Yc/YLEmI+o57AKraUp
-ZyADGtvD12IY6WL2zFdjMRwqgGTmpIdz7Ab+lt7rzDDhGUHBkXkCQZZhGQZbgaaR
-FgFdbxqMVJ71Vz+iUOHcHZNmXLC7HBNvh87IGqmSIJUc7lijeaoHUtVovANM8X2W
-rEJaVJ/XHu7r2/Ui5qEpkWkldy75/hdLiLj4Wr5oqPlgHZfwHNvNdy4DoQk=
+ MIIDMzCCAhugAwIBAgIUXZf8djanPtL+INJI961K5kFsBf8wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZyMB4XDTE1MDgyNDE0NTU1
+NFoXDTM1MDgyNDE0NTU1NFowHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArVfO+wFeSZeOHnc1JAYL
+4i3MQbeQkQElEuN1f+GikD8A9UWn39PHAv/3IivGLm27yngEasC74zQaPlk6BS2c
+gLksqzoBWMdjVkuPXiGEBSSDKaxRplzTsAPPVdkyBlEQFqoPAZS/+wg5g7yU3SuK
+0BKKGyP+Izfn+MBMBFRjMuwhzV2wLqFZsgZF1YZiCzlpuiFn09N2p182ha9zqian
+0RTH2Lsq/rNip0DzeaNG4gfuRBdOZwraw1uBfB0yvHd0oZRrzeQCByBBjdKrj2Qt
+sng4zx9gwU0ghHvQNgi8DY/Yne9u6LGrwWwuX2Qv461P/G8pj1ecQadoNGDJElSB
+WQIDAQABo2swaTAdBgNVHQ4EFgQU+keN+vwttrmrAqr4XoFcSMrJWKwwSAYDVR0R
+BEEwP4ISaWRwLmNyb3VzLWRpam9uLmZyhilodHRwczovL2lkcC5jcm91cy1kaWpv
+bi5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAeD2xGUMdtpXi
+f33R0MT8fLTpvjZx22SkqZpmgMPN1Mv36pevCqM3DQglu53mUcp7uowpNlxKINfV
+wKsLB31Uu3ADLKWWOU1Zhmqa8R2V05odXecAQgdcojS162TSkwzTeI43/Nc9zrtC
+iO5xMR3wznB/kfmVpTvbEY8dsjZryxWnVsuFh23EbZc3r/W4JfE4cvfUNBVOJm0l
+55m1tP45kBigy5No2O7YC+TzGy+b2rABfPL6D0eYQhhvfBw5WbDCAtW+DaAV0AuB
+T+zF8GLFgOT6h68tIL0eLGprCAKV1x0RF2y2hYQMlxMfVQCobgHEtJoEudpNj0kN
+AWeDYzsI0g==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml
index 275bcb7d..48a3cb52 100644
--- a/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml
@@ -21,6 +21,31 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDKDCCAhCgAwIBAgIJAOjHz8Rlt5DLMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEmlkcC5jcm91cy1yZWltcy5mcjAeFw0xNTEyMjIwNTIwMjRaFw0xODEyMjEw
+NTIwMjRaMB0xGzAZBgNVBAMTEmlkcC5jcm91cy1yZWltcy5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAM3dwzfpnyEAOsmLeJZ8yxlrOAZv/1V6w4yR
+abxkwBF8o0++QUB1uyduzHrBQWcgDtMfhuY6/gIAeCXl6sX681l/9aqhvY3q7fe0
+zkx2NbpNHYGH95kN1oSg0mhCjoR2QA/jnuA+epuw0mgMiJXB22bvogqr6xtPORa8
+Obuvxbr9T5HhykgQCKBhl1qJ0Urehobfe7Py0ksJg/XpW57KQjv0QFhLEmhVRLle
+Hda54Yyrl/vMGVlpqkrFKuEw9hzk9OfVVMbGlamVkay35e8U0h2A0yQY5RxeC6S9
+oGiBICOgBQD4Ofxn3avCokUCsXiMPEG5u37tV0+6bWdvOITlWmECAwEAAaNrMGkw
+SAYDVR0RBEEwP4ISaWRwLmNyb3VzLXJlaW1zLmZyhilodHRwczovL2lkcC5jcm91
+cy1yZWltcy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU9QiwBg78Xxdav9h+
+hy5om5GJbPkwDQYJKoZIhvcNAQEFBQADggEBALAmbzYRQmKJMDVcqnrA8EUA7VpC
+g+MQ9Zv43NN24J2mfxZ+dp9P1a2YdsN//Ruukrf9+G/04BlQD8nnX5abCjnCxUKN
+THSRSEyhzGO+958eYuBCweB0h9hGzPATks0NsOxDIH6WMymVhE0HfkTmXN7Db8vU
+yme8Rjea2onN07ookIVgM+MbGVEL+eA+y0TGRk+/WR1wtN2cj/e+g9/GXvHcqQlP
+gXKNVq8c9yhEuK0mhtZ7n3AlCLrDQUKWetzGbaSvHFTNd/XYwYKc9lfVEu71II6a
+JRfS8xrL01pysyULxIGNBTU1zdajH4UHS3EqRRLKCm4gF5CU40pxLSEqm/E=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEajCCA1KgAwIBAgIQa6ko9Kashh39Z5Tcht03DzANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEzMDEwODAwMDAwMFoXDTE2MDEwODIzNTk1OVowQzELMAkGA1UE
@@ -49,32 +74,6 @@ LgLBAZ0NCQeidPwxsKvCoYW5xQKIBaqW2ZTmqAbG
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDMzCCAhugAwIBAgIUfRwORyarbfU3vwL5jzorKTWH+LcwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXJlaW1zLmZyMB4XDTEyMTIxOTE0MTE1
-NFoXDTMyMTIxOTE0MTE1NFowHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXJlaW1zLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApN9Hhsw5OxO8lOw7AvwU
-+LydZuDCjvPBDhz/UmxKWAjxd3nIgQP1BZAcjU8P2foyQP+dPd3BUqH5MZG/h2gH
-aa9sWo2bmloRyu4IyFsg8eGjU7rkvHXjBsd1UZyDgWTM3XcBd5KDbExrZq9eWLyU
-QRHI/NMo0J2mIICiwwn2d3vGDaGnGnc7pCgl66LedDn9gPl120dLJcsK729Xouey
-r4paGsUvd18Gbwbbcr9LKMXYWeeblq3GfZxlxeH5IQVUPISynAoJXWoN6Vep1eD3
-PQa0nYw8oYWNkxzSctZsu3lrgy9znxdWc2WDDHwkA1CXBaa//PKFDw9HkASBHDtA
-YQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuY3JvdXMtcmVpbXMuZnKGKWh0dHBz
-Oi8vaWRwLmNyb3VzLXJlaW1zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTa
-0GLFE02TA2lqS6qSiG+jPjYPgzANBgkqhkiG9w0BAQUFAAOCAQEAF3YzNTu819Lj
-4KCoIa8dN5Zm9v303F0cRTyYlhm/W0+N4nMxobAnRyCa9sLIOyS/Jojgnlw4tU9h
-s7F9orEeUqzJOdWs+XvLBfjt9R2XPqgIHq9JbgzQxyn8I06JcAYXVxm42N7IRlio
-e4+Xu18Ir16E9SYYzi1CqP5/WTX0+Cs0O7EV0n9a2ZpMMSkkrKMWrPjpnux55H39
-ROEeNsBCVGUrYwulnuAByJXiDjvggMTFuORtE9ZgFpvGM/2G76ZG7rDnEE/HDXAb
-0mHlwqsPy6FpFA2w23omABLBcKO/DGwyQVbxBA8lLf3RNgJGQf1bhj3l6srF2y1h
-iFgHP+HFiA==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-reims.fr/idp/profile/SAML2/POST/SSO"/>
diff --git a/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
index a441b15b..b52b96e8 100644
--- a/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cs.unicam.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cs.unicam.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-09T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml
index 4c4416da..0183d03c 100644
--- a/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csp.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csp.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-12-10T10:15:01Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml b/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml
index 262670af..8fff762b 100644
--- a/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csp.it/sp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csp.it/sp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-01-02T14:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..ed84e697
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cti.gr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cti.gr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">CTI "Diophantus"</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Computer Technology Institute and Press "Diophantus"</mdui:Description>
+ <mdui:DisplayName xml:lang="el">ΙΤΥΕ "Διόφαντος"</mdui:DisplayName>
+ <mdui:Description xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</mdui:Description>
+ <mdui:Logo height="71" width="87" xml:lang="en">https://idp.cti.gr/cti_en_logo_80x71.png</mdui:Logo>
+ <mdui:Logo height="71" width="87" xml:lang="el">https://idp.cti.gr/cti_en_logo_80x71.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>cti.gr</mdui:DomainHint>
+ <mdui:IPHint>150.140.0.0/17</mdui:IPHint>
+ <mdui:GeolocationHint>geo:38.291031,21.796414</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDFDCCAfygAwIBAgIVAPDB3O4Jt71/WaU2UiNReDy9dbsIMA0GCSqGSIb3DQEB
+ CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE5WhcNMzUx
+ MDI3MTcwNzE5WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEAtcmw8xHKAYVkFPvvb9wOelVxKiOj8UhmEadhBS5K
+ HKSW6yUDmRM1fSZRC4qYzwLlcCUVIxxjWHqaxJh+jmqFAl1HgkRfZfst1LlBfhFe
+ oPpIFg/8++WCDi97/9UA9R6QxslxDCfQO6Pm4AZbXJyd+ihWPW2UB2vmsrbM1cII
+ t49nFbjAF8XTiF+mYGtyxFCGnjNwLE/KeoBWmC1XebZDA2VjEBW43Q8cGmTgzfbh
+ +njsMVsDHFfx5DzPMUgdIvKW++EJCj/Sgi/xxI9Rtyd/wDClIcWocnOFQQ7a2Ego
+ N7LQmPp/WBKTDeZQ7xcT8hzU38Rys8o1aKnw10tpGbo88wIDAQABo1swWTAdBgNV
+ HQ4EFgQUa/1IvZV5VVEpl5dqjg+8VQZLxN0wOAYDVR0RBDEwL4IKaWRwLmN0aS5n
+ coYhaHR0cHM6Ly9pZHAuY3RpLmdyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+ CwUAA4IBAQCDj/Q4Y9wJ8Ao81kfngAPdCeVKhoiT9lFZeJRBUFZXwSvdZa76CXnb
+ RBcroGskxN+FdBCtXbnHFRWzY4NAiCItk41HHkf9sW1DeYoA2v11VFGdSCwMh4hq
+ AyI+5OnH4gG2GZa1A2U/IRDGryG/PejE3KJjc06UKtszSPsgCLIn8BWUvfVZoP4v
+ G85dA66o50DcG9OKY8l1QON6IcrsWVqlTaMSGYMu2tHsXeN7wZakHUz/jbhKqA/E
+ CKL20oxVcOZjco6xEjM6oaiHI4dDr9wO9lF3TA+DcWSdRrCprSPalVzVn8HmUhOc
+ K/B20docwc7tKIOQGaEpjo2lmbquG/ib
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDFDCCAfygAwIBAgIVAKCs+DufmEJRT/Iei5Y37ZP32r4sMA0GCSqGSIb3DQEB
+ CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE2WhcNMzUx
+ MDI3MTcwNzE2WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEA3/Sl3y8hjZ0PnfIyr/OnxNtJQaLdH3YbKnqJIc/r
+ /zgcYgOQp1abbZa+QEECx9KSSaQUzM+M1PS3k8SS/A7xRRXr2KaUyCMTEcZXeeEw
+ 0PG8++SbZcgYIqOEJl2w6AX7gy/RLiIalqlfJBFVe6677pigTi4QgSNFTelzx4Ul
+ mtlypAHXTLzTJUCarlxEQ61HdBvFg9tUuKDPKHGe8OJMsszfBkcw8FXNrnTAGLcy
+ T5moao+qw4BnPLL2TmxIbRYJ9TfTLmVXJ3/5/g0RWvJ+4/k6IxOoAlZPbHVFP0UQ
+ dNgcqDvI2GEgNnOWhqL/5R/Sk60VP+txj96U7fAhSUGTAwIDAQABo1swWTAdBgNV
+ HQ4EFgQU+p3GP2Ho/99FAqc0Zrf3RhityqIwOAYDVR0RBDEwL4IKaWRwLmN0aS5n
+ coYhaHR0cHM6Ly9pZHAuY3RpLmdyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+ CwUAA4IBAQAPtqj6FtNvluE3YnnwzAPdDF2/yUHpH+Z7y9o5YWyyhqGUevXh1sJ3
+ VWM9HHjGZvCSvBHFL9UwolQYuj59LT2InnwzDO2Hypl6uP805Fqz5yaFAzCLt1eI
+ +AMc8xozRUROqQbRm0/qJ+jIACWqcWkShBckqI6c0K6EZvBjmqi0cRuQMoq32fGJ
+ RxmX9FlIgBD/UBb9djP5GYZTqwF+SY/ZNrXGSdn9eNfQffLhvRj4Z4IaShG1E7xZ
+ aZOQwUGSYAxOQ1t5ECcLon8toelZ4gPCBd65HRt9DRiHH3llPX0bhTLgEWJoJGXD
+ 32KKXNIN34sD1e3mqloO1Xq0z6x8OgHD
+ </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>
+ MIIDEzCCAfugAwIBAgIUSKHnO5Jifa6uUWyYYBAzykF1pmcwDQYJKoZIhvcNAQEL
+ BQAwFTETMBEGA1UEAwwKaWRwLmN0aS5ncjAeFw0xNTEwMjcxODA3MThaFw0zNTEw
+ MjcxNzA3MThaMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwggEiMA0GCSqGSIb3DQEB
+ AQUAA4IBDwAwggEKAoIBAQCZAFgMwehKNSh+awk9loDhabToZbjuua3mShc7OW5k
+ 5nb4SpIOVwasJ54bY9UH1Y1+qS8Hd+xIUGGqs7U5ONRhRRqQ7CubqNoNF5zpKHbI
+ +sBNfelcwEc8FaxGMcwKuu53sMwIvdlWEU0/AiPjYOAZpqYtmggUPSnnlaxkYF7e
+ ctT8swrgJb0KotcyvxWmh2aB1YH01A0bb99acIo8Pjmj+0llABRGsZ5xxA8LgsoI
+ UziyMdbzPnfcuhGa7aJXFCs8InJj4aXu/QXATIfP12+8e2vPJltFSOL5XIWpXa3O
+ jKW7wUlWBqZxUO1d6j8jPJYFsjgDZCRnXw5oU0VsQkMDAgMBAAGjWzBZMB0GA1Ud
+ DgQWBBTACXTvIIdNP2fzze/sSnbZrsbiszA4BgNVHREEMTAvggppZHAuY3RpLmdy
+ hiFodHRwczovL2lkcC5jdGkuZ3IvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+ BQADggEBAF16I4lbJsZl6wtWs4E+C0e4td1FwsdNtOLKZ/C3ZYi3/2RWcVs3gfzJ
+ 76wu5AHrtcfYwRjuZkVD3sDQca579qF84js3wSvT27uxqZYU6WfGHwHGjkMoo/WR
+ 6ZTa6Aa58KRJTnAIAMCfY1Bbo76CFcAG8IZoRisJ7PATnvPvOD4RqVy2c7XmW5dn
+ lvItaLcyG46QbGp8OUnooTYGq6wlTU2LSEfJvt/1BeSS+VzFEF5+434+mFqjC320
+ laQD5tUeCkThxG23v8VCVdAFOwPnewoxqrD/Wyv6O7d/JF7nddS4f42XGxpQjReM
+ XKRoBZLikxPeZrLAGknFeSzOJHc13hU=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cti.gr/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cti.gr/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cti.gr/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cti.gr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cti.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cti.gr/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cti.gr</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDFDCCAfygAwIBAgIVAPDB3O4Jt71/WaU2UiNReDy9dbsIMA0GCSqGSIb3DQEB
+ CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE5WhcNMzUx
+ MDI3MTcwNzE5WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEAtcmw8xHKAYVkFPvvb9wOelVxKiOj8UhmEadhBS5K
+ HKSW6yUDmRM1fSZRC4qYzwLlcCUVIxxjWHqaxJh+jmqFAl1HgkRfZfst1LlBfhFe
+ oPpIFg/8++WCDi97/9UA9R6QxslxDCfQO6Pm4AZbXJyd+ihWPW2UB2vmsrbM1cII
+ t49nFbjAF8XTiF+mYGtyxFCGnjNwLE/KeoBWmC1XebZDA2VjEBW43Q8cGmTgzfbh
+ +njsMVsDHFfx5DzPMUgdIvKW++EJCj/Sgi/xxI9Rtyd/wDClIcWocnOFQQ7a2Ego
+ N7LQmPp/WBKTDeZQ7xcT8hzU38Rys8o1aKnw10tpGbo88wIDAQABo1swWTAdBgNV
+ HQ4EFgQUa/1IvZV5VVEpl5dqjg+8VQZLxN0wOAYDVR0RBDEwL4IKaWRwLmN0aS5n
+ coYhaHR0cHM6Ly9pZHAuY3RpLmdyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+ CwUAA4IBAQCDj/Q4Y9wJ8Ao81kfngAPdCeVKhoiT9lFZeJRBUFZXwSvdZa76CXnb
+ RBcroGskxN+FdBCtXbnHFRWzY4NAiCItk41HHkf9sW1DeYoA2v11VFGdSCwMh4hq
+ AyI+5OnH4gG2GZa1A2U/IRDGryG/PejE3KJjc06UKtszSPsgCLIn8BWUvfVZoP4v
+ G85dA66o50DcG9OKY8l1QON6IcrsWVqlTaMSGYMu2tHsXeN7wZakHUz/jbhKqA/E
+ CKL20oxVcOZjco6xEjM6oaiHI4dDr9wO9lF3TA+DcWSdRrCprSPalVzVn8HmUhOc
+ K/B20docwc7tKIOQGaEpjo2lmbquG/ib
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDFDCCAfygAwIBAgIVAKCs+DufmEJRT/Iei5Y37ZP32r4sMA0GCSqGSIb3DQEB
+ CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE2WhcNMzUx
+ MDI3MTcwNzE2WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEA3/Sl3y8hjZ0PnfIyr/OnxNtJQaLdH3YbKnqJIc/r
+ /zgcYgOQp1abbZa+QEECx9KSSaQUzM+M1PS3k8SS/A7xRRXr2KaUyCMTEcZXeeEw
+ 0PG8++SbZcgYIqOEJl2w6AX7gy/RLiIalqlfJBFVe6677pigTi4QgSNFTelzx4Ul
+ mtlypAHXTLzTJUCarlxEQ61HdBvFg9tUuKDPKHGe8OJMsszfBkcw8FXNrnTAGLcy
+ T5moao+qw4BnPLL2TmxIbRYJ9TfTLmVXJ3/5/g0RWvJ+4/k6IxOoAlZPbHVFP0UQ
+ dNgcqDvI2GEgNnOWhqL/5R/Sk60VP+txj96U7fAhSUGTAwIDAQABo1swWTAdBgNV
+ HQ4EFgQU+p3GP2Ho/99FAqc0Zrf3RhityqIwOAYDVR0RBDEwL4IKaWRwLmN0aS5n
+ coYhaHR0cHM6Ly9pZHAuY3RpLmdyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+ CwUAA4IBAQAPtqj6FtNvluE3YnnwzAPdDF2/yUHpH+Z7y9o5YWyyhqGUevXh1sJ3
+ VWM9HHjGZvCSvBHFL9UwolQYuj59LT2InnwzDO2Hypl6uP805Fqz5yaFAzCLt1eI
+ +AMc8xozRUROqQbRm0/qJ+jIACWqcWkShBckqI6c0K6EZvBjmqi0cRuQMoq32fGJ
+ RxmX9FlIgBD/UBb9djP5GYZTqwF+SY/ZNrXGSdn9eNfQffLhvRj4Z4IaShG1E7xZ
+ aZOQwUGSYAxOQ1t5ECcLon8toelZ4gPCBd65HRt9DRiHH3llPX0bhTLgEWJoJGXD
+ 32KKXNIN34sD1e3mqloO1Xq0z6x8OgHD
+ </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>
+ MIIDEzCCAfugAwIBAgIUSKHnO5Jifa6uUWyYYBAzykF1pmcwDQYJKoZIhvcNAQEL
+ BQAwFTETMBEGA1UEAwwKaWRwLmN0aS5ncjAeFw0xNTEwMjcxODA3MThaFw0zNTEw
+ MjcxNzA3MThaMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwggEiMA0GCSqGSIb3DQEB
+ AQUAA4IBDwAwggEKAoIBAQCZAFgMwehKNSh+awk9loDhabToZbjuua3mShc7OW5k
+ 5nb4SpIOVwasJ54bY9UH1Y1+qS8Hd+xIUGGqs7U5ONRhRRqQ7CubqNoNF5zpKHbI
+ +sBNfelcwEc8FaxGMcwKuu53sMwIvdlWEU0/AiPjYOAZpqYtmggUPSnnlaxkYF7e
+ ctT8swrgJb0KotcyvxWmh2aB1YH01A0bb99acIo8Pjmj+0llABRGsZ5xxA8LgsoI
+ UziyMdbzPnfcuhGa7aJXFCs8InJj4aXu/QXATIfP12+8e2vPJltFSOL5XIWpXa3O
+ jKW7wUlWBqZxUO1d6j8jPJYFsjgDZCRnXw5oU0VsQkMDAgMBAAGjWzBZMB0GA1Ud
+ DgQWBBTACXTvIIdNP2fzze/sSnbZrsbiszA4BgNVHREEMTAvggppZHAuY3RpLmdy
+ hiFodHRwczovL2lkcC5jdGkuZ3IvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+ BQADggEBAF16I4lbJsZl6wtWs4E+C0e4td1FwsdNtOLKZ/C3ZYi3/2RWcVs3gfzJ
+ 76wu5AHrtcfYwRjuZkVD3sDQca579qF84js3wSvT27uxqZYU6WfGHwHGjkMoo/WR
+ 6ZTa6Aa58KRJTnAIAMCfY1Bbo76CFcAG8IZoRisJ7PATnvPvOD4RqVy2c7XmW5dn
+ lvItaLcyG46QbGp8OUnooTYGq6wlTU2LSEfJvt/1BeSS+VzFEF5+434+mFqjC320
+ laQD5tUeCkThxG23v8VCVdAFOwPnewoxqrD/Wyv6O7d/JF7nddS4f42XGxpQjReM
+ XKRoBZLikxPeZrLAGknFeSzOJHc13hU=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cti.gr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cti.gr/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Computer Technology Institute and Press "Diophantus"</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Computer Technology Institute and Press "Diophantus"</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.cti.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.cti.gr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Giorgos</md:GivenName>
+ <md:SurName>Kokolakis</md:SurName>
+ <md:EmailAddress>kokolakis@cti.gr</md:EmailAddress>
+ <md:TelephoneNumber>+30-2610960319</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>CTI "Diophantus"</md:Company>
+ <md:EmailAddress>noc@cti.gr</md:EmailAddress>
+ <md:TelephoneNumber>+30-2610690300</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
index d6d8e05d..c10b2930 100644
--- a/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
@@ -5,7 +5,7 @@
<mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dias.ie</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml
index e05f5382..71d9ecf5 100644
--- a/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dir.garr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dir.garr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-30T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
index f3bbf1f7..bfbdd8ae 100644
--- a/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
@@ -11,6 +11,7 @@
<mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Bhaile Atha Cliath</mdui:DisplayName>
<mdui:InformationURL xml:lang="en">http://www.dit.ie</mdui:InformationURL>
<mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/dit.png</mdui:Logo>
+ <mdui:Logo height="124" width="124" xml:lang="en">data:image/png;base64,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</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:GeolocationHint>geo:53.3386922370051,-6.266900897026062</mdui:GeolocationHint>
diff --git a/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml
index d8d46443..705f219e 100644
--- a/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml
@@ -3,7 +3,7 @@
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-09T00:00:00Z"/>
</md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dkit.ie</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -11,9 +11,13 @@
<mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Dhún Dealgan</mdui:DisplayName>
<mdui:InformationURL xml:lang="en">http://www.dkit.ie</mdui:InformationURL>
<mdui:Logo height="98" width="155">https://edugate.heanet.ie/rr3/logos/dkit.png</mdui:Logo>
+ <mdui:Logo height="98" width="155" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJsAAABiCAYAAABH/KFdAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAAOxAAADsQBlSsOGwAAZfpJREFUeNrt/XeQZVt23gf+1j7u2sybPiszKyvL1/O2X3sH1w1PEoYUGQQZGgbJERWkRI3E4CgEhSZiGBOK0ZCEMDPBIEUqSEoASTTQBNDw3WhvXj//XlW98jYzK725/p5z9po/9jnn3qx+3WA30E1MhG5EVd28dfOcffZee5lvfWttUVW+t6/R+9nsZwMqR7+i2TdFEREUcR+IoiiiAiruvSiIYtWgCCIgKGl2K5EUAVAPVcUz7r6qBgsYDKiCpohYRATUoOqhYhEZgDSBGGwJtXXEBKRiUU3x3OhQCRAMimIlAbEY9ZAUVAwWQbOxegiSCgpYEjzPompAfUQAVff8RrKxK6ogKogoKgLinrWYLBH+NL/8/9gDeOeXUEjcQ+8l+zdbXpy4uf/JJ14km3wVTPaZtRZfPFSUJEkxxjhB8QyqMXG/jRITlkqI+oAHkrr7iceVt6+wvbWqFy48JdMzZZQYo6AYJwSeh5CialFVjPTQNAYiMCU0BWPcSK1KtpHck3jGRzXNfs997p7PglpUnIAJZmSOdGSu/v/jJd9TzZbLDuo0ycPzpOI+luyLmebKtZcTIkFVUDGgIOoEUQWQXCWK04ZWsBanNcQiqUGNQUVRTfDEYG3M2toVLl58SU+sLHDm9JPi+2OkSYpgMb5hZ2uDbueAyalJKrUxrI2x6QARQWQckTGQFGu7iAR4nsfB7hXeevOrOjP/uJw6/QKe8bA2AeNlkyBgwZih2Gj2fKgiRhFJ3efq/hIxYL1Me0s2T9nmE/lTL3bfW82WTyZkCssJFDIUvMwwul0v6oRJc5EbsRSqw0upIDoqlJlmsOCZ7P8xTkBRRGNEEsjM1/z8LIf7k3Ta6wziZfZ3dlhfv6N+ELN84owk8YC7t68rsixi2ty9fVlbB3sY6zN//DFZOPEE29vbbG1sUKvWWFicwvNaRP4hhl0V2iIS4hkD2Oz5DGoywdHcochdAMEpAZNNS4rTcuKmK9OIbg4yc+omhT/Nmu57bEYzwVLAGvfeuEnEkv2cCY5a9xFCZq9Q63a/ZOZT1Ga/GjgzynAxnYYkE1RBTHa/NAZa9Pu72LiNmhLlygwiIb32Hr3WXQ53mjoz5XPj9ptY7ejp5eelFgYYWrz+6ouaJH3e/6EflYuvfFVvvf0FTeItDjo+8/NnZO3eHV1fe52TJ+vimR7Sv0dr7xWqE2exaUi/06Jcq+OZMiIh1ioYDyuKquIj2EwIjQqighFBJc22W+z8STL/lFzw+D98tiOvfOPJyM8jjj+S6zXrviKgqsjDG1YyP8550ENNBhg1hSPt7KzFEtNt7hJEhigy7O3e58aVi1qOItbuPeDCI49LIB0CLyGMhMUTkzLobmineZ9afQbPs8AAtKvpoIWIxRhDpVqm29zm/tpFBskEjzz6PiYnytJqT3P39kuapDFBGHPptc/piUcS6TRVr759leff936ZnVsBLJ4REguGCMT5ZE4TS+FtgMme32buh9PqD3kOf4p1mnv9xzOjuadSaKvMV8m0lfNpTObaODuTb1yxgHioeNn77HoqThsKiOccbGs7tFvr3L/9prb21zj9yCnZ2d7UsfE6S8vPSRhc1Gs3vqonzy5QKxtsb19vrK6iMsB4IclgQLd7SH/QpTeIGBufptveo9tapz/oUR6fINGU7bv3aTYvUwnHMerRasbU6lNMHVuQ3Z19hX3d29tirBFi4xbraxepVKqEpXGicAwhQNXDZppsJMbJPA2DqKBG3TNaZz5zP+9Pv8fGkfDme/Aa8ddG1JtknpqKzUYkmZOv2e6VkQjNZBpgBC7JYQtSjCcM4hbbW1ex6T6t5ipXL39WG1OBJIMu+1s7qoMBa/fv4Ac+1ckJkSCkVKkjXo122wOZ4rBZYrzxCKVgnr29AdXGAqVoVh557MMyv/is3L51qGPjJ2Xl9LtlcekZqdfneeu113Vra4f9/SaqPn5QZ3NjX8u1KpUwYWfrFqfPnZHJ2ZPcvnFdNzfu6auvfk5b7W2EFKxg1GQug/M9PeMEzwmfC45GzUMhYlr89af29R/HjH6DIzuEMAo/LcOrCsgjm0dVmwUPw6DAYWEpadKn29ql017l7q1L+qBU5fiZJXlw/zUWj31Q3/XBHxejwtbdK7o6uMr9e5cxfsTxlSelXJkgHq8TRA1Ozi6BCTJH3MeYAKsinlH8wGNh+QRJHIsfCJ7xqVSVd7/7lNi0R1AqsbPzgLHGMWr1SHa372ulVKfZblKtlYhCw+H+OsuLi1Kql3j5pS/o6VOPMlY/7uZBUqeVPcEmAzQF8X03QzbzP3PfF7JNmbkbf8q12/fYjDL000ZwInVw5wiclvklWVAgObCrzolGHWbgpjfFMwNA6cctrr79NU3iLZaXZ7j8xhtMz6kuLc5z8/oV9g59DbTC4uJpeW7iJOs7+9TLU8zPHyMILZXKEkYijKmDBCOYXr413DgDz2A8CudcgHKtAiSoJkxPl5icWha0SxhOi2d6dLu7OjEdQpLyuc98Up946jxbO20WZheolBuA7wBlL2F//w6eFxEEAet3blEbbzA1u4Lnl7DWy2ZOsjkaQj1/2l/fe1B3BKPNAyjJosc8W2Cdx1/sVJsLnFF8k8EGpKA+qR2wvvYWh7sPdHJyXqLIY2vjAc88e0ZOnDmub736Mo8+8jR3VjfpHGww1jhBVJun7I8T1vp4XkDghyAJ4seAh+CRDSDz0CXzKx1gq+I0b0oRQGcQhgdq8L1y9qAp09PTIDG1QVtq1W1Cv8/c/CSVuvK1F1/kfe/+c9TKc2ADxPS4cvkz6kmTiclZWb+3p3dvX+PshScYi0tibY0gGMfzSm4KrRRQj3v9H9DH8HVkLvK0S7YzC6sgRZ4AzWLMPB2VDtjd36HT3mdyappypUbz4AGDfoIS4fllVk5ekPbhTb1y6ZIuLJ0VYVvL9dPy+DPPARbfa4CpAgFRFLibWlyayHhk6AmIzfbEaPic+44UuF8RzGS4mJFs4yCIeA7bk4AgjAjCKtDl6Xd9XFQPOX0u1qnZUyImQLXL+uoVbt++xpNPnZdyBW5ee5X5YyeZnpmS2zdfVaixtPycVKqlzIWgGJuqPqTdRkPUh96PIgDF++/+8n8HwjY6sm828G/xPnfqHb6K5DBb4YcdvUcRgYqSSornJXheitIhibt0DjYo+yWWzz8iiRVsvMnC0kmuX32bU6fnefyZBalPrOAHlcwz9LIcaZrd3ABDcBULw2W0IF72qKYYd+6wu3hX3Njz39AcmE2xkqJZXteIQSiDlqhWx7G2z1NPnZKoVAFRUtvi8tuv6PLKaeYXVrhz5UUdK4ecPPOYtJpdDnfXOXb8vJQiD2wKeJlGBdU8m5ANNbcKmSty5H0Gort/cnjoeyNw34GwHfW3huZmdODv9PnI+3yCGAGLMonTYeiFiDrQU5zjbIwyNl4njg+5dvnrOjlZoVwJ5PqVV7XdXicsVaXTOtRjSyfl3KPHiCrHKY/VQUqk1mBMPpt5Ij7PpzpcJU/dFZoVr1gcRhaz2DxkaSXcRsFmiy1kUaPJ/i/7nTR/ZkFMRLlSQyVBJUHEZ3Jqhp3tba5d6uqDe7c5ff4CAV3eevNL2k9bzC+dVKsqRsw3RKXkrghD2XGQiKJYsFkgkYHokoPo30PN9h3mRh/+HRn5aOSJ8/eZWRkGozryKzn0IYVZcvLnnF8HAaQYLwF6aNqh129y5+ZburV+g3Nnl0jSAbfv3CWsNjh27FE5tvAkSA0kABOgVgrhVazTPGoyraAYY0fStcZlG7J50SPgnhYaTjQTTjNCGMi0ts02lZgsd6upEzD1nDzKELZQEsCxTVqtDTbWLuvB7m18Uk6ePyM3L72sYSh45Qr9fo3l5Q/IxOxZwDBcuzxjMkR2i9nXkTeZ0EtmVjXfJPkvfJdffwwzWjwFRW7oYaLGiPA5n2JEJ2YqvQA9RoDdYsequGS4pqSDQ9Y3rrJ2/6ZONKaYP3ZcjG3prbevMru4wsrp58SEdRqTy+CNYaXk7mFzc5x7YBbwMiWbpbfUEYPITJ7VfAvkmbIEVDFiHlq7PNIZbrBCW2o+H5Z8ifPFtgompwnlAQgetdoc0YlI2lMzNA9X9fU33tJyUOLCo4/Ivbs3tN3awab7EO+CCRHPy5bQz65hsucd5o2VYcLewSNmyDjR/LvyjVmaPx3CdkSScCYom9zMRIyay/z7Tqvkq2SctrH51x0FyPk14mg6RjCeA2/Vpuzt3Kfbuq9R1CYe+JSCRRqNWTnca6r68xxbeh5LhDUhA3VemMEMc/wCGbEMq86RN6JYdMShd4lum8mPo/tYsLnetYUWLmQn19ojfDwZnSbJpyczZ9m9BeNulJED3GU8wmiGMKoSlsvS6gx0vD4mW1sdXVvb4uTpx+j393jzpT/QuYWT4lci7q3e1frYgiwvP47vVVzgkvtpuS+XU68Y0d5kwRnfG0H7DoXtmwnd6EuLRch4QMOZz6MnAZEskS4OabPghMAY1PbY31sliQ8IfI9Oa4t2a42pmTGOLSzL7sYacRpy9skfEE/qGNMAvOx2icuv5otajNOgAgaLpgMS7eMHNWf2rBu3ZniMp4LkIKp4WfTnNlYeEIjNtTIjJorMGS/4KyMQShYx5tpbcjZK9r0sBSVapVI6ztmzE9Lc3+L65Zc5NnuGMChx6+pbWi3XSXSPXtMQhRHlco3CrGbmVAsBH66W5IAw+tDKfW+k7U8I+hh1VPOPjv6c7aHCNwOwRpxmEYedoUqCxVfBk4RBd403X/+cTs8t8cijj8juzoDXv/55boxf1XptiZXTH5HxiQukNsVa5zQbAyJZ9sGmFCl6zcyMKJCSpB32du7hhWWmp0+BZ1HtO5aFRoj1nZuW58ARRAxW8uBmhH+Wae48/5E7pDmGmF/BeXt2GO3KkNs2dCsUaw2iVUK/QqVqWDnzlAhN1teva7VW5vzj5+XG1Rva3B/wyJMflrHJZRdcaR5dK2qk4EFLtoGEjKJEnokYff/dF7g/hrCNOqcZgp072bmPwHCyj1DZdMSlGV2OjPXh0gYe9bF5ZudOsPHgJmM11bPnHhdfIm23Umbnn5B64wRWTaEtnHbQTEBy85Fm9/GK5RYBz/dI4gFXLn5ZFxdeZnllSYLqBJ5MAjWQCJuGhZcnYvGKoMeiGGxu9osxZ0KTSxoyEmCM6pPhdVCv+NlK5t+JAA6eiUp15hbPsbN5i367z9RMyPr9G7qztcH84lk80yfubhCWpoAyilfcs0jPC5giv5z/j47w40Yj8+/e6zuIRh8OEHJQcXQaMypgEaKPujBaLKDNzIlHJqA6yFg2gtoUbEKS7HHr1lf0zo1XGR8/xsrp52Vi8gTGn8CYMnbULwOwFjWpm2CMy0aQ8fvFZLrVESe7nW3eevnX9P7VTzE120BK86g/w+LS45w4+awEwRyxeqgaN8YM2xhx+bOgJ6f+DLVgQRpQKTbS0L2AUY2LcdcoCKKMsJA1Rowy6B/QOrjD3Tsv6tbGfVbOPsm584/LpVde0v3dFo89+xEZn1rB2hBMwJCoMEKll5xBko9waGW+F+muPwGc7aggao6RMfK1kbfFrtNh9Gk8Q7dzwI3LX9Aw7HPqwrPiB3MoEUE0x8kz7xPPVHV76xDMNEHpWFbckt1zxNcSL59R43wxBcQrxlNEiuJTKk9yYmVF7l7q6P1b28wt1/FLIVff/EP2N+7rucc/IPWJk8RUseoh6mGw+J4CAyDO/iRDaAQDBEAIRA5+yTh2eWDBCGSRa7yChpDhfY40akADVC1BOMbU/KO0ez2ZnFrQqckxufbWq7q9vUW1Xmdr422N04FMTJ3Fw882/Agel0fjmo8x9zdHA7o/tWZ0KHg5xqNZ7rDwgUfGryPwSL7fTJ5ItmA0RqTJ2v03aLc39NTZD8n41BnAJwhmOXHqQ7Jw3OIHYZ62H5ovcD5fTr4Ujxy0G0k0jewRNwJjAsYn5llavkCz2+bE6aeoVOqsr97i9tWv4JuePvLMj4lfWQHIqrIsyaBJa3+d1uEG3d6u9gdNLDGe5xGGVcJonEppWqq1OUrVKYxXdiYt124iTtMWY3IMFsS6/GoWPFjrghPEOIxOUxaOv8Cgc1fuXPuibm6sc/bx5wRJuHPtknp+RSenzghHgqLR0Cw39zhBzH3F75EZ/faFreBbD98PEetMnoqswTAqHUZhI2Cjc9nBKlFU5uS5x8QLmrq5tsHbb3xRj69sytzCSYw3iefVHBQiNtMSIzhfPhxLAV+Iul18NEltsk0gWfZc8aMZJo89Quf+HSSoUxo7Lucbi+xvb+nqrZeYW3qEYyeWQdp029dYu3tDNx5skPYH+J6HSozSRUnwPIMxIUbKCHdVibDiU65UaYw3ZGJyknJ9HM+rIGYCKA9dN6NZgOC0ztBLcVrPwYUevheiMoH6c5y+MI3vx9y4fl2D0gQT0ycFUybFK3zYwnoXmnU0eBkRxj+V0Mc3Slb+H0d+zH2DURkFRnKfjpWbeesk1qPdVcYmj8vM3Am21jf09o0XtXlwn6WT75fqeAObpkd8IxEzAqvkEMtRRNzd1iKjH2SmVBGMX6c8cYrm5Zu0mx2On1rA98pMTM5w88pF2s37CoeyvvoWt97+PW0fbuOF44xNLtMYm8MPDOgAxeIJpClo6pGq0up2aLd3sIcJcdfTnU0fKwH1sXkmp85JbXyZwC/heV6mbBVNh8CwkSx2laE3l9iUqDzFuUc+Kpsbr3Lt6hc1CmucOvseGZs8hUhYBC2a5lGvOFOeG9cCxM2pW8L3Amz74+FsI5qqcHaHEkUBlGqWQSgEAoykxIMm3W6LMBojKrlIamevqTPTVTl+aklarV09bPbAK41mW4bApI4ayfzathAk8uBg5DsipnBTFMUQMTa+JL5f0wf3b3Hq/FMEtVkGg5RyqUK90mPtzmf1tZdexPMSlpbOEJaqSNggCsvOYKmPweB5gYgEGBMigceYJqRpj3TQVk1jDpsdWs0OzYNdOq031MolauNjLMwtil9q4Ad1fG/SAc9Z7jKvRTCFhnKm1QtqxGmdyZlHOL50Wqr1ZUQ8UtvGJgkiAWIi56+Kce5gkSZUVMzQffweobrfgRkdru0QIc+C+rwWtAB0hy6VKRRL5nGJJU07tJobhL0WSb9C4KUYSbl1/ZJGYUQQjjG/8IxUKnPY1F3IheqS5SYZaizJcpAA4hWm1mmIPGVjgT7gakLzKK1SPcax42fY27wBtkW72WF3Z52ZhRXS+JC3Xv06njfPE8/+qESBz8HeA+3HKYYe5bAEJhJPSoiJ8L0IPJ84TUniPuJHRNUJiYKA8pgyi+BJysHemu7srtFr7XEv3tIkrTI5sSyNqZMEQQ3fL2GyGlNr86ArG7EqWGF+7hxiliUIDYKh295iZ+se8aDH+MQ0E1OLIBFxInhEDiwf2XrfEpf/Lry+s0R8YQpHtVumWTJnc0hXppgoJEU1cWkjLEncY9DrEPebPFi/rulgl7F6wF6zRbsnLC4+IgtLTxCEDZKUApA0OiwIkRybE4urrzQIvhM2sQ7kJWYw2KHb3aTffUA86Kio4vuRlGszlCozHB7s0TncYmauzJ0bX9arr7/M2QuPsbv1gHary1Pv+1mZnHuGTquL5/Vpt9dpNde1EpZRqgJlPK9EGJZQY4iTAaqWUqlCWKqSpCmDvgUTEAUg2gGTYJMem5s72mpBFESIZ4lKkUxNLxNF484HND4OPHTCJyIut28EJEGkQ7u5xs2rb2mn02Z2foZKLRIv8Bj0lCSpMjt3gVJpzLkihiygytwRzcmho17cUGEcjVS/cy34nZvRUYdf1aWeYKhtiv+WoTCiriBlENNq7uN5IaVSFaRFtQat7Tb7m328ygynzzwhUzOnMKZMai1qRhznLNE86tRqNibJ2yGIYkxKkuyxv32PBw+u6mHzHv3eJpoO3AawRoNwnMnpkyyfeU4aJx5j894X9Nqbn2FiZhbPj2g1laXTzzCzcAGlQbU+jTE94kGHJF6jGfcplxt4fpkgLOP5Hv1kgAj4QYQq9Np9kJBqeQLxQ1dbYEsEvof6yuLxU6KU6LZ32d29grVNPdi/LyL7VGsT1GuTiFcePmseOOQZDgm4e+ttXb1/lQtPPCMLi3OsrV7Vu5evIVJidu4xJPM5HFHlqHAN8wnvJGT5z98M7vquCdvRENkN0owkexkR/JGItYA6XTonSRJazT2MWFr7HQaDDa3WAhk/dY7tBwe6d9BHMPh+RJrkvS7MEVPCCB06E+Oh6waISWjuX2H19ku6u7VBahMsyvjUeQK/jKoh7nU43L7PzbdfIhl0dOnUObl76+s8WL3E8VMrxASY8iRjU8cRU0EIwYSoFfzSFI2p85LEFmOqeCbCWqXd6aAmoVIpE5bqCB6DrqDqEw8Uz8YEYYhkcEgSJ/iehx+UiKIy1VodkZ40D1v0By6AsqR4oo7rWTxkmm0sA5RINaBSH6dcNmysXtGtB2tEYYOJ6VMcO/aoBGEZqxZMXnNqHpKfd7Jwo/7SH//1bQpbkZwhT4YUKRjNqbcPAWwjqV/NyHx+4FOtVUh6W8T9Le11Ntje7mitvkBjYlnqUyVqYw2cWfQwSDbRORI+zFqMCpyrB0iBHlsbb3Pt0u/qoLNJY3yKSnWGMJpl/sQzgj8Nqqgd0Gvf5v6tr+ravauksq+q2/heDyMGLxqjPdjj4LDHQhqTpF36/TZqB+zuNAnCMWbnTpCjWGnSod3ZxWqXJFUGzTaV8gTl2jhGQgb9DmhKEsf4njOPfugj5NkUnzCaRFDGJxLUWsQkFP0ZsgcVowUkkqfgTp5+WpC+3rr2hkZhSqVSY2LqnExMP0qpNIVm0eg7KaZ8fb7RjDLyszAUvu+VGS3up8NdNtK/o1C4OayB241OI7rbhYFHrdbnoL+OMTET0/N4rT47m7sYIj1x+lkpVWawWV2AqEvSD/lwecW4HZpPzae9w8b6K7z9xmdUSJhbWqHs+8RJQCmqSZCAVwrACwEoV8pEpZq0m31tN7eplTw8H/pxwuLssty6vqPbDx7QO9PksNVh9e59nZmdkkq1BtbHMwHihWAVzw/wwzKqA+K4S6/bp98doPEBUa1BqVJF05QkSRDr/C9jvAyMzhhHGQ5ovBDxFcFzlCvr3IgiA5LjcUBqoVpbZHb6nPi2o57X5LC5w0Z8SRUr4xNnKZcXEVPKwA+G2ZQ8updvpcUeNlvfmQ/37ZvRXJ9poWdGBjQyAMGxEHITKk444jjBGCEIItLUcv/eOkFUZXJqjjBs4YceUamKEmWQ76i/kNvIo6xfAYy4SPPB2ltcev23tFb1mTl2gX67hxeExBgOD7dVKEnDCwgrE4gJUSKiygnml5+TbuuSJt0NVJXWwSFRWOHxJ56XZNBT3ysReJb6WEXq9Rr18RlsKlgSfAky38lgJEQJ8P0aUZgQ91qkgwHdTouoXCfwfYKwPJyrDFFVGcJIJo+cLc6RR46ocLd5zbA3G4JVZWruJCI9Wbv9NfXEEEYxDx68oa12zImT01KKSqT2G/PaD6/xOwubg5GOahz4drTct29G8+5BStYqIfNSRyReyPGtAh5HjGEwaLK/u4YYqNVrVOpTLCxfkE5rX7cePAAT0Jg8KWLqpDqqthlC3iPNLfLWUa6lX4+tzUtcevPTWq6Mc/zkOQ522jTGpsAbcLizzlh9mo39exrUGhJVasRxCp7zn2aPP0Z/P5Ubb76oHobD3XUO9zd04cS7RdOqGL/MuC/UxxbwfeMiRA/X2y3eJ00TxBiisIwQYa1gTEhUHkMjSz+J6fZ6SLlC4HuMckDywOfh4ij3sRSPn6f8nOXIrYZrOCOa4nkB/YHS73msnLyAqaRceutN4nif5RPZxa3LT0vusuUEy0L2vlmThIe12bf/+o7MaO57ObjBjqQ7RrILGcZVYHEZq8NInyRNWL+/Sa/T1MmpqszMz0ulViUqzTA2fpzU+plvMgwtjgwgu75j3FowCft793j74uc19CwnzzwrB3tNnWjMihca7t9d07GJGQ7bTWZmlmm1tohKZbZ2D5meW6AcjROFZbQ8zWAQ4anH7tYttjcvMbv4DGJmSFMf3wOVlDR11feqMe3ONtvbD4gHfa3WajI5OU+lMg0EWEJnZo0SGi8DWAXIq65GX+ZIxuXoc2d5ZxlxW2So7aXQOAnj45Mc1OfpdJT5xqScPf2EJnZa1FrXkFByyviI4Iy4Re+sp/5kfLjvCPoYAoLOdxDJU+v5oHNhcBNkMjXv+xUmppewaYxhi05rjxtX31Klzcz0PBMrpyUI6lj1saLDCZeRx80rhsQxbj2T0Ove5+bVL2u/2+PRJ56TdJBqFAZE1TI3r76tM8dWaHa7zC3OCYmSJC1dvXMZvAp2UJLNzeuUatPUxmaoTyzjSYQdbPPg3tdYOvE0np/Q6yYEfoKNB6SJEqcpnUGXXq+jglKrVkVsizs3X9Sp6SWZnX8SQ5RlTyyIEoT+SIpcR5Yosw5ZzcWIWhsuqJijmi/XdGSRJYpNhVp9jhNnrXTb90kUxidmZW+3w+aDS8wdO0+5MpZlIkxhLPLa2EL8CsRBH/LnRgXt4fd/9OvbbiwzJEfmaXSXDikokIJLlmcpEdWsgEQF40ekqU+z2SQoKStnj8vZx87K/Pw0pSjKAggv832yBiuS9fIg66PrypMcuGtS0EM2Vl/X7c3rnDz3JOXKHK3DNuMTE7K+elfn5xcJo3EplyelUZ9nd7eptfEJ6bQ7zC8sy6DXY2P9thpPCcJxFlaekamFRwmiiNU7r7J+7+taipqkyQ73713WdnNdk96WDrrrWqvEHFtoyNLilFRDJW7vab+zzd7uPQU77AyZ0d7JGMn55sxFyWHheeNDChNZLGixmfNSQEvRS7hIx/moBkCJ2vgMrU5Xv/ilL+itm1e1HCV4ZkcP9m8TD7oZXT7NAqzcLcmS9To02cP3I2P5Y+Bt33aAcAT8eMgUDG9vMqTfZHWf1jE2rGVj/TZX3/68Vmsdzl84y/j4hIidliCcJKqOj/h5NrtbXqI+vIMU+3HA9tYt7t66yOLSEjOz87J+74FOzS5JPBhgvIjG3HG5ce2OnjxzTtbv39Ljx09LrTqLyLzUx5bo99qcODMmtbFZVH0mZh9h8cIPsd/ZYXvzCtcvfpnpmSd0au5piSoz0m3vs7N9V32vD52WdloJoefTbcekqTBem6DaOCZ5ParDIZ1XOcppc+B3vnjOHcl9JtGRec2ksaj/PLLoI6uR04ZUXAYFI+VqSaMSHDbXtd2Gcq1MYzIlwGQg/Eg/YiiqvUazSqPw0je+vqtmVDhaZU22KfLKgixNlYtE0TcsQZMekNKYKHHy5ASt1hZXLn2V/X00LM3w2JMfFs+votaO4sAjj5JrCSmwpk57k/t3L6rnl1k68ajE3R6VKJSgVOX29VVdPnVStrf3WTp+SoKgxKCbMtE4hjLG5MwxwFAqlylVZ7L7JrS6wvTS83K6v6tJYtm4f5ebF7/Cs5NnmZw+T682TVRtyPaDN/Rg9z5j9RLtTkx5bAa1JeK2ZbpxLGMw9YEk2zJlUslK7gr0YWgJIM2IBWbom0HWP7jgNo/olUwwsnnOgW7ny/k0JhbY3rzN9atXCQPD8ZULzB2bIgwH2LSF4g9rILLkfAGZfkMrh4cF7Fv9/CcmbKOXH0l8Zn+K6CYv8cfl79JkwM72PWzcY3qqysmTZ6TTK9Ns9rXTjQjDeRkbP+6GozmLNL+RHaE02WJibdphd/MKh7urLJ9+Tjx/ka0HN3VyelKae7vMzs5JVK6zvr6jy8szsr25y+Lio2JtDTElwANSp3FSR+RM4i57Ww8olT3OPPrj4suEXnzxN7n61hdpTK/ohedmpFSapFSqoIM9OdCBGqP04jbjpRmpjc+yduuObm5ucKw6Txwfsr3xBuVIaEw/hWdmh+wLQI2bJ+eVOJ9NJc1yx7gISc2QxVJAQXmhdA6WZzpOFEuKwRAEY9TKc0RzIdMLk0xOT0gYDNjff5u9faVSOc701CK+bzKIymSCBsZIIXB596g/Cb7bd5iu0iFtSIZN4nOtdiTakRSVFD80YAK2tne5c/t17fW2mZ6aY2JyVqamlylXplHrU1CDCjNkj0Zm4pghe/vrrK/e0PGxKWaPnabdTBibmBWMx95uS889+qi0Ok2mpmel30853O9w8txZhMB1tMQ6lkhWm4pYkviQzuGmahrK9OyjnHnsp6VemdRXv/prvPr1LxDWjuupCx8WtQHNpmLNFI35E1KbTomikK3NbVYf7LIcTAAe7dY2l978Q20ervO+D1Vl9tgUrkuSjnT3TrNI3ToCpfSL6NKl4CIMQbavXXpKcyKCZNGlGd3wlhQoReMsLpyTpL9Lf3DIpVcv6tbuA9QLmZg8w/KJRREzFLAcTZCMPS1FluaPErTvohnNKcRDaCPbZUUqZBTqVZQU8QyNyWnEprSaJeYXn5R40NJ+c5f7d9cVf1YWK8cyta5F5VVhYcgbFrugII532Nm8oXHssXL6SfG8gH5/i0ajQac9YHLmtCTUOGw+4MSJkwz6I48rXgE2i/iOO4bD6lLbotffxY/GNU1UovIxli/8mJTHT/LG1/9AL77+VaLKBAvHn6UxdQIxSGNyBhAS28XbHzC3eF6OLZ/FGI9qrcHxlTO88vVbNJsHOjOf9ZG2qWNwZBvK2sy0aQeli6rrN4cEGFPDmBoeZaBETvkeNiDIfL5s7kUFsUIQ1en2+1y/9KZWygH18Xmq42fxwjGZmJhhbGwaz+TrOIrl/dEK5zuNRr/Dgpfhu6MBwtDlHDp0ihEPa4V265Be+4Cp6RlqYyelvb9B8/CA+vgYWM2wJEgzR9rLHyev0DKCSEqz+YCtzbtUx5eYnnuUbnuDKPLpxwP2D1ssn3gSay1oiOeFiFjCIIIkQQN/xFeSrPWCpdncodfZJgotaB9rBzg8bJKZxffy7uqs3L/zqu5v72i1ti+T08dxyH3qHHfxWVhaxAERAUnSwtoungjHl07RmJgUY2JUeyRJj9Qq1iaIjTnY26bb2qF5uKW9/h79pEOSDvCCkFJpnLH6DJOTSzI2Pk8UjWGkBOpoR8McTd5ewcEnNu3ghTHHTkwzPjEpY+MLeN4kxhtz6TV16bEiBYbwMN0sN6HfbP2/3de3LWyFii3C5DyNYclL2hwUkhVUWIN4EUnSZ231lt688nXCQJmZmSEql6iNzYofGMSAtUqSIdxe5su4BntkLA9l0G+yvXlPjScsnzwvaRrRaSdUauOkquC50N5Xw8TYLDZ12QuJIvBMVtU11AoqitgBreYG3cNNrZdDkrRP+3ANxMfzxvG8iFpjhQtjc7K/3ybwq9g4IU1T5/rRx6YtksEh3XaT5uGBtrr7xINDKn7CuXPvolqr0O9v0G/ucrC3ye7+rvZ6bXzf4JmQklcnChoEQZ2KxAziDv2kQ7vTZHvrPpcvfUFnGlOcO/+0TM09ivFnQUojzA+nn52yOmT17ivs7d7SRiOi2b6vd++9TfvQsrD4iCyfeoYgbKDWvKOJfNiEDs1sjpSNpru+m6DuKMCXC1ruzRc5yyyDgKDigQqeCZmemBBz/oQaaaKDFoOkCzKN8STD09x1TEaSHOYNcaRL7dNub9M8PKTRWGJi4gSddh+kTJoq/aTD3Nw82JhOp0t9bDqjgSdElVp2ugpkXnrmbKccHq6xv3tPS15MFPrE/ZjtB/d1c6fF1NwZmZxYAhsiUqYxOQ1qsWlCv9ei3dnHyIAkOcQmbeJ+T+NBh7jfwiYpfmmGQW9M7t1eV8wGZV8ljITJqWmJ00n1PJFKpUalMk4U1QiCKhgfaxP6cZtuZ5fm4RYHe7d14+5lXn/pd/Xsoy0WT71PgmAWNHB4ZoZ1ikCruUu380A9r0Oz2aTVPESMz/jkFJZ9PTxYk8ZEFeOVs+OPHlIk6EOQx2jeG75nZlQyoNVFRnZoNrMo0g3VFv/mXHcRn9rYNNVxFdVd9nfWtZxETE0tEJVqWJvLljNreVV5rsSNsQziPbY376jv1VhafqpAn0qVcdR26XcPGK9HQEqiCSZwhEObppSjapZbVIQUcb1TSZJDmnu30GSfUikiji2lcgNjIySclDAcc4d6qJ9FPo4Thgfig3gu+V7yJzBmnCAIhAxXsykkA0hi8KyK8YRyxaNer2C8MuBnKHWPOF7jzu1XdLxxXKamVjBenbIZo1yaYXLyHKy8Ww5O3OSVF39bb9y6TGlsnpm5CiJjjDJAQDESUCmPYyqG/qBHGvtUauOgSr9zQFrvFIyPYXpxNGswwhVURzA4qsUedqC+S8I2Em4eSSVThN9uMKNcdzFCnMD+YYf93fva6awx6HUYq89TawiR9QrTnP+SK85w3Y6cyKX02jt0O3vUGyelWltm0G+RpAlhEGLwCLwmahXP9wijkovexKD4eB7FhKrawr9sNXc4PFzX6YkI0oRe3wlhqTYlk7OnCcoTJEVPNrcBUps4DM1LicoBpaCEWsug30UxBEGJsFQmiVOSkhAEFbyM0uSKmrMjhdRzzWuM5fBwnyuXX0W4rO/74E9KY2IcawNcp0yL8cqMTz7FU++O5dWv/56urV/RsYkFKZdrQwgy655eqc3QaS/Iwe4t9XxDY2qCaq0hneaORgEZQTMvRBoGe+4zW2i1YcAw5M19DylGIySjLCo1BSp+lJhXEI1dVI8RAU1otw7od2PKlSk8v06SuKOD8tN+clOac+Iky73G6YDdvW38qMzC4qnsLgaTAZ7WQrk8ju/XnHD5GV8fwQ9C1I5wLLJIUK2l2+nR68eUqmOys3lPoYy1SiVwZsadTUCOV7tumElCkvZI4i69ThOJapQqYwzaCb3DAwIvxQtwZlsiTCbsqU1QLFFUo1SawA9qBTWpXJpjZflxLr72It3WLo2J3I75GJOSxi2SeJeJxhhRKeLg4AFxfEilko7kUPNq+jJjE6dBjPS6D8CkIMrk9KykqTgznZ0AmLe7cL9LUX02/FkZpijfyUf7bkajeWtIzf8Zds3JXO4jGQBUsQqeURqTVYLgmAgzGCr0e47X5ijfuVNKQVt2z5wdB9Q9pD+wWh87JqXyFJq6I33CwMdax5OLSvXMD4Eo9ItBeCYo+GJO2HKKuRJFFYKwzsbWoe5tHzA9XWZmfkpSTen1D6mYACQoukyqKp7n0e50iPuHBB4kcRdjGtQakwgD+p0tDg/3VPyASqUm5dCn3e7RbHU0sUoYll27LVWmpyclikp0+ynj40uytNzUUmmMHMQ2YtD0kK17X2Nj7U2tjgfsbt6gXJuiOF4oZ21kWX5rhTAcY3J6mdV7e9y/c0lr1ZBGo06a+lTHKlIq6xGfbNhfbrgOBZOnSJP98V7fvs/GSByiGT6qwzBZ1RbdfcAixmaap0u/v0t/sKskPQYdIbV1ouqMyEiPWBccjDywsVjbYv/gAUE4LvNz57P28BZjBGMi4jg7SNb4w2t43jDBYYZ9yfIdm5cdjo1P0esty9bmLa2PnyAqhRwerOvB4V2mZs5KuVTNDt2wCCnGhIBPv9uh09pmcXGJTjvlcO+QxvQx0rCMsRVKpbIcHB7Q3N/UXgh+0JCZ+VNibUSns8fug7d1b+cW67c7urB0Cr+6Ip4/yZlHPijV8VnXy0QtRiDub7F25wv69pu/TT9uElUXWF7+s5SiBqiXQbkjpxYqqKYYL8DzAtJBSk/a7AwOUDEYr0HaSPD8Qh8wireRX+cI6wO+HZP5JyJsRaleIXkO6SnYA3kkWSyuRYyQxD0erN3Rna0rVMohgVcnKtUwnotW8w3KCGPVOQ0pg0EbwTI+Nk8QNkjTOBMuEHyMB0EwbLQ3Qk4a/juS1dAMNVYRgrDK7NwpqrWGlCKPfm+Htfs31HgRlUoV47mCHqNKknRpdTYQY0njfYwqnvFIkg6DgTKRReSDJKVaazBXm+XwYE22t1Y1PthWq2VZOfUoSVplbMyT2da43rr6Fe6tXuWJ5x+lMXUC35tw+dDMr7QkSBBSm5yjNrkAhzucOvM8J0+9S8JgGsVpbStDhNNIzjVMCcMStdokyaBNr9chiMr4fi2rSR1VH0dB3aMA73cWEPzxhQ05IkzyDSrWuFKxfJB5clkFmwrGlChVxgj8MXy/kmUNGKZsRk4rEbFOU6YejcYClcq0KwIZCc8BjBh8P0QkazHPUdaE08KjfCzjAGJchBkGY4STNSAmiMY4HsxLEESEUdUtpnUbBpty+/bX9fDwLscXz8v03GniWOl3DwmiMZQOpapPs6PsHR4yOzfL3MI05dq87Kxf07U7r2vn8A4XnniXNCZP0pg8LpMzM3zlC7+nnV6XSZO1zFe/qItNrSDBDEtnPy7VxgWwysT0CSrVY6AVl1kxQs7YzckSObFVjEe1Pkm9flpK5TpiQqLSBCYLWEY11zemqb7x/R9Hu31bwpa5BoXTmOvtI0cB5WJWJI9dEz6REiJV+v2A9gH4XoLxe1TrMdW6ySAPPRIg5ImkUqmBGA8jQUFELMJzcT6YMbmQjgj6w/BQvlkKRkneQ864Jh3G4nk1amMToL7zP212DrwqQRBSisocqk+5MkVtfIH9nTUUCEND63CNw+Y6d25f0/HJE4yP9yUMxxkfX6Jeq0mlFnL59S9ouRLp8VMfFE2V+3fvarvdonnY1iRBQt8Ufq/r8+GjWiaqnuRYeQVP8j7DI1poJFNoTObrZuc7pBa63R6a7mqr3QQ8GW8ojWAMk53PVczMETP6zu+/Z2Y0Rz3yU/KGNCKGZjT3iwokw2E0flBlcnZFKrUKlXIF1Kff7+EHvms/b3LemjPLBlP8bg4bKKmreVDNTkWm8GSlINUPWQrffMJc6ZxVp7EMBhUvC0k043SlGZs16w2iMajHiZXnZHHxScJSHdWA1HoEYQ0QDve3aPd2tHm4xdz8OSmVapmL4Pyk+aWnSAYHXHzrFaZmHycIIq5degkbt5hszEpgqiP91MharmbcXXXHHLkWYzn/LWOCqM2KZGSYdQGQkMiLCIyl1bxPt79DnAw0tc8x1lgQgjJ/XD/suyZs2eoOW2JlQMgR8uZIMl5EsElMu9NGtU8YWDq2y+bmjiaJutxftS5DhNEw7LcGeeedPHIsrp2lw5ysaaHRCmLIiPofFTYRcTnT/DOTY015UGIKrTl81vx6HmoNYWmKKPIyh9y6KTQeSdLHpjEnTz0mC4tnicJj+EG1ICTYuEOa7HDsxLS89LUNHXT3qdXP8MRTHyQIkKm5kwihK+fLKfHZc2SOhvOM82nIhStPJ+XYmA41npJgTEqlaqg1qiCwv7eHMMCmSbFo3ytx+/bNaI6xFTkCWwQFR6xWhuOktsf+3n2SZJ802dG1e5dotfaw1qM6vsDU1GLmtxmOJLuypLKRkeAjH7IcjS4ffr1zAvlh4YPRE1iG487YwflZ88XG8goUIG9zivgkVhnEPcIgIdWUwJ8hDMtYW8KqB2LxjdLr7/LmK7+hfrBN+2AdbIoxVRZX3pe5oPXiKCL3uDIEWrPb5cB5YVXyuD1DYE0GYbhnUjAJrc4Oq+s3CYMBYQBxYqhWK5gsFC3KXL4HEvftm9E8KV5Ej/mQ80GPpK3UIsanUh0nTQXfK8nk1ARRKQQ8kiQkCFyuUXP+gggi1pk49QpJOBJwZGZckG86QQ+bzaI4ZDT3V5Ayh4upmQvgCp/zVgWSIygFbCIImiZopiGsjUnTRBVfVEMUnzz1owhqQroDj42bG8wtPk6pPgsSIRJmEbRXCFEOYeTReS4MLmK3RcQ+yrIZtqVwf1ynfY9qfY7lk8+IkRhRCMM69cYKQalCTnYlu893W9q+7S5GboDD37GjcEd2gkh+VI0W52EqEGMkRkgyreKOxVDN2KgEOO0hIElmTp3Gy88JyK2o5sKW2Y1vdajrO2o48uKS3KRm7GCTH62RLfLIuQKQZxLy37PEnSYHuxtIlJLE23TbB3rizHsEGghhdq0sHysD+t19DvbXaTQmicoziK1QRI8j3bzztrc2W38Phi17xQUy+bg1ay3tfml45LlV67SnWDef2My/9ly/EjyO2Id3jDa/c+7aO72+qWZ7h26mTjozHaYFBWjECc93Wo5pjTq7iEPiC8jCZA+f79RiaXD9oI7u3FFROYLjjfiLhaJ6pzmRkUCm+OIRNlh2bZOZI5u1SR29xwi7gph+b4c07jDWmKBvQvqdmF53j3J1krzCxZj8FJmQqDzHXGk6C2aG1iDfPAVumVVjDU8lz8TCDKs9skeigICGfkCBAojkEE/2/dyXs3n6idyYZG5LftGjJXxHOlPl1/kOZPAbSvmG5ubh99nPmmuTLP85Auu4r9sjRyS6mNIikkeauSnKxca1fncUoxR3GrGi6h0d3hAzHmk7MCri7mo5rVmLxaQQTB25hjtZxh2k6/ZERnFXxVjFsy4EEbWIJIikDjxVsrK8mMP2Bt1Bm1JlglK5hkXZ2dklb4OfT46SFhtDrOdOcrEj5itrFOOaGbpsSFG4pxYlQY0lFUgEUnW8GKt5LtQBwEbBqMM5TS4gNlfE+bww3MCFJpVhN84jJXwj70cCkdyH0m9T2X2DZhsWOGSY1Wgb9TxToLmfMPThyBd6RDYKwc93YFGJJkc+Z1TbYDB51c9oXixbmKFRzMBZKNrhv5NDoCNvjuoFU6jAolx4RBCLZjbFES/ZvOTajoR2d0/7/Qi8MfG8Mt1en0FzVxeWcndQioBDJDvjPfMF3fzlnSBtMQ+533u0xwnF/JjCnxw9OyZ/+HysDgpRDDbNPjKStcpIXU3uQ9bi6Lzmx0nmAduoGhsGTfLtSBrf0ozmF86FcGQ4OU17JLUko+X7w7WDbCrzqqj8iMXhyckUqIWOZBsyhGNkQocLMmw4w4jw64hkD+1/sfmKA2Cl6JkxHBOFcBc8g9xxkjzoyaZd8rEkpNonTrPDcqVMmhrifhtre/iew8wUk/lY6hpHWuuA5AKLzLMw2UjUK2Adirl0Qus9HBAVqjq3IfmOyVnTuHRgppWstZmGzlWFjFxq9Kwd/UY3qsAf8g8yzfgty/6Ovt7RjA6T6jk4OlSpeTppaGZHotA8Usydb7Ujvo/TWMMmdEU4WIT6OVky1WFiWbPzAfJ61VwQ0aFQqo4U+eZRWwam5ud95pQozY7QyW8vxXfzz/PnzgWbIpDR4hkt1vZBYzzPXcz3a4yPHxO0x/7udSDJ8LIBxIdovIPYQ9A4e1wpZAV15xxIdqKzHl2Q4R+GY3WHaGUuRBYcuHnKqtGKQ0mGu94YryjyKcgI2Z+8R/GwF3F+BmvhQ40Oo9iQR1szfJvCNmpGR4Xu4RL8YqIY/TdbtMw0CNa1ny+GNwSDc1WtNlMn7qw8EkmxxpkbtS6iGuE0QO7j5XKaC66mRdWU6shCWnGIe9bLze35kS1rs3MGGJYnOhjGNXnOL5TT1nNfsNc+RNKYsVpZRMDzajQmj6OScufOy5qkO4g3IE2b3L31Epde+11t7d4A7Y0cOzkUNsfekOJ0Qrdvdai5s51hUWw2hvzUPUuKijsiyZEfTQa9eMXuK1o7ZJYjfw53gHDm1xVz6VJ0WnSM0kJ/kOZLfcRRekfhOlpZr/9hONvDkYlDrsUlp1WPHMyV+1Kjoiman+E5ehCYZqZN3HHakjPjbJYnHe7efAdLpv7zE4Nz0+t2qxNcKxbEuM7YiSNVukNgcbCB4sL/bHOIcaWjuY/l0lO5s55NZEFRAtQi4tFptyBNmZ6cyp4noFKbY3L6GKv3XmNj/escW3ycNGlz69pLeu2t16h9zGitsSQqKaJ5UZDFeAFYzbIH+XZ0gQnFfGfrLOAZGcE5vTx+BlVsqiOuSbbpMwDbdQun2EAFW7c4eivzCbOqfClCVbd2dlQOkAJ3/GZW9GFw/RuELddqNmNXDH/BndcuklVBJQlWLZ7xyItdbZpm6aBciAye52GMwX3F7SSbtw0Q9xD9fkKaWozn4fkeVi1xMgAgCALH8s0myaolSRKSxOIHPiKuL60xEISu2DhNlThOKEUhycA6Z19S0MT5jOqRU5GsTRn0YhAhCHxsakmTlCD08TwhTixJMsAzXnbYrlugvb02/X5KGFXp92OM5+P7YyyfeErS+EDv3HhLNW1SLtck8i3VaoQX+dmmsuQ9+USg02kTRaUifWayYyrz0wkVb2io0pTeIEZF8D0fY4Qk62YZ+D6B7xfuSG5QUpsSxzGq4tYjW19rLZ5n8P3AAcGK62GcuT1JEpOmKb7v4UorMhJAAdmMKI4/Aus0Rt4Z1B1F21WdkOUay/OEw8Mmq2trrK5t6WAgBF6ItUp/MEBtklHAXfgf+CHjjXEWl6ZkYqJKpRpijHE9ZBU67Q6rd9dYXd3UfiJIEDnin1qmJ2ty5sxxGhPjpNbhet1unzt3V7l774Gm6k5GMTZmbm5Czp07RbVW4c79B7z09Tf1h37oQ1KvRllzG2dmTVH65qLDnd1drt68pQeHXXwToUlKFBnOnz8lY+N11h9scev2mg4Giu9Hbn7SFoe7b+LpJtWxM8RmGS+oMT5eZ2WpIfVKmwdrb2qntUEpCmgetvD8Mucef5fUxpZRKlh8l2g38MlP/pYeX16WJx4/TxCE2Vwn7mRC9Yeb1zPs7u5z7dod3d1tIybE1UT08P2EleUlWTlxgiD0XQZGXFC0v7fPndurbG03NUkNnvFJkwFhCCunFuT48UWiIKDXj7l16z63b66qWkNqU8LIY2FhSlZWFqjXa6Q2cZBWTucajQi/iaA5YTP/YWZ0qFicBA8GA/rdLm+9cZ0vfultdrZbqIWFxVlmZyfwjaHTGbCzvc/BfpOoXGJ5+ZheeOw4z73rvFw4f4LxsQoIJElCu93Wa1fu8ZnPXuT2vV3CyPChDz7Kx3/weR30B8XjKEKaWpqHbX3rzZt87osX2d3d5yMfeIIf+P5nNXU9PLl1c13/wT/4Z+ztD/Qv/cWPSTnyXd4Rx2oVd0g7FqXXH7Czu88XPvcGX/7SRU4sL/ED3/8MJ08eJ05SWq0O16+t89nPvsXq6j6eWBYWI564IET+Jqsba6zvTLK9Zwn9gNMrs/rEo4s8+cQKx4+fkyDsMTFnGWscIyxNYHHFxZqC5wsHBym/+Iu/xPHlRf0H//f/ShaOzZJahpmY/DzV7BUPBjQPu3z606/x+mt32NrZ4ZHH5vnIRx9jenrS+VJHfHYhTZX9/aZ+/cXLfOUr19jdbTEzM8Z733uW6dlG0a4miWO+8qXX9Z/9s18lDMo8+dQjPPf8OSqVQON4rvBdCjw4K5D5o6LR/P+/pRn9ZpI6NlbnkUfP0WwFfPozV/jq1y7SGG/w3ve9wIc/8hS+53F42GR97QG3bq3y1ps3+LVP/i7211Kee/4p/TM/9QN87IeelaVjk9TrVR59/LwEfpXf+u3X9etff4N6vcp/8hc+zAc+9KzEg6SIkBSlUgl57LEz0u2r/uZvfoUrl2/wn/7Vn+aFdz8pUclpnn7f4+rVDf7hP/zXRGGkf/5nPixhGBBr6gxS7ngLzM5O8d53PSv3bjX1n/6TX2FpYYH3vOdpWVicATGcPbNMGI7LH372qn71K29Rr5d593s+zoULHv3ugCeefYpb90rcvLnDxTdv8Ouf/F1+9RMDXnjXu/jJP/tR/dgPPyvzcxOAT1I0lcnMCvDFL1zWixe3uHhxlb/5N7Z14djsEIPJNYfJIlEL441xPvSh5+T1N+7oL//yF1hdvcgjj/04H/nwB2RpYYrA84aH3GfCNtEY5+mnH5eDQ6O//Ttv8uKLF3n/+5/mkUcf5czpk4RBAMDWZpOXvn6DG9fX+OhH38WP/MgHeObZsxJGSqVSdW14JMcf/giHbUSW8vffEtQ9ypLI/DKrhEEIEnLqzGmZmp5SgKnpaV549yN8//c9KUEgDAYpg8GAVrvH5Ut39Vd/9Q/59X//JX7rU1/j7t0t2q2m/uzPfFTmZxv4vs/i8iyNqTogRKWQ8UYV43kEkXFHCRkQSTE+1OoVlpZmZaxR1nK5xLHFeaq16shDBFTKDd6+tMY//ke/jGes/vRPfZ8Eoe/IkDL0K6NSxKQfsLi0QKlUZ2KizsLiLGEYYkkJgwqnz5aZmhlDPKiNV3n+hSc4e2qX7Qc3+b4ffre0Owu025Yb1+/rr/zbP+ATv/ZZPvkbX+TKzQdsHx7qz/3lj8v0RC3zGx3GaDwhSZVf/uVP0e2EpKnls5+7woULp2iMR9g0YwdnkXIOCkdBiHjC5FSZqOyi80ZjnIWFOaqVEE014wfm+WrB930mJsZYObkks/NTGkSGxkSNxaV5qVVdbe2DB/t84le/qK+8fI2f/Ikf4G/97Z+Sp546W0xpahW1aTamAkoeza5+U42Wv/+WZvQbBc5d1Fp3UotNXV9b8Xx83xCEoJoAAWHoEYZlarUy83MTcur0cWZnF/Sf/y+/zhuvX+Ff/0vD0uKs/sgPv1tKkU+S5rRmg+eZIWadU7KPYGCWQRwXOVZN83ic4nvGuLM/33zzDv/wH34CzwT6Z//sByQMA9fHQwA1BYnS2gQxEQrE8QCouuc0EA9SrA4wvsEPBN9XokDRpEWatKhWy1SrPrOz47KycpylpRX9x//vX+LyW9f5F//8U6wsH9cf/dhzUip5RXQJcO3aKl978WVEIsKoxCc/+Qf8+I8+Q2N8hZxGlZu4wlxZR1BINU/IhyQx9AcD6hWX/M/BcC0gIZeRSVJ3TGUQuCAiSdy8be82+cSvfVY/+Wu/zZNPnuHv/Jd/UR57fNlBQnYIOLv0WZbXleFc80eY0fz1HwDqjuJtWS40O/VMrcHx5T2sTUiSJKMzkzVOsUWt5InlSX7mz39Qfujj76Jer3Lxrdv8/u9/nbv3NjI5UVI7pBkVSSUzTLwKUuyshxJN2W5wv5WmCeVKyDPPPUFUKvPG63f4R//o3/Gr//7zOhjEWYWU55LqOaNEHNhkvNEaiJEDaNXRnlQTknRAKQogjmnu7KCakNoug/4eMzPKn/uzz8pP/vj7qNWr3Lj2gE/8u89zf22XPBMgItjU8iu/8jvaH/T4gY99mFqtxuXL17n89h1NktR9J39myU8ZHK6Ya/uqxRx4BfyUAb953lqGMHEBm1l3vlcURbQ6fT757z+n/+7f/BaPPrLC3/m7f94Jmrr1Mw75wYhgxBSF2u56Q7LAdyRsD4O6o58Pf9Qjn2fJtyG7AArin2TwAigrKzN86MNPcu78WXo95Stffo1Ll27kSFJxbUvWGWioBBjOtJdPaX6nEf/E/dvrJ5TKwo/+2Pv5mZ/9QYxJefXVq/ziL/4Kn/jk57U/SBDxihKRXLA838/yhvkdhwvo+GIW4zltNzZel1QTNja31LF4D7l76/P65c/8E037r+v3ffgMjz12mjiO+fKXX+LW7TVNUltU/u/t9PnUb/4Bjz95lv/zf/YTjI+H9Dopv/Ebn2dtbYvhAXBuUR1cM7pceQbGHsle5sJ3FNfXh35PCPwyBwfoJ3/9a/qJX/ltzp1b5G//l39JHnvsZAYMZ/Sk/PpZJqiYlSLV9p1kEB6CQL6ZsB0NdR9+2PzvPMuQDcYKqbWUQp/HnjgjFx49TRAIq6sbrK/tEcfZIhzhVI2Mq+BCO6R9KAreMDWWC6rCYODSSSsnx/i7/5e/ID/1M9+H0ueVl67zP//Cr/Jrn/y89vsxvgwzEb7n4/kBQ6psnlPN1idLcnueo0ZNTC8SVse4d/c6/d4GIttsb77EK1//ZVbvfYHzZ8fkwoUTeNpj72CP+6vbJLHreqTA5z/3ht68ucZP/8zHeN/7T8iJk/MEQcSXvvQqt29vOgfBDM+WLwiUD839kbTfw8uuD8+n+zfwPQ4Pu3zyVz/P//Yvf5cTJ5b4O//FX5bHHzuZuRU5e2Y0fzoC6I/u/3ekfug7vi8SaEXzXkazBSNmdCTjP5TBLB/3DRm9DJQcSY6nmUDMTNWYnqrgB4pNodm09PrWtQFQcDws7+gDFHy3kbFL3tx5CA2MchdSm9DvtXn03Ax/7+/9FfmJn/h+khjeePUuv/ALn+Tf//qXdDBwAgcuixCWhm0bjl5PIKeui+/SQf4CiyeepdXc5trlX9X+4esa2A1KQUrgBUzNzTI5444aN+Kz8+CAuO/moDfo80v/9teZmJzl/e9/VMo+/MiPfB/j41W2tpp8+StX2NvrFGD2UTLESPqvaAlrRkdabJUceB1ltTggOODKlZv823/zm7zy8iUWFo9zYmUZgCTntekICUGz9mcybBgt2bIcbWw+TEUOfx7e2xQ58XyQI3nQYQJei/WWkYoKzalDeW+24pHzvOiQeFdgLZ4SRuLaZKmQplIorqEm9Yb+0hFTOdzXRbPjrA8cIyLv0Goh6afYVHnisQX+/t//a/IjP/x9JEnCa6/c4h/941/htz71Be0PYowxBKFPuRK5Y7i/iZZQDNZ6WT43Yvnke+Xs+SfZWrvCa1/7fbYePGBl5RlOnH6f+KUZSqUAAte4L+lbl+sFLr59h1dfv8j3f//HqJdqWLX88Mefk6npOr1uyqd+6w+5d2+teH6TJ8bRYgO4hF5egTYy4odP7hixTvlBHypgAp9ytUyz3eLXf/0z/Manvqy9GEKTg9759XN/0RRzkifhC6N6xPpkX3r4Z8mgjzwvxkj8c9SqPuwf5d8dSaozqo1kuDMk32WjG0CyiDGlPmaIIkOvB45kmBaJefcy7rNCyHU4DnX9aGXEaU4sziyrYOMEGyueCM88vcR/+/M/J9Z09fd+5yu8/vp1/tEvfILAi/TjH3+3BFGIGJcqG9UNmWRjSbLTXRJ3QCxKVF7k0ac+JpPTy9y/f1Vnx+HYsfNybOXd7OwaFziqq/GsN2qEZZ9BnPCJT3xa93a7jNWn+NrXrqrxUlR9yuUqxpS5dn2NS1fu6flHViQKfHfWu2bbeVj0yjt555oriSMrN3RykjQmtQMuPHKKp558ki9+4bN86Uuf5x//v/4V9WpNf+RHnhWnCPIeZmZEi2WadfSw1yNrMjqKLEeeazPAF9UsT5eZzrxBTEaAHy3oHZrFTLozJzFvSzVU53nvjvzBh+o0SaHXS0limJysMDlVIgwzYmG20GmaZguaL/loewcX+iuK1RjPTwgjrxhjmkCn00NViAdJMQcCPP/cIv/dz/+nYm1fP/MHr/DS127xC//416jXyqpeQFQu4QX+6Bnjhcy7Lt6QakJqsyKXJMD4CxxbXuLY8g+MzLaPTffotnto3McrhcwfbxCEPhsPOnz2My8RlUpcu3aZO/cukyYDIKBer1Gt1uh0+vz2736FF951nlMrC5liyKzDqICNOpXDD45qlGKxyChIKXHao1z1+MGPPc+Zsw0O9rd58asX+Z/+n/+SSjnU7/vo487V1lEPMXeNrFMsRbPuYZBQKK1R4m1hDQ1+ru2GdJK8U0ya/ULuTNlMlZoigYxabFZkYUdVuh7VZODKKwAOWl12dg9IbcCZM2c5sbRA3jGxFEaAxyAZMIjTbOPkZ2MdPf/Pqs16s0G5ZIZzrJCkKakKcZxizJAirgjPP73Cz/93f1PE/lP99O+/zle/dpn/z//313n3+56jWhl3BdT5fazbfI6562FG2srnG8mmLgecOiWGweILdLvK9naTJB1w+uwCJ09MiWcMX/zS27q+vsfP/syP8uwzJ/H8LOITg7UB/9NekzfevMbXvvwWN29s6akTC4V3MbQ72REchS87InBiinqCAjLJ5t45O+7vOO7QGLfy4z/6HFtr9/Sf7Lf53Gdfwgt8oupf1/e/cM5xy23euTzNtFjGVCkCttGaiMzUa17pWggXiuIP1bItKMtHBCVPFWVjttbx4o0ZRqypKkn2GEPVmmvWIT42iBPevnxDL1++Sn0s4qMfeYYL51cEHLtjbm6GsbEa1qbs7KckFnwjJAWdeoh9HR70td+Dmek5xsdqhbF2YZyQWGi1+44+Y1y3SWN9xCjveu4k//3P/3Wx6f+qn/38i/z+Z17h4tVNkrRP4F8Y+o4jRSCKB9Zg8IaaL0s5Wc1PPAYvq4G4cf2B3ri6Sqka8KM/9mHOnVmm1ery737l3xMnCX/tr/2EPPbYPA+/3rq8rrdurbK91eVrX73O00+dYXq6ik2OtogXkaNICA9pPHV5ZGsV3/eGZM2sYMcmKYNBj9npMj/90x+UrY1t/d9/6Q/5zGdexSv/L/zf/oe/xrufOutYXiN0q/xogpzM6hY5E8icjWozwTHZ4W6ZOBhHCswEIleDShGFILkT7mHzNp+5E2oFsR4ehjjukyRxdlWnsnNuWg4C3729zR/8zovcvnmbF144xw/90HMyNV0DoFot89xz5zl5eorBoM9LX7/KW2/ec5NjMn6V5yLPZrPPG69fo3nY5j3vfZ7FhXmGxTTqIl9RkjhmCBJnuztjgDz7/Ar/15//K/KR73uGeBBz+a0r3LuziqrimdwJzJsSuvXzMKSxJQddc7/UGPeMnghGDat39/jUb3yOq1eu8t53P8lP/Nj7pF4vc/Xtu1y6eJlnn3+cxpTLRzo6VIpNLYkqP/GTH5Bjx2rs7uzy6c98gfura0c3blEzmp8Uk2QY2NC/JJvz1fsbvP76ZVqtjtsfViA1iAZ44heuzpkzi/zcX/1h+fiPvpuxRoXf/92v8j/89/9MX3n9jgNzjUfGERvWphS80jy6g6I0s6j1NUMyqliMkFcluYGq2IwB6nywXHU6PwwwNr8vve6AuJsQ+SGtg312t3fo9QakFhILSarESUq3M+Dti/f43/7V7+lnP/0KTz1+jv/sb/4MTz191iloawlDnxfec16ef9dJPD/hi1/6Kr/7O1/Uw/0ONoU0gThR2p0Br716RX/vdz9HGFo+/vH3MDGZ0YjUoDYl6Q9IBn0OmwcFLmjwMh5dlpoi4b0vrPBf/9c/xwff/yxjtSrlUoUgiIbOb/GcCcmgjzHK/t4hWxv79PsxibWkVt1zxgn9bp/r19f4pf/9t/W3f/PTnD93gr/zn/9lnn7iBN1On1/5lU9r87DJX/qLP8bkZKOI4H3PmSNfhCceP8bZ8/NgLG9fvcXLr1/VdreP8XLSRbZpEpCsQmt/v83m5iH9fky7N6DTH9Dvp3z5K6/qpz71B7p/cADAoJ9otx2TxkKaQJrYTDkJTzx1mr/1t35SfuiHnqFarvDp332Zn//7v6gvv3iFNNWss3juk2dFPDpsvO1KOz1E/WF1QCH7CUriAgQ3sWmGs2mGKeU1lRlZufD7XJRlBNbWNrTV6hCGPq2DJp/97CtMT0/r8ROLEkYe8SCmedDS1Xv3+eLnv8bXXnyDC4+d4q//jf+Ej370aQkDSGxSwApLC5P8zE9/P/fXdvnyly7xr/7lb9Nr9vUDH36e2viYDAZ9vXXzLp/59BfZ3dvlZ//CR3n3e86K01jOlzjYO2DrwRbJIOXe3fscHjYpVSKiKMw0lMPMktQS+B4fev850f/mL+n/+P/4F7x16SalwMcTd9QQWJLEcufOOnt7B0Qlj36vzxe/+DpnL5zR+WMzEoY+g0FCs3moq/fX+fIXX+YrX3qJ0+cW+dv/+f+JD3/fk5IkKa+/cVN//9Nfot3pcGJlWjxPHEevSI05i+IZ4Qd/4IO89tptNh5s82//zac5dWJRX3jugkRRAChGDP12VrZXnub1S+v8r//8U/rYYyfwSiECHOwe8PWXXmZxaZIoCokHCTubmxzu7SAa0+402drYotNaJCoHiDE8+8w5/qv/4i+Ip+jn/vA1PvvZl/hv/l5X/+7f/TmefuakTM2MIcY4guYIq6SoWlPNXPoMppK8d7EL6HwXcSpoktUL+M6+53GBgpAWEY2HT2zh1v1VLl68SKUKzz57nk6nx/Xr6/yLf/4bLB6f1aDskcRKrzNgb2sHPxjwV//an+Gnf+rjcnxxxsU2Ni0SA7G1+J7Px37w/VIuV/Xf/rsv8MrXLvOv/+Vv8PkvvM7C8jFN4oT9g10qZeGv/42f5s/9uR+QKAqIU6fTtzZ3ePWVS9o83OXxx85gjOUzn/mSLh5f4IUXnnIhPQ4Z942rNjJG+MhHHhEjf0X/6T/9BKVIHGkxCynu3l3llZff0HLZ5/l3nQMVVtf2+IX/+Zc4fXZJA991Yep1uuxu7yMm5ef+yp/hp3/6h2VlZYbtzT3eeOOqfvaLFxmfmuK5mWmuXr6mk5MlObF8jNDzikyLKniex/lzyzzz9Fnu3Run10v4zB++TBr39NlnHhHVhLcvrenWVpNHzp3g5JllDg/2+P0/+AKvvXoZP3Dzsf5gnanpiB/78Y9Qr9W5eeMu16/dYGqqzLteOM/UVJmrV64yM+nruUdOSWNqAs8YXnjuAv/t3/85ObWyqG+9dZ+7d9f4xV/81/zsz3xUzz26xKmzp+TYzBR2NFB6OOrN/DfXrte5YyIgqc3awOtItCGmwHPUaoFlaZrgeR5xAl998Q1dX92kWh5zB4chtNsd1h6ssv5glU63TaVSZfHYEo8/+jjPP39OokgKPwXFtUDNC3+zAXtZr7VWx/LSi2/rW6+/yerqfVrdNmNjdR5/4nG+//vfK7MzNeefWcWIkKYpN67f5ZVX3lIvKDEzPUM86HD9+nVOnjrOxz/+EXE8PR062Nke9IzzQd588w5J2uX8hWUqlQhNhZdeflOvXb1Hvd6gVq+hCt1Oj7UH97m/ep/BoE+lVGZ2do7HHnmMd73whJQda4ckTrlze52XXn5DY5syOTWLZzx2trc5/8iyPPrIGaLQ4WiS9ZcbDGLefOsqu/tdterR63VZX71HY6zChz/yPrFpzCsvvamDvrgzGXzXaX3Q7dHr9ojjAb1+jHjC0tIsTz15VgJPeP31t3V1dYOx+jilSpV2p83+3ja1aomnnn5MllcWnaxY69Y4hjffusf6+gNtN/fY3dukMVnjAx94jywtzKM2aymGMKx+M4X05XHrMKetiLUjleKFN6yFczyK7Yo402IQkIBv7+UEowjEC7BPh3z8DLG2khV1fIur2Qx0lBwfRF2N5De7u9qshiK/maMXqeZds/OecO6sPmsdhbwIFr6NV2Itkh2XIME3//3U5myWTDMgiNGR7MmfxCsHfb71NW2GHebJAN9/KGU48ortgEAEmx0pUKCgmcyYTHGMdp8yKGLTgjGVfW5dm6riDEvIi0PyFgXYYTV0flpyAf6JdWVleVt5Z6lHkrh5qKwjdKicxpSH5za7zlAAQIq6BSMjabPiTIbsmpJFzHkLhFGagNgCc5OsHNAd/51mXkdWpSTuSEQRryhzG7Zxz+YpKzxGs57AMkzaiYCneesEW0ACioexGeKYYUkOLC4AIveZpqjJxpDlJVWz0mzJSw8zfzpr1VDkSXN2rHUgrHhZgktHKsry2c/mSjV2xFRxtatW89TfsItnrqO8IiJ2OKyr380j0ixizbSHlZw9YjCa4qd2n8HA4vsRngkRo+4IIPIB5yYv57mlblHUFBQXI9mZlZItrbphFfSTI+0cXO8KMRlbVvOmfpnOE0CTrPtO1mkxq4DPuMLkR07nGiqP0bT4DFzPDAHyk1nySRmePuP6v+UClDfDd6wHZxaynhueYG1M3O9mC5M7JlmCGg8/CBHfH9bJCg4Yz66Rj7EgHEh+YnLOGs76CeuwNE8LX3m04HgkP2os3mj3v/xgXM17q2SaTXMwOus7R57UH6Fn5cXcGcAsGZ3raLPuUUHLswk5HGIoqgzUy3LUCakm5N3g/XbrNS5fuq3LJ56V+fnTBaszh0Nce/SUNI1JsojUmMgVFCcd0rSN75cJvIg47pHariPbGc+1V7cenhfheT5WE1d9ZSw2VdLUZpU3uSoXVzInigtS/azva4C1SXZSXoyYJPvZYoybEKvud31PSNM4M5sWxcf3KhhTdo6qcZG2axhjwBjUBkUOUcS4g0TUZrlaZypazQ021i+rtR3EKMmgj2c8PBOCRkzPnpDGzCJJ3EdtQoqHH0QY42WWImEQ56f9WYwpEfglR+lJ3ebwvACRCqiSJE3QGGMqroqqcMJHIBA7IEl7rvJKQkRCjBgS2yVJW06rmBK+X0UkAE2xtk+qadahIEBw5FcVsLZHknayyiwP36/jm4pLXWabRzUmjrtY2wVSVzXlR1jr2lB4fgmTtWNVHZAmPcSvIBLgB+EBL734Kc6dfdpdLE05PNglLBnKpTqiIRhot3bZ3d9lvNFgbHyKbrvJ7vYqe/sPdGpyXo4tnWZ3b5X93VWNfIsnQqKBpGmZ+tg8jfoEreYDkvSAWmOSQeJxsL9PGncwpg+kmmog5UqdWrlEq9lCTIWZ+VMEfkC/36a5v0aSNonKEe1Ok26vpb4xYAJJU48orDM3N037YI2Dgz2NJRKRErNTxxlvlMkP4HWm2+UJ1doMrM7PIS3a/mS6yJmfeNAjDJGoUqG5v6Hbm7eYnJxhcuGU9Lopavdp7adsbm5g1Spakpm5ZRoT06R2QLd7yNbmfZK4Q5z0NfQCmZldpFqfY2d3k+bhOosLJ6hWl7HW0ty7T+tgh/GpE4xNztNqbdPvtqmNTRCVxxEi+r0uO5s38byAiakl/BCSQYeDvTX2W1ukaaphNCbT0yvUqtNY7XJwsEqzdUClOkFjfAHfcy1b0ySm3d5l/+ABvX5bfd+Xen2aycYCQVBGrZBqh053l/29LTrdLpCo7xmZmV0iTSz7u9vMzR2nWlsGq7Sa62xs3mdp6WnCKMJUKlXiQUy9MY/ggR1w786r+vKLv6SHzasofTCGzqDNQetQrQrd9gM27r2sajvMzZ6Q0K/Qbu6D9ZhozIuQsLF+mV5vTyvVOr5Xphd32N65rjvbb2s82COOY6JSgyiscPvmRT08vMfEZBk0odfb4fbNV/TB+h0NwyqIj5Kys3NX97bvqCdKKapSjoysr12ntb+rtfIYg4wXN0h2uPTWV2jUZxivL9M6HLhu4JlyMFkKJU069NrrHOzfJR7sYm2LuL9D3HtA3NsjTRPXlC+F8fFFTpx6gYWF55maOi2l8hRjE8vMLTzDidPPMTYxy+7eOtvbqxr4gZTKFWyaonTZ3rzO1bdfVs/zmZw+xczsWVH12Ny8r8oA30+5fOkr2u5sOaTdFwaDFhfffFWbzTZQYnPzOq+88uu6ev+ratMdoE9UKrF/8EDX1+8oRui2N7h97Qu6v3dPJyYWmJ5Zlk5rTy++8Ye6ufE6sOsEYO26tpt7juZtApKkyfq9l7l/56IGfpXZ2TNSLk9w99YrevniJxWzgdUWW1vXuHn9q+oZmJs/Q6NxXNKB4WC3hTGG1Xuv6erdr6rqPpYeq/feVJsequcJqh6+tRCaCLU+4htUYnyvy+HuHd567Xf0iWdrMj5+DDEpUSmSMPKJW1sc7Nxh7vg5Zo7NA4Y0TqhUpvGjErtbbdnZfVtLlYjZYysEwQTd7iapdknTffzAUp+Yw/em2dtdJ7WWIFSmp+extkSnvcqgv0+pPAeEWd2DwdoBnmdpTM2hlNjbS/D9lFJUYmHxJP2+EIUxiU10MDhgamoW8aaJu+2cnIe1iucb4m6Hnc2reCZF/TJ3Nu8xPTXB4d4myaCpU1PLUql7GBMiJiAIK4hEqHaxNsLaMqkNRTVCxMcEFtWeGvqMT9SZmFwCNbRaG1y+/BWdmV1mYfEUvj8FCOPjDfa274mqUC6HkLawySHWtrBqwHTp9naJE+fvRVHK3s4tLrYeUC6VmV94AuPViJN+VsiScuvOJd3Zvs3jz3xYxhonAZ9yqSSX3vhDvX75sxpFz0mpBFFo8D1b+Medg3s0d65pZfwY84sreGYMa9uYdFWuvPX7+vpLiT729MdkY/2apkmPxeOPAA2gw+REg0EvoVL1ufDIefn6Vz+jk7MnKVXm2d7e4F0vfEjCMCBNrGvgFUrgfGqrpDamVBrn2ad/kH4z5u3Xf1PbrbuIDMD26Pd6TMydIJWQ1178fb1z/dNq7T5hVMMP6kCATSma0WgRBXl5PIEQ4Hu1ImAw4oMGqIYYM4bnhRiPIZSRIf+uYsudJeX6eyT4WQSFBkTRGIiPoFg7YH//Jnu7VxDTBZOApORNCdvtLe7cfkPrkxPMzJ1CMayuXddWZ1Xj/iae6RCGFjExeAlW46yWIksXqcVqmvFNFasJoglJf5/m3m1t7a8S93fptu9iaDI9PSfGVEitxWpKEDSYnr1A4I+7KrW4zd7mRb178yu6dutLurP6inpeEz9wDQIFj6eeeBcTY9PcvPiabq2/Aezi+0KpLOzv3uJgZ42x+jSVyjQWQ6o+lcoc01OzGLtPv7mqguJ5PiIJYlJ63S6r929pv7/L9ExdPONapBpjmJhdojI2zvrqFTrt+/Q6HZaPPyZQxiZdbNJFjBKWI5AS45MXOL7yCLeuf1kvv/kb+tiTH5JSdMJRsYxgEI84iV0eNDs6J7E+tcZpefY9H5e93W2uXPy0pskDgmCAESW18K4PflxWzp7ly1/8LS5ffFEHSZyF1x6SNyY+gu04/8cT38EhI3QktR6qQRbN5FGQx7C5C0V0qDZvthJgrU+cZlx5yasSPUQCESz9TpPm/i4Hh3suCjU5QzglTge0+5kWISQKQyDBGCUqlwrCJNkpM3n38Jxu5Qn4RiWPegvIxVr67Rbbmxt62NzDpj01khSAuSF1UV8qGIkQiUgG7kCPqZkp5ucmZe7YtEzMjSNekuFfLhuTaInn3/NDUqlNcOm1r2pz9wpB2COKPLrdDoMkJiqFDizXHN7x8cOKhFFEmtoMUHcBC2pJraU/6BDbHmJ0GO0jCAGeVwKFdnOfwaBPFAYuSBNLu7vDW29+QV9/+Uva7w4IoynOXHi3bDy4haYHNMbnQOoIEWJdjJ0VcbhzMEGIxdAbCBOzF3juvX9GHmys8/al31NN1tQ3KZpGqI7z2LM/KU8980Nsbe6wuXGLlF6mhTyM+q7NgcZFWI4YUjGMnMaYRbdmpBuihxJhTYjVAdB2bbMSiJOExPNAsrM7xdUrGMnOL8hBYrWKV2Zy9izLJ55mcnoxu3aaaVufKBpnfGyWbmsT1W2CEMYbc4JMkMoM4dgSQTTuwG0dLcjJQUrLMExzjD2VqvjROJNz5+TE2edlevYUQakuuweHtNq7qtoFjRFNEe1htQs2xjMRJqgiwTEp1U8SVZcx4azENsDaDDJCiFOPnp3k2Q/8GQmrU7x9+SXttm6htk1jbBIMbOzcJY6bDjfDYlNLp5tonwrl8SkJA4PB4mkA6mpIq2N1UvVoNnsMGbe5ZYoIo1lqjUUGSYtbt19SGEDW+jWJW4iklCvVjOVRpV6fZHp6GhigxnECrQpGKBOnkGYLpUASWwaJksQ+M3OP88J7Py67WwfcuHYNq0pr/5D2YQtVYeXk4zIxOUdqs/5oIlgLaWoKXGcIEWXdrWV4PKNTWpl9zQCIwK8xM7NM3O+yv30LvIE7BrKf0usGQMnhTeqOy7HkvcmSTDMaEQkxJgIJsL1B3gI8w6dgrDHDo4+/Vw72B9y4dp1yZZzjy48yP3dW6vUl8WQMCIEQg++wo9TNURwPGMSDgpKYF+9aNRivhB+UsdYjHSiVyjyT0ytceuNV9nZukWqMJSbWPg9WrzFIuyiWVjshSXygApQRKeGZqnMXsKSakKSCtQFQ5/0f/SkJowneeu0inXafWmOZ8ekVdve22XhwW9OkC6bPYLBLOkip1lbwgiW6vZRu+5A0TUjTLl7QY25hUZK0xN1bdzXpN0EGJHGbvc1NItPgiae/T8qlBSYm5rh74yK9g1tO49s+nu/A7DRzjww+gVcDG7r0lbqCSWsUf39tD0uJ6xdf1Ueffk6StMeDjXV6za5OT0yL59WZnnmO559PZHdnX6Owxp0Hd1m7f1VnJsqsrd/lxMnHWTh2KjvprU/zYJ/11S2CYBZNM/am7XN40GR3Z4fGxD7VmsV40O7s0WodUt2xDNodotoMQTjNhQsfkDde/ox++XO/ppOziwwSn4W5ZTnzyDOFVdY04XC/RdxbZeXkPlF1kTTp0tw/1OZBh1e++Bn1wgYmLPHsCx8Use4Eu8GgS+R7VErznDp3rGCzGjVMTo9neLlBU9eSyyJZwa5B8Dg8bOrdO2vUyhMsn7Ku/5sK3VZLr12/zM7OutbG5pmfPy0rZx/hfe/9Kbl+6WX93O/9ulbGJ6mMTbC5vs5zz71bfC/lzt3b2uta+p1uxhL16R7G2jqMae1vK+xLu3Wgu7tbHDu2i07MIEzz1DN/Tsr+tKZSIe7DE098QMbrIW++8apeu7Kq42PjJPGAyZkT8siZ9+N5lo3VNb27epe1jfs6ff86fqnB0tIpef6FH5aLb76sv/kb/0KnZ2cIwyoBVZZPvFemjp0CO+CJxz8s9VJNf+dTv6W1sQb1McPe/h4rp0/g+RWSZECaJGyuH5DEyrHjA8q1vDeeItZeRtVHpJT5TFlrUjEoVURLSNpFte3q3SQE6QMdoJsB0A2ECVScPcdug7TAVhEmUS9C6KG6DwyAGqpjmX/VAbaBASLTqJ0GaxDTQWUL2HelfVoDHUdt1R3l7fURv4XaVqbNxlAdRyQGVp1fwRhIBOqAV6hkXD3nQxl1kW7ewZEMac8gbVKygzaMo4i743yaIE2QzD3QOkgVpAfaBA6BNANnx9y4UVT2gW6Wo0iBCAgQosyiHLj5YCojQexklOyG86X0IAuoxoE6koRAF4KDzMetZsFPE6WL8yXjrLh5EnQCiFHZBdkHelkqsZathw+0gH2nraUEdgJ0EiXA9eJtZ98ZuKBFergztSZRmcxapXZAtjIC+zxxXMEPXdD2/wNyydSma9XnBgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMi0wNy0wM1QxNjoyMTo0NSswMTowMNNVA5oAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTItMDctMDNUMTY6MjE6NDUrMDE6MDCiCLsmAAAAAElFTkSuQmCC</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:GeolocationHint>geo:53.984667,-6.394150</mdui:GeolocationHint>
+ <mdui:DomainHint>dkit.ie</mdui:DomainHint>
+ <mdui:IPHint>193.1.40.0/21</mdui:IPHint>
+ <mdui:IPHint>2001:0770:0028::/48</mdui:IPHint>
</mdui:DiscoHints>
</md:Extensions>
<md:KeyDescriptor>
@@ -55,9 +59,9 @@ LKIUf4wMQHssUFNv5TXV1zu1W4f9ctYYLexH
<md:OrganizationURL xml:lang="en">http://www.dkit.ie</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="administrative">
- <md:GivenName>Andrew</md:GivenName>
- <md:SurName>Clarke</md:SurName>
- <md:EmailAddress>mailto:andrew.clarke@dkit.ie</md:EmailAddress>
+ <md:GivenName>Michael</md:GivenName>
+ <md:SurName>Deenihan</md:SurName>
+ <md:EmailAddress>mailto:michael.denihan@dkit.ie</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Frank</md:GivenName>
diff --git a/swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml
new file mode 100644
index 00000000..97ea08f7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.eduhainaut.be/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eduhainaut.be</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">eduHainaut</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Students and Teachers from Secondary Schools of Province de Hainaut</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">eduHainaut</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Etudiants et Enseignants de l'Enseignement Secondaire de la Province de Hainaut</mdui:Description>
+ <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-eduhainaut-16x16.jpg</mdui:Logo>
+ <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-eduhainaut-291x88.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
+ <mdui:DomainHint>eduhainaut.be</mdui:DomainHint>
+ <mdui:GeolocationHint>50.41719089999999,4.448670300000003</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLzCCAhegAwIBAgIUenYDsKxgJAPyGsM4iuM30gfFOzUwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUwHhcNMTUxMDI2MjEzMDQw
+WhcNMzUxMDI2MjAzMDQwWjAcMRowGAYDVQQDDBFpZHAuZWR1aGFpbmF1dC5iZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqFXaGIaZwtPZ0MT5gFEZrz
+372fULiqBq7NWjqtlpKsov03Q10INyDXiNlTfSeMzTENzdyt0a6dDU1PwRL6fTSs
+9R/7YzAVstXj5mAcPC7sa8WqleUI5nN3FdOWfq+99oyTlt5uacCyRQfDFDd6hojA
+y+pSLAtVJI7yZM0XvUtTSvm6f6kakowziRnyHZWx+yrfUll35qcgKjwclIUHLSum
+EsVKpM8FCdR5qCu3wOysV+o7ta25FDWIZ4vxrXajnLfBjWTjPJRi5QLB+O2Xf8Hd
+cYEm6B64vpyExUDyUiXBApv4VxZZQjxlOYezPdy8mGbvPQaW/QNaELPD6PrfCUkC
+AwEAAaNpMGcwHQYDVR0OBBYEFKRrH8u31ucPW+tvUiTg59WWmoLhMEYGA1UdEQQ/
+MD2CEWlkcC5lZHVoYWluYXV0LmJlhihodHRwczovL2lkcC5lZHVoYWluYXV0LmJl
+L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA7870M5hvHnWGF0K1O
+JLY/tfC6Lmn7o0MVCbj/OeSHsfRqCmTn82flXDBipkwUaBiVdxrzD4dSHr7wAwzn
+qIfAlM1i8ssYOYOd9ZLSKkkDLarKXsK5wZFCtJB5n/CPSAyd3MwFPAQpkh9Dgwgs
+Yehd+xab1FK2V8dQDVqQDuz7CYY9lo8pvZfvOk92HkVeuCfUgBXTADlMsV11XCpj
+dCWzqSHBZiWc3dxV/Ftw6om/Un117Jo1nsw1JkiibgpxKaUrfCsUNckyYaQo8DWz
+Z76DYvVYsUda8q0eNnaxDthEU9q6MLWI4reu5OVFzIduzA3al83RhoilmF5khZLg
+IKAB
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAP1gRpy9QjNBjUFGEadtET7Yz08HMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
+OFoXDTM1MTAyNjIwMzAzOFowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNe+qXDsnSTOX5QpEHFUC/
+J0MqSQ43ICl9CPUUAdmVo4z5l037kaHwmJL/xJp5+8jjtbNNv3fxMKI4DFr+H55w
+oFeQ5heYT7c3mQ5ABJsoaJim9UWyGknBk7ADVFwcaA49h3F1oxVoTmBJnq2rARXr
+G9cqoPpXZrFysNy+VgwEg4aWKFfr4RWpiT9VGNuyxTwoQUTr7KmcOd/B8w6kY2rZ
+pPIuWmPkInhvZrklEooESNobulFQq1CMoaoah5wn7qA0G//DSNwrbeLBDePUAAKW
+shVN36AvlmzvNKxVVgNPV7EmauhkJth1Uw21ZcTa9X99fsZDoAxsR5gntVaU+Fj7
+AgMBAAGjaTBnMB0GA1UdDgQWBBR2ceWDhljU3+FtPKnpaNGACGK7DzBGBgNVHREE
+PzA9ghFpZHAuZWR1aGFpbmF1dC5iZYYoaHR0cHM6Ly9pZHAuZWR1aGFpbmF1dC5i
+ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAMspHwijR4MCx2CZs
+sHRd1J21Y/QTeBLcfUPy7cMFwlASEEItYBT+5Z6Bh1UusPdZaSkDgH94NyEP1Ayk
+1jmToANHN+szrWz4wd8ZYiUCnACIYRTv1jDNV8pFqfgbYxMGNFPIoc1LTniNSiWe
+RfJ+zhFfIsYhN9ykL08GvfYDkThrOPn/i2cd/NjLajUXAr2UXla0HRpr3dr2L/0Q
+/vLVAl7j5rzMDUuvprwxJSANlZMHNoz43cJhyb/uf94T9XWuoryH/mQBg3McYrNC
+Ub1iY5BW/4fmTkmnIU/L/t/vH+aFBrdhRpT6T+icOC6/pN1sOU+iymNhmZNeq5Oj
+YY+sLg==
+ </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>
+MIIDMDCCAhigAwIBAgIVAITAPpgbgYKWacifpIzYiDCLJilfMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
+OVoXDTM1MTAyNjIwMzAzOVowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCRoNFDIELAzMOv/zIUfIZG
+/usJeoEA7jnJcoTA5P0G0Y8DBKLk7YuF+EA+zQDBSacBsCCTX9XmC1nCXWb1D7s1
+r6ITuF6o3bUNYQd9hFF4BWzLSsdbrtuqkcDDW8nXWe6c/zUbenRS/0EGSoct0W7S
+dyGQOC9gxeONsrznA7Uo/V29HiRrFxiwgRTAnVBAjmrANOaX1Y8humP62EqpYJOM
+L/XdwweoMIY8YqqmVLkyAuLSW9okFq0+lLIIlaXpn/3rF1lJQ8drbjW+rKennkYA
+gGBLDA4rGiY9XhoMG55mgWgAUVcABrST/+HxfmBy63+/2tEsojPh9njPeMpH/Mhf
+AgMBAAGjaTBnMB0GA1UdDgQWBBTgnucKIXIOOhfdr039lc5N+UHBBTBGBgNVHREE
+PzA9ghFpZHAuZWR1aGFpbmF1dC5iZYYoaHR0cHM6Ly9pZHAuZWR1aGFpbmF1dC5i
+ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJzKRXTVuiT1qIVUW
+kB9SLKFk5e/dDeX42pDidr8PDb+go/lFMQI5wigbH9JsMes21rn7bWkZIn/wH+WP
+WPvMIvr1SSrqoGgysRUdeoUpqSAn4JgiR18tOrEP90InWflMv0xeM3LDK43tZpP3
+68a5KQOKu2zKyCQ0t8+bcy9RJIsgQvDv6yUXtNsx8q4nc6jZ16gM19Bp63aME4mg
+LR/to7vufiLAWBELcYxGqPvuaETJDZ2msYwnaWp9uWn4IzadH5WeS16yKxBsJAnY
+JbvCJSPArtmzQsUC6GSq/Col1DpLLbkqxE01S0Zg4Evi8jImwyhTYnNdLIB2tvgZ
+M5p59Q==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eduhainaut.be/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.eduhainaut.be/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eduhainaut.be/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be/idp/profile/SAML2/SOAP/ECP"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eduhainaut.be</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLzCCAhegAwIBAgIUenYDsKxgJAPyGsM4iuM30gfFOzUwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUwHhcNMTUxMDI2MjEzMDQw
+WhcNMzUxMDI2MjAzMDQwWjAcMRowGAYDVQQDDBFpZHAuZWR1aGFpbmF1dC5iZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqFXaGIaZwtPZ0MT5gFEZrz
+372fULiqBq7NWjqtlpKsov03Q10INyDXiNlTfSeMzTENzdyt0a6dDU1PwRL6fTSs
+9R/7YzAVstXj5mAcPC7sa8WqleUI5nN3FdOWfq+99oyTlt5uacCyRQfDFDd6hojA
+y+pSLAtVJI7yZM0XvUtTSvm6f6kakowziRnyHZWx+yrfUll35qcgKjwclIUHLSum
+EsVKpM8FCdR5qCu3wOysV+o7ta25FDWIZ4vxrXajnLfBjWTjPJRi5QLB+O2Xf8Hd
+cYEm6B64vpyExUDyUiXBApv4VxZZQjxlOYezPdy8mGbvPQaW/QNaELPD6PrfCUkC
+AwEAAaNpMGcwHQYDVR0OBBYEFKRrH8u31ucPW+tvUiTg59WWmoLhMEYGA1UdEQQ/
+MD2CEWlkcC5lZHVoYWluYXV0LmJlhihodHRwczovL2lkcC5lZHVoYWluYXV0LmJl
+L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA7870M5hvHnWGF0K1O
+JLY/tfC6Lmn7o0MVCbj/OeSHsfRqCmTn82flXDBipkwUaBiVdxrzD4dSHr7wAwzn
+qIfAlM1i8ssYOYOd9ZLSKkkDLarKXsK5wZFCtJB5n/CPSAyd3MwFPAQpkh9Dgwgs
+Yehd+xab1FK2V8dQDVqQDuz7CYY9lo8pvZfvOk92HkVeuCfUgBXTADlMsV11XCpj
+dCWzqSHBZiWc3dxV/Ftw6om/Un117Jo1nsw1JkiibgpxKaUrfCsUNckyYaQo8DWz
+Z76DYvVYsUda8q0eNnaxDthEU9q6MLWI4reu5OVFzIduzA3al83RhoilmF5khZLg
+IKAB
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAP1gRpy9QjNBjUFGEadtET7Yz08HMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
+OFoXDTM1MTAyNjIwMzAzOFowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNe+qXDsnSTOX5QpEHFUC/
+J0MqSQ43ICl9CPUUAdmVo4z5l037kaHwmJL/xJp5+8jjtbNNv3fxMKI4DFr+H55w
+oFeQ5heYT7c3mQ5ABJsoaJim9UWyGknBk7ADVFwcaA49h3F1oxVoTmBJnq2rARXr
+G9cqoPpXZrFysNy+VgwEg4aWKFfr4RWpiT9VGNuyxTwoQUTr7KmcOd/B8w6kY2rZ
+pPIuWmPkInhvZrklEooESNobulFQq1CMoaoah5wn7qA0G//DSNwrbeLBDePUAAKW
+shVN36AvlmzvNKxVVgNPV7EmauhkJth1Uw21ZcTa9X99fsZDoAxsR5gntVaU+Fj7
+AgMBAAGjaTBnMB0GA1UdDgQWBBR2ceWDhljU3+FtPKnpaNGACGK7DzBGBgNVHREE
+PzA9ghFpZHAuZWR1aGFpbmF1dC5iZYYoaHR0cHM6Ly9pZHAuZWR1aGFpbmF1dC5i
+ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAMspHwijR4MCx2CZs
+sHRd1J21Y/QTeBLcfUPy7cMFwlASEEItYBT+5Z6Bh1UusPdZaSkDgH94NyEP1Ayk
+1jmToANHN+szrWz4wd8ZYiUCnACIYRTv1jDNV8pFqfgbYxMGNFPIoc1LTniNSiWe
+RfJ+zhFfIsYhN9ykL08GvfYDkThrOPn/i2cd/NjLajUXAr2UXla0HRpr3dr2L/0Q
+/vLVAl7j5rzMDUuvprwxJSANlZMHNoz43cJhyb/uf94T9XWuoryH/mQBg3McYrNC
+Ub1iY5BW/4fmTkmnIU/L/t/vH+aFBrdhRpT6T+icOC6/pN1sOU+iymNhmZNeq5Oj
+YY+sLg==
+ </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>
+MIIDMDCCAhigAwIBAgIVAITAPpgbgYKWacifpIzYiDCLJilfMA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
+OVoXDTM1MTAyNjIwMzAzOVowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCRoNFDIELAzMOv/zIUfIZG
+/usJeoEA7jnJcoTA5P0G0Y8DBKLk7YuF+EA+zQDBSacBsCCTX9XmC1nCXWb1D7s1
+r6ITuF6o3bUNYQd9hFF4BWzLSsdbrtuqkcDDW8nXWe6c/zUbenRS/0EGSoct0W7S
+dyGQOC9gxeONsrznA7Uo/V29HiRrFxiwgRTAnVBAjmrANOaX1Y8humP62EqpYJOM
+L/XdwweoMIY8YqqmVLkyAuLSW9okFq0+lLIIlaXpn/3rF1lJQ8drbjW+rKennkYA
+gGBLDA4rGiY9XhoMG55mgWgAUVcABrST/+HxfmBy63+/2tEsojPh9njPeMpH/Mhf
+AgMBAAGjaTBnMB0GA1UdDgQWBBTgnucKIXIOOhfdr039lc5N+UHBBTBGBgNVHREE
+PzA9ghFpZHAuZWR1aGFpbmF1dC5iZYYoaHR0cHM6Ly9pZHAuZWR1aGFpbmF1dC5i
+ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJzKRXTVuiT1qIVUW
+kB9SLKFk5e/dDeX42pDidr8PDb+go/lFMQI5wigbH9JsMes21rn7bWkZIn/wH+WP
+WPvMIvr1SSrqoGgysRUdeoUpqSAn4JgiR18tOrEP90InWflMv0xeM3LDK43tZpP3
+68a5KQOKu2zKyCQ0t8+bcy9RJIsgQvDv6yUXtNsx8q4nc6jZ16gM19Bp63aME4mg
+LR/to7vufiLAWBELcYxGqPvuaETJDZ2msYwnaWp9uWn4IzadH5WeS16yKxBsJAnY
+JbvCJSPArtmzQsUC6GSq/Col1DpLLbkqxE01S0Zg4Evi8jImwyhTYnNdLIB2tvgZ
+M5p59Q==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Enseignement Secondaire de la Province de Hainaut</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">eduHainaut</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.eduhainaut.be</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Technical Support</md:GivenName>
+ <md:SurName>Technical Support</md:SurName>
+ <md:EmailAddress>webmaster@eduhainaut.be</md:EmailAddress>
+ <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.esufa.edu.co-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.esufa.edu.co-idp-shibboleth.xml
new file mode 100644
index 00000000..9ef18965
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.esufa.edu.co-idp-shibboleth.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.esufa.edu.co/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://colfire.co" registrationInstant="2014-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="es">http://colfire.co/?page_id=55</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esufa.edu.co</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">ESUFA - Escuela de Suboficiales de la Fuerza Aerea</mdui:DisplayName>
+ <mdui:Description xml:lang="en">ESUFA - Escuela de Suboficiales de la Fuerza Aerea</mdui:Description>
+ <mdui:Logo height="116" width="104">https://www.esufa.edu.co/sites/all/themes/escudos/images/logo1.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUR3iBFy9n6nA18hMLsJm30tEjr2IwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTda
+Fw0zNTEwMjcxNTE5MTdaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfGR5eateagj0PnAw+ysxMmMmQ
+td6hMmG/hAHPUtIgGjriykJW62N9Pdnq96sQb6yGsErFcWwid0hPSNZUAqPjx32w
+akkVQnXmYwWnlldRXueFFyerHvD/vPBDrsClEQFDNoIAjtwcXW2myrdrY9Uvr7s0
+1HR+8ZANeddKnvn0BiZGvOR48MS8+JCAP2sCF0S0HcP49fCM8t/c3tl52HDgbeO6
+kfn4VH86JTyhghC2bNs9RM5UyzSiPYneSPuZDxi6mTxfyFIwAvYT+TcBTcP+/cYa
+4FXsF7TF+umPxRqnLMknFxOLsvblM5GDDuJzn3Yja+4GM5HyO4aprMlCqkL/AgMB
+AAGjZzBlMB0GA1UdDgQWBBQxt9Jk6AVo/EYsLzL+207UfLe7jDBEBgNVHREEPTA7
+ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIAeemyYbRf2nWT67tetcpVM
+Gd2+Ws9nQhUEN/ZWTjCFu372m8o/nzNNNAh5+xSTFcrd6VMCbbm+XnVtPwt2WoRg
+NCCz8K45VIWmrgGwm8Nt6U+oAkumlswuAepJcfahsnKgv0U7qf2BVSL0jpy19c0p
+0H1p+mLIonGK1qOogKyfBZjyxawnTzZofLtfA8vUx7/IDuxTfgV6nnnc+Z/aDATB
++fmWslC91CbfhCbMDmFA5qlNhCkvByn4ftNc4KVFXBa9yBZxCtv1ICIrMfNeGn6Z
+MRirrsA/Pf/HUBYniJVLRsfIJEZTI7zKqnKaS6EmM8qq40LW/Myj2MtEJ1rW1VA=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUG1YyO7RicWuwZ/ERCAXtNnt0OUMwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTZa
+Fw0zNTEwMjcxNTE5MTZaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCr05q168l9MK8YfXb9yxrL4QV
+a2gxg+CvJc3VlEiZ+upXbmnZCOr+5O8CccokRBV3WG9qfS5rLAZl/AmxF/Stcs0s
+an0eeMin9t44FZU12HM5VX1IS1oIVVOSp/EF7t5puIIMqPN6kIbKQOT3EqxOTEe/
+W+M0ofl+/DZg0qgDENMUaG9FU7qrA/4pehmytdv9JmhSTycg4nipr5iVAFvWy4vk
+5zNFzCvqtHxE1CegJUF72M5EITEUqihafnGoxAXVEyIWtD3q+XcxmI1PF6eUD7jH
+R+RBbdDKrfMsec3Dpd3/UsGcVKxztfUcSf/Yh2VRBkLLPixKdCE8ePzbIlHfAgMB
+AAGjZzBlMB0GA1UdDgQWBBRp8fBDzfSEIvqWJKHvQviqpLvUHzBEBgNVHREEPTA7
+ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGxgl6cHcqOCDahO5pJaSlDV
+meFA/vg53pTunK4VVtbZwoagVUVOsYW38zU2ANKXetkx5yK38O7SPWL6GF7vVp9M
+VA3ILqEDEOYRgnjGA+sw5P3KU0zhzT6948EeD5qSdtfXxzlvh15I2nSeL9/8O3wQ
+1o8pKnIC0maLySulIP9BxFYBJExJi/7LrxNFPCsMAroHq7XEiEQyXi9f4ZWE+DJp
+pBwyZmIKeUrMNRxpglFHiSIrrV44vzBTElJEUpB2cLnwGxu8LK2LYP/DkDDQl5Di
+atE5Y2eHiCk2ku+gXCHtL6uQrGyxSIQHWcH49ohEKS/Jm2qnMNkG/YLE5PLefz0=
+ </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>
+MIIDKzCCAhOgAwIBAgIUHzrD9JrVS3L07QCTwd1q9TdsaoMwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTda
+Fw0zNTEwMjcxNTE5MTdaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcSXgBUncSqkmxkIxtxSK8e4k3
++XZ1qbxhkHiGT+tSzxWNdyNy7JmNtpKNTDSvFF9el+sICWkdMUYj+LeFXB6gcJDK
+tr6tp3fVaXRKYXaT1rrStRbIzcRe7XMRqtRZTVnBhAXY7e0TJgKyZcSGrWz0wnxl
+fk0EKwBIVK3CiguAjndelPJbp11ZOSHOgUWBExAwUAKecb02IhgWe5g79ZdGB2be
+0MC/e2xB9DfVbQ/Z+8Iz9hxx+njvTiHknaypJDV2KQHeUXLxhL86FCwCdaCFBYO9
+kBBG5sVimpoY2xBrngdJuAagYhcWwExcIEswJmx1W+pmgempFk0cNO6w4zdJAgMB
+AAGjZzBlMB0GA1UdDgQWBBSzwJJHyRiw4DQZnbs6x67gmzOzHTBEBgNVHREEPTA7
+ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIad6RjxaKwApgDD3iY13HnZ
+2tmfEov0VY9hBBHI6jUJIb4+qWw4BIlbYzx8Z4r1Hc8B7J/xFU4oOevsLzuKiQbY
+89x01GEXT3cFPTZEoz6DX6npNBgzQVAGnC74f/nxGIy3Sbi8gJCSousfOn1H5LFg
+CIDMjvtwdqw0t+EDARXO5vBJ4UCtPAW/9dsnzcCliUYWCJ04iN+UMejkazqAIqbz
+3HGnmU5jCG2qaLE0D6NaZkj7wptqkwRpGm+vDE8YsEIhhl+LbsvA1GY579P978Pt
+3iMRmTxHiqJ9Le8DuivZ/9PrQRFDlqzrgfbADCkJRsowwXq3pTJZYuxs+9ynVEw=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esufa.edu.co:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esufa.edu.co:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.esufa.edu.co/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esufa.edu.co/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.esufa.edu.co/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esufa.edu.co/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esufa.edu.co</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUR3iBFy9n6nA18hMLsJm30tEjr2IwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTda
+Fw0zNTEwMjcxNTE5MTdaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfGR5eateagj0PnAw+ysxMmMmQ
+td6hMmG/hAHPUtIgGjriykJW62N9Pdnq96sQb6yGsErFcWwid0hPSNZUAqPjx32w
+akkVQnXmYwWnlldRXueFFyerHvD/vPBDrsClEQFDNoIAjtwcXW2myrdrY9Uvr7s0
+1HR+8ZANeddKnvn0BiZGvOR48MS8+JCAP2sCF0S0HcP49fCM8t/c3tl52HDgbeO6
+kfn4VH86JTyhghC2bNs9RM5UyzSiPYneSPuZDxi6mTxfyFIwAvYT+TcBTcP+/cYa
+4FXsF7TF+umPxRqnLMknFxOLsvblM5GDDuJzn3Yja+4GM5HyO4aprMlCqkL/AgMB
+AAGjZzBlMB0GA1UdDgQWBBQxt9Jk6AVo/EYsLzL+207UfLe7jDBEBgNVHREEPTA7
+ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIAeemyYbRf2nWT67tetcpVM
+Gd2+Ws9nQhUEN/ZWTjCFu372m8o/nzNNNAh5+xSTFcrd6VMCbbm+XnVtPwt2WoRg
+NCCz8K45VIWmrgGwm8Nt6U+oAkumlswuAepJcfahsnKgv0U7qf2BVSL0jpy19c0p
+0H1p+mLIonGK1qOogKyfBZjyxawnTzZofLtfA8vUx7/IDuxTfgV6nnnc+Z/aDATB
++fmWslC91CbfhCbMDmFA5qlNhCkvByn4ftNc4KVFXBa9yBZxCtv1ICIrMfNeGn6Z
+MRirrsA/Pf/HUBYniJVLRsfIJEZTI7zKqnKaS6EmM8qq40LW/Myj2MtEJ1rW1VA=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUG1YyO7RicWuwZ/ERCAXtNnt0OUMwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTZa
+Fw0zNTEwMjcxNTE5MTZaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCr05q168l9MK8YfXb9yxrL4QV
+a2gxg+CvJc3VlEiZ+upXbmnZCOr+5O8CccokRBV3WG9qfS5rLAZl/AmxF/Stcs0s
+an0eeMin9t44FZU12HM5VX1IS1oIVVOSp/EF7t5puIIMqPN6kIbKQOT3EqxOTEe/
+W+M0ofl+/DZg0qgDENMUaG9FU7qrA/4pehmytdv9JmhSTycg4nipr5iVAFvWy4vk
+5zNFzCvqtHxE1CegJUF72M5EITEUqihafnGoxAXVEyIWtD3q+XcxmI1PF6eUD7jH
+R+RBbdDKrfMsec3Dpd3/UsGcVKxztfUcSf/Yh2VRBkLLPixKdCE8ePzbIlHfAgMB
+AAGjZzBlMB0GA1UdDgQWBBRp8fBDzfSEIvqWJKHvQviqpLvUHzBEBgNVHREEPTA7
+ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGxgl6cHcqOCDahO5pJaSlDV
+meFA/vg53pTunK4VVtbZwoagVUVOsYW38zU2ANKXetkx5yK38O7SPWL6GF7vVp9M
+VA3ILqEDEOYRgnjGA+sw5P3KU0zhzT6948EeD5qSdtfXxzlvh15I2nSeL9/8O3wQ
+1o8pKnIC0maLySulIP9BxFYBJExJi/7LrxNFPCsMAroHq7XEiEQyXi9f4ZWE+DJp
+pBwyZmIKeUrMNRxpglFHiSIrrV44vzBTElJEUpB2cLnwGxu8LK2LYP/DkDDQl5Di
+atE5Y2eHiCk2ku+gXCHtL6uQrGyxSIQHWcH49ohEKS/Jm2qnMNkG/YLE5PLefz0=
+ </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>
+MIIDKzCCAhOgAwIBAgIUHzrD9JrVS3L07QCTwd1q9TdsaoMwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTda
+Fw0zNTEwMjcxNTE5MTdaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcSXgBUncSqkmxkIxtxSK8e4k3
++XZ1qbxhkHiGT+tSzxWNdyNy7JmNtpKNTDSvFF9el+sICWkdMUYj+LeFXB6gcJDK
+tr6tp3fVaXRKYXaT1rrStRbIzcRe7XMRqtRZTVnBhAXY7e0TJgKyZcSGrWz0wnxl
+fk0EKwBIVK3CiguAjndelPJbp11ZOSHOgUWBExAwUAKecb02IhgWe5g79ZdGB2be
+0MC/e2xB9DfVbQ/Z+8Iz9hxx+njvTiHknaypJDV2KQHeUXLxhL86FCwCdaCFBYO9
+kBBG5sVimpoY2xBrngdJuAagYhcWwExcIEswJmx1W+pmgempFk0cNO6w4zdJAgMB
+AAGjZzBlMB0GA1UdDgQWBBSzwJJHyRiw4DQZnbs6x67gmzOzHTBEBgNVHREEPTA7
+ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIad6RjxaKwApgDD3iY13HnZ
+2tmfEov0VY9hBBHI6jUJIb4+qWw4BIlbYzx8Z4r1Hc8B7J/xFU4oOevsLzuKiQbY
+89x01GEXT3cFPTZEoz6DX6npNBgzQVAGnC74f/nxGIy3Sbi8gJCSousfOn1H5LFg
+CIDMjvtwdqw0t+EDARXO5vBJ4UCtPAW/9dsnzcCliUYWCJ04iN+UMejkazqAIqbz
+3HGnmU5jCG2qaLE0D6NaZkj7wptqkwRpGm+vDE8YsEIhhl+LbsvA1GY579P978Pt
+3iMRmTxHiqJ9Le8DuivZ/9PrQRFDlqzrgfbADCkJRsowwXq3pTJZYuxs+9ynVEw=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esufa.edu.co:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">
+ ESUFA - Escuela de Suboficiales de la Fuerza Aerea
+ </md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">
+
+ ESUFA - Escuela de Suboficiales de la Fuerza Aerea
+ </md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.esufa.edu.co</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="es">http://www.esufa.edu.co</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Carlos Ramirez</md:SurName>
+ <md:EmailAddress>ingenieria@renata.edu.co</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..ba83ddd9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.exe-coll.ac.uk/idp/shibboleth">
+ <!--
+ This is a Shibboleth IdP for Exeter College.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-22T10:10:10Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Exeter College</mdui:DisplayName>
+ <mdui:Logo height="80" width="60">https://www.exe-coll.ac.uk/Images/ukfederation/eclogo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDNDCCAhygAwIBAgIVAOBgSoILoqxp6Sd97P44EOTJO6BmMA0GCSqGSIb3DQEB
+ CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
+ NTBaFw0zNTEwMDUxNDQ4NTBaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
+ azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJDt47Xw9yoz4+kmm7d8
+ aUBogCQUuoYHtKfSHtQXSwWzAGA44zNhRXrCtkaWQRcWziwpbEISl7N1DA/Et7K8
+ GWxkPHLb9AY1hmuqJhI7VTcnRW9K1c35dkcU8y8iq/KtEs/Scqykk7mRdYP0220z
+ MkGsKyGX4lnca+3qjTZEjIQmmrQkG6MT2TSwYIP4okPVsf0psa4gFm9zIcQ833xq
+ aM/JeGhWy8wC1XAR0QdON4KOmlRbOz8Gt24SZ5uFCYP/0M0bsi5bT9VFbIzDHeOU
+ 2Ksp3LCGW+auudlvpYNCw/f/z6zJzyjbEaaZWEC5EUNp5I17BNut+AHfQEUGg2KW
+ QmcCAwEAAaNrMGkwHQYDVR0OBBYEFECBehw5Kkbqihxtl4i9xVqD+/FnMEgGA1Ud
+ EQRBMD+CEmlkcC5leGUtY29sbC5hYy51a4YpaHR0cHM6Ly9pZHAuZXhlLWNvbGwu
+ YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGCt0iihFupc
+ 7R0GLGlBisiOFz+9+DH3m1c7AXUOBSj7JeDlhD/HeN0abj4oRu3vNuDSSVbQ8r2A
+ 0eJAMlT+2KGjvDOpgZZM6ch2b4DwlDmaK52GAMBP34muY42GaoCA9EJ9BAM+sLQb
+ OQXdOxtfEXP/Fw9khCTGXsLMm+069lR+1c0PFhKEY9ZMIYEL9H+VvXpyRRA70QP9
+ glZa39ROiCKWcxTaat0q4uGrfd7rFDOZu33wfDSjQcznJdLYrsppbKWGK7gE5C8+
+ EEwb4NmJVaB29/9uUdGVA7AWh5HnuGgc5mGXx7TGwFx8/xE7qk8XjwyT24BbFJ0A
+ Ldsw0D2RloY=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMzCCAhugAwIBAgIUBbXkHi70ulJrjIlvWCIzdMBJiHEwDQYJKoZIhvcNAQEL
+ BQAwHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVrMB4XDTE1MTAwNTE0NDg0
+ OFoXDTM1MTAwNTE0NDg0OFowHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvwPQqi7IeM//8uxLAoaJ
+ p6buQefMlgcZp26Ab0lKfllI9qXnbw7mcZVJM6GVAgiSss3qmjnbCrSNvIe/lsK6
+ 2Bhl7JIC50VPbR3DXYJiCZpiWAptaIJ3lFSQMBA/6aIAtqO4Uoq0mAl//qWdFnKY
+ cMw3BRhI1YKTEQa78jetAklmnKEQ+8RruirfcV4l10Sn/HN54WFAzhuH/W6numGo
+ NOUcp7rRhiVtBPt6mhZQQZkGCG+EkOMh8P72OBDZ5Ky9zrloPQvbv+MN26dsuOWt
+ Na4R32Y+LA0zrVa2qXLsE63cJs1OS2GgZfbzhtcbsKyaRNazH39mjyw8XthMj1nN
+ hwIDAQABo2swaTAdBgNVHQ4EFgQUdcbpv8lSyws0CaM6oeNcbjyumiIwSAYDVR0R
+ BEEwP4ISaWRwLmV4ZS1jb2xsLmFjLnVrhilodHRwczovL2lkcC5leGUtY29sbC5h
+ Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlALDqVXXotPR
+ SIewI6t+QxCe+7U/V3gI/pREVIUhKgyURFkarxSbAoqLma6ttM8FjQijbRPUKMGl
+ a0ug36cGohcVYKtGKySnuQDZc6MpmtjpQBYR3O1RPLXRPQpFB46qXTd8jJE3eVXI
+ WIhoDPHwXECNph7Zc+37/qAplKADt+gCqOZOvb/dFywG61lkv2RLfqWu0jZAwBeB
+ xd2NnxQAzOGQXarWIOBDdC+Rm57Yo4QcDIDaWIFai02h30SDVNbD2IOKTTFlB9BU
+ VbqI3mpvBerOgVstriPdd4rGSb6qfF+cZYiwroaQ6zEri+sVrV8qZ/w4+Xt4ncu0
+ jr+x5aa4EQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDNDCCAhygAwIBAgIVAKrBnUGd75sXdnSjpLBrMHUL9Z7hMA0GCSqGSIb3DQEB
+ CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
+ NDlaFw0zNTEwMDUxNDQ4NDlaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
+ azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKf2PWKyWWY1Xv/CvpBI
+ a4ajaR9YX4wdOV9Ba+zdB3kHQyXLSMNb4OV7xaRaih6XzRjUm8tBUki+MU8k5Ncr
+ R8w8EzLnxLiqsuIn+5WdXng1CaGNnw0YYzyfxU/3zuLy7/QnoRUj8TKC6zzdAanl
+ 05idK4kB6ZS9LNnfEq9GYRYJBBaFI0XAKMHqXGKRBmlTThd00qb+gpcSkXRDmafA
+ JBBRmIc62ilViQkTB6Nu6dUmQTDTWRip3X6rJynKXX1vHCZP00aXOBiZgbD+Nu+F
+ mMXEqMvA+Nm+VzX0CrffvfTLbZWoGXjea1jKYT7S+L/bt0wEcFnPTiX4ITNos18/
+ mLUCAwEAAaNrMGkwHQYDVR0OBBYEFNBFc8Ql0nmSGxBro64kDuZHn+KRMEgGA1Ud
+ EQRBMD+CEmlkcC5leGUtY29sbC5hYy51a4YpaHR0cHM6Ly9pZHAuZXhlLWNvbGwu
+ YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAA/sn2WL7uDS
+ Z1txLqmXLjqCD2K8U3VPgJqsQ7da+w/MQDiYQUKs4iUe/HJNN9mkGrg4BWq/YB0v
+ RP922H76+ne+JFFV/k+EZxpVcjiB+kLeIiBS341Wucdh3gJW8Sultx76Eu/POH+f
+ ohmndUNvofFwbMSPholtz6YhrlgXoWWzp7EVqraOZJJs2PFylngOytoqz8MKsoqg
+ Zi1Eyw3fIflsineDleFHE0ALKqbf2vA7r931j/GntEQ5gZfr4ytdxu6isiGM3adg
+ ZySpPoJYHPmJimQ7K8FRBhRuiXinhoQm9Pi/5VbPO4fZmX2rYFTUHE+6zDB2gJjN
+ /F0mlEEmxK8=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.exe-coll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.exe-coll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.exe-coll.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDNDCCAhygAwIBAgIVAOBgSoILoqxp6Sd97P44EOTJO6BmMA0GCSqGSIb3DQEB
+ CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
+ NTBaFw0zNTEwMDUxNDQ4NTBaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
+ azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJDt47Xw9yoz4+kmm7d8
+ aUBogCQUuoYHtKfSHtQXSwWzAGA44zNhRXrCtkaWQRcWziwpbEISl7N1DA/Et7K8
+ GWxkPHLb9AY1hmuqJhI7VTcnRW9K1c35dkcU8y8iq/KtEs/Scqykk7mRdYP0220z
+ MkGsKyGX4lnca+3qjTZEjIQmmrQkG6MT2TSwYIP4okPVsf0psa4gFm9zIcQ833xq
+ aM/JeGhWy8wC1XAR0QdON4KOmlRbOz8Gt24SZ5uFCYP/0M0bsi5bT9VFbIzDHeOU
+ 2Ksp3LCGW+auudlvpYNCw/f/z6zJzyjbEaaZWEC5EUNp5I17BNut+AHfQEUGg2KW
+ QmcCAwEAAaNrMGkwHQYDVR0OBBYEFECBehw5Kkbqihxtl4i9xVqD+/FnMEgGA1Ud
+ EQRBMD+CEmlkcC5leGUtY29sbC5hYy51a4YpaHR0cHM6Ly9pZHAuZXhlLWNvbGwu
+ YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGCt0iihFupc
+ 7R0GLGlBisiOFz+9+DH3m1c7AXUOBSj7JeDlhD/HeN0abj4oRu3vNuDSSVbQ8r2A
+ 0eJAMlT+2KGjvDOpgZZM6ch2b4DwlDmaK52GAMBP34muY42GaoCA9EJ9BAM+sLQb
+ OQXdOxtfEXP/Fw9khCTGXsLMm+069lR+1c0PFhKEY9ZMIYEL9H+VvXpyRRA70QP9
+ glZa39ROiCKWcxTaat0q4uGrfd7rFDOZu33wfDSjQcznJdLYrsppbKWGK7gE5C8+
+ EEwb4NmJVaB29/9uUdGVA7AWh5HnuGgc5mGXx7TGwFx8/xE7qk8XjwyT24BbFJ0A
+ Ldsw0D2RloY=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMzCCAhugAwIBAgIUBbXkHi70ulJrjIlvWCIzdMBJiHEwDQYJKoZIhvcNAQEL
+ BQAwHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVrMB4XDTE1MTAwNTE0NDg0
+ OFoXDTM1MTAwNTE0NDg0OFowHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvwPQqi7IeM//8uxLAoaJ
+ p6buQefMlgcZp26Ab0lKfllI9qXnbw7mcZVJM6GVAgiSss3qmjnbCrSNvIe/lsK6
+ 2Bhl7JIC50VPbR3DXYJiCZpiWAptaIJ3lFSQMBA/6aIAtqO4Uoq0mAl//qWdFnKY
+ cMw3BRhI1YKTEQa78jetAklmnKEQ+8RruirfcV4l10Sn/HN54WFAzhuH/W6numGo
+ NOUcp7rRhiVtBPt6mhZQQZkGCG+EkOMh8P72OBDZ5Ky9zrloPQvbv+MN26dsuOWt
+ Na4R32Y+LA0zrVa2qXLsE63cJs1OS2GgZfbzhtcbsKyaRNazH39mjyw8XthMj1nN
+ hwIDAQABo2swaTAdBgNVHQ4EFgQUdcbpv8lSyws0CaM6oeNcbjyumiIwSAYDVR0R
+ BEEwP4ISaWRwLmV4ZS1jb2xsLmFjLnVrhilodHRwczovL2lkcC5leGUtY29sbC5h
+ Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlALDqVXXotPR
+ SIewI6t+QxCe+7U/V3gI/pREVIUhKgyURFkarxSbAoqLma6ttM8FjQijbRPUKMGl
+ a0ug36cGohcVYKtGKySnuQDZc6MpmtjpQBYR3O1RPLXRPQpFB46qXTd8jJE3eVXI
+ WIhoDPHwXECNph7Zc+37/qAplKADt+gCqOZOvb/dFywG61lkv2RLfqWu0jZAwBeB
+ xd2NnxQAzOGQXarWIOBDdC+Rm57Yo4QcDIDaWIFai02h30SDVNbD2IOKTTFlB9BU
+ VbqI3mpvBerOgVstriPdd4rGSb6qfF+cZYiwroaQ6zEri+sVrV8qZ/w4+Xt4ncu0
+ jr+x5aa4EQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDNDCCAhygAwIBAgIVAKrBnUGd75sXdnSjpLBrMHUL9Z7hMA0GCSqGSIb3DQEB
+ CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
+ NDlaFw0zNTEwMDUxNDQ4NDlaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
+ azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKf2PWKyWWY1Xv/CvpBI
+ a4ajaR9YX4wdOV9Ba+zdB3kHQyXLSMNb4OV7xaRaih6XzRjUm8tBUki+MU8k5Ncr
+ R8w8EzLnxLiqsuIn+5WdXng1CaGNnw0YYzyfxU/3zuLy7/QnoRUj8TKC6zzdAanl
+ 05idK4kB6ZS9LNnfEq9GYRYJBBaFI0XAKMHqXGKRBmlTThd00qb+gpcSkXRDmafA
+ JBBRmIc62ilViQkTB6Nu6dUmQTDTWRip3X6rJynKXX1vHCZP00aXOBiZgbD+Nu+F
+ mMXEqMvA+Nm+VzX0CrffvfTLbZWoGXjea1jKYT7S+L/bt0wEcFnPTiX4ITNos18/
+ mLUCAwEAAaNrMGkwHQYDVR0OBBYEFNBFc8Ql0nmSGxBro64kDuZHn+KRMEgGA1Ud
+ EQRBMD+CEmlkcC5leGUtY29sbC5hYy51a4YpaHR0cHM6Ly9pZHAuZXhlLWNvbGwu
+ YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAA/sn2WL7uDS
+ Z1txLqmXLjqCD2K8U3VPgJqsQ7da+w/MQDiYQUKs4iUe/HJNN9mkGrg4BWq/YB0v
+ RP922H76+ne+JFFV/k+EZxpVcjiB+kLeIiBS341Wucdh3gJW8Sultx76Eu/POH+f
+ ohmndUNvofFwbMSPholtz6YhrlgXoWWzp7EVqraOZJJs2PFylngOytoqz8MKsoqg
+ Zi1Eyw3fIflsineDleFHE0ALKqbf2vA7r931j/GntEQ5gZfr4ytdxu6isiGM3adg
+ ZySpPoJYHPmJimQ7K8FRBhRuiXinhoQm9Pi/5VbPO4fZmX2rYFTUHE+6zDB2gJjN
+ /F0mlEEmxK8=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.exe-coll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Exeter College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Exeter College</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.exe-coll.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IT Services</GivenName>
+ <EmailAddress>mailto:itserivces@exe-coll.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Nigel</GivenName>
+ <SurName>Burrows</SurName>
+ <EmailAddress>mailto:NigelBurrows@exe-coll.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IdP Admin</GivenName>
+ <EmailAddress>mailto:idpadmin@exe-coll.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index cb546e36..9c516c64 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -56,6 +56,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bygland.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bykle.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmi.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">danielsen-skoler.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonhjemmet.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonova.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmmh.no</shibmd:Scope>
@@ -119,6 +120,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.verdal.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fet.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhs.mil.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fitjar.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjaler.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
@@ -142,6 +144,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fusa.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fyresdal.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gaular.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gausdal.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">giske.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjemnes.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjerdrum.kommune.no</shibmd:Scope>
@@ -154,6 +157,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gratangen.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grimstad.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grong.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grue.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.alesund.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.haram.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.orskog.kommune.no</shibmd:Scope>
@@ -211,6 +215,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hyllestad.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inderoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">innfjorden.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iveland.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jolster.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
@@ -243,6 +248,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lesjaskulane.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lier.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lierne.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillehammer.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillesand.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lindas.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lomskulane.no</shibmd:Scope>
@@ -290,6 +296,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmh.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nome.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-odal.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordkapp.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordreisa.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
@@ -309,6 +316,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovgs.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oya.vgs.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oyer.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oygarden.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phs.no</shibmd:Scope>
@@ -350,6 +358,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selskolene.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfj.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sigdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sintef.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skanland.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skaun.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skiptvet.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
index 55d2a1f7..72769773 100644
--- a/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
@@ -1,43 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hainaut-promsoc.be/idp/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hainaut-promsoc.be/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hainaut-promsoc.be</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Hainaut-PromSoc</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Students and Teachers from Social Promotion Schools of Province de Hainaut</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Hainaut-PromSoc</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Etudiants et Enseignants de l'Enseignement de Promotion Sociale de la Province de Hainaut</mdui:Description>
+ <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-hps-16x16.jpg</mdui:Logo>
+ <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-hps-291x88.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
+ <mdui:DomainHint>hainaut-promsoc.be</mdui:DomainHint>
+ <mdui:GeolocationHint>50.41719089999999,4.448670300000003</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</md:Extensions>
- <md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIEejCCA2KgAwIBAgIRAOJDreYdfwftYXxuTiaSgikwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTcwMDAwMDBaFw0xNzA1MTYyMzU5NTlaMEQxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWaWRwLmhhaW5h
-dXQtcHJvbXNvYy5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALaj
-3QToxwLfTZdKn1LyscWG0WEFxqm4szedeTdv+Z0GN7vzAFkCJ5uIN0TMsS0pI7Bk
-DpgweMIgIjyAic13ibFgdPDK97duAhfqAGMlgxRvYeil42X6kCNC5OaUPszuXU8t
-HBLW2ZTpptKpqud5X0hNijbAghLZDmn7Eb+rQT8+4zQdZJwV4ApYjNT65oTWTmHX
-xj+LI65fYOyTPGW30rYtX9m7TJUoR1GNsaOzhTlulE0wFiXQMct8qWpRA43tnnPJ
-h+LSBtS5tqZeEd7NP0V2FM1FMkpghrDewy1Truj0+WniTcBZJTtnYUbzsImNZIg6
-OCNqkxNKtIkzLLX9h7kCAwEAAaOCAXMwggFvMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTsFp6mcbFldk8J8qcZ6VgvqL4y0DAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYDVR0RBBowGIIWaWRwLmhhaW5hdXQt
-cHJvbXNvYy5iZTANBgkqhkiG9w0BAQUFAAOCAQEAqWXIoIBh/n3Qd92KOkrtLD0O
-MCPdoOlIe+WfzPfEFEre1QcGNIiywbTH5zR7n0GttMvopttilSIEH4JePV9uiX5m
-DdcGukEMCCtMTaahMeXTSiS9v1RE2FGe9tx1zblHOkpI9V43pWLb9zk3hitGWqN4
-Zce+zsOUf6D8xfDHAReHt5RaWtfSmlHENVix51e5kQ8Q5WAkABvSSVEvOtB1Lqlp
-Ce+uSCFKDpGchEC4Wmfb3W3ka1Vi5Q5ARUNvsjPO02XSbXYJ0bTGFUnJcOKytFBp
-HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
-</ds:X509Certificate>
+MIIDRDCCAiygAwIBAgIVAN68rKymbP0przSDvaG0eMoh/UGiMA0GCSqGSIb3DQEB
+CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
+MTIxMTQ0WhcNMzUxMjAzMTIxMTQ0WjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
+cm9tc29jLmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgFh9v8nu
+DZ22vG1hQaV9mA6+H6eobWNhEKHO/YdcC+uNU8dNrHgfvdGjTrrIk9BGFdsTuxak
+UnmVYQho3ASbc7LQdTlxJegvogiI6e+zl8vGrwKyhCYmAz3oDHnLA/YAkgk0EWRE
+juD2qYAYfgqMg/M6goWyn1EsCUk9pFc4D1tnmqsUWzG2dTwAfOlbDduMhJrU9F+v
+nNlayDAHWiPxASDsbQSRYtkA9O4xjujLcj65r3p2c+Xba5fVu9M57yeykvjVkYs2
+x+3rKyMzLEV46emeLCHiltpzHr3VJBlkT6ny66eXYd2Y7nTnRNEka/JACmcFFpO4
+hHPl8Rrf0qBqiQIDAQABo3MwcTAdBgNVHQ4EFgQU2/sCjD8jZll6GJw9Kf5qRcu+
+T7owUAYDVR0RBEkwR4IWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZYYtaHR0cHM6Ly9p
+ZHAuaGFpbmF1dC1wcm9tc29jLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQBqaAQAbDvMlqplLVZpzw0F+UgxxsOL3kI2ATOH6jGrTqrWA/7bj8Ma
+oYM22iUjtuMPa9r9+F3IA08krhALvMhgRsseM8n0kxWxIWtcGEE37MlHgaCsNUXt
+FnkP8thyCr8CnwzqWpFj5ouXaNqtDhx+qFM08XBDJh2mkCDQriD8lqHE2NUnfgGl
+Du+vSV7PfHKMdpMYJLFmT+Ry3bjrNA/WibJkQ4Hf9OtuOQ4M5k3VodWj2LCO4Ybh
+lGfxo5nF26RIBrY4mtTninIvP75nJjAJoS029RDpoYpl8Mh8t+lxsY0tisaYoJgF
+FgGl1jbigT4J3Bxxv1wcRfblufkR5grP
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDRDCCAiygAwIBAgIVAPLtvCrrYfdTvxrnQNxT4wh/M2m9MA0GCSqGSIb3DQEB
+CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
+MTIxMTQyWhcNMzUxMjAzMTIxMTQyWjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
+cm9tc29jLmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9Z7Y1aEi
+Bjtge0mCkmRNZBB+ZCJa/w1WFVh2kuY0gFYzeHdsN91yxUiaDujaXigN9rl9Z+cv
+AE/RN0MQtZbRROu89WA6ZcDcgsvcKLWfXr/RjC/nmtxuwBcvfJyFphXaaz1V2334
+6m1lIFQ43aE5s4NhrtENXhiukbHeCvaN1rwjdski73+POVKTDUr4a00r8/tybJgO
+iUZrFDbRBZJ/TnQohhhGWTJEHbrvYApwKju8JQcMwk7R+bABsgf/oqki4pNmxXH8
+HevxO72Exn6uVi6AWO5rGiQX+jIyIJZprZCPeUoMjge5bpz3+vRlm9kO9Y0ablbT
+urOW9BAgDEHcNQIDAQABo3MwcTAdBgNVHQ4EFgQU6QJuMQqUcLoXMT4CrRK/yO8x
+z1wwUAYDVR0RBEkwR4IWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZYYtaHR0cHM6Ly9p
+ZHAuaGFpbmF1dC1wcm9tc29jLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQDmP+yXnrrlRJ2D+inYx0mRAClGzzo3fG4Jgr46DWXrsRcrCJH3sjQr
+5MKNtgyPyZDy/NXcNtVS3IFJZkg27pokUD28RQtRB1dcCT++YIoViKtXnPct9nSQ
+jnORWcsiw2Yx48rauTpJzA5vIEmwSv79iidoalBaxpiO7gXJL7JNqgVjhjBd9yDX
+RVL+pTLN5MhbSF6izeLcpvI/xhneStzW3b3IhHS+rPikg3GufLhM++5A45qAAqAz
+VRQosvXh6gvNKUDJpqCMK+m4b/Ue9rOBqtV9g8peJfZ9TQ9CKwDB0UbPPCfEEI/7
+MilG31thHKJnTIULp8CAkF+DIFtOcpk6
+ </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>
+MIIDQzCCAiugAwIBAgIUcuiw7sw3OSPjhIvrmbLChEBZ60AwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZTAeFw0xNTEyMDMx
+MjExNDJaFw0zNTEyMDMxMjExNDJaMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXBy
+b21zb2MuYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfLBJTJiLz
+o30Vpv8ZwM2q/p9p6RdXo/zpvhNO3nkcvLYHPZssOR/u6MDCNNbjP/3PeLdqepvo
+UOzEw3hPg/IWsoPTnr3MYHRWYmzvBnr33rA/QAmv6OnW3RQjtCwQFH5UXQ9S/Xv3
+o5YbB8vRaVrPZPd5EzyXoyo2zIZc5si2pbQj/0B40BPI8M+dsrInvtwOCJ6CgLkq
+zCD1bzY0P3EtbxGRFSA4fyZDO+72sIXX1fU0jniek/oEDTjRsi0svgUdwNcTi+qV
+totEXOvkjv8jRJnzh0E2jOqGeXcSv6673gZvddG+Tcy8aQlNhfF9nvA9scNxtU1s
+b9Kor1NNei7ZAgMBAAGjczBxMB0GA1UdDgQWBBQBxbm5XMUopQNiz45GhwbwO0MZ
+qTBQBgNVHREESTBHghZpZHAuaGFpbmF1dC1wcm9tc29jLmJlhi1odHRwczovL2lk
+cC5oYWluYXV0LXByb21zb2MuYmUvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAJitAtWal9yuAUxDZhwEcq8s7R8+UpopnmhanN/8/QbaJq5SnsDecbRe
+0vds9Q8WQ2C/WBUq33+Szk5jxSO2b830qqaQoS3+aaXM6f9tnROYGpLcGxubtpa6
+WS0SvJWfMV82YL6KMkRbKmhjOUaOsS9kzbG+pevWlB5HtqwqYo13auvD8pzdZj6O
+kXjj5QdTeFZqiqhfLGzAbN2PT8m9ooeompaKdXPPPE6lGxBbkxb7oaiTbhQ2Vq2a
+ThgBAs9l2+KxbBZMSIKonHuNy4rabps8OlUROSbh9uwTGfK/wP540Ig3zmKlNJ2n
+yre8A56stjeXAkdXHlOhm0/9YlW1hHQ=
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -45,6 +104,7 @@ HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/Redirect/SLO"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML2/SOAP/SLO"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
@@ -52,40 +112,87 @@ HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/SOAP/ECP"/>
</md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hainaut-promsoc.be</shibmd:Scope>
</md:Extensions>
- <md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDRDCCAiygAwIBAgIVAN68rKymbP0przSDvaG0eMoh/UGiMA0GCSqGSIb3DQEB
+CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
+MTIxMTQ0WhcNMzUxMjAzMTIxMTQ0WjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
+cm9tc29jLmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgFh9v8nu
+DZ22vG1hQaV9mA6+H6eobWNhEKHO/YdcC+uNU8dNrHgfvdGjTrrIk9BGFdsTuxak
+UnmVYQho3ASbc7LQdTlxJegvogiI6e+zl8vGrwKyhCYmAz3oDHnLA/YAkgk0EWRE
+juD2qYAYfgqMg/M6goWyn1EsCUk9pFc4D1tnmqsUWzG2dTwAfOlbDduMhJrU9F+v
+nNlayDAHWiPxASDsbQSRYtkA9O4xjujLcj65r3p2c+Xba5fVu9M57yeykvjVkYs2
+x+3rKyMzLEV46emeLCHiltpzHr3VJBlkT6ny66eXYd2Y7nTnRNEka/JACmcFFpO4
+hHPl8Rrf0qBqiQIDAQABo3MwcTAdBgNVHQ4EFgQU2/sCjD8jZll6GJw9Kf5qRcu+
+T7owUAYDVR0RBEkwR4IWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZYYtaHR0cHM6Ly9p
+ZHAuaGFpbmF1dC1wcm9tc29jLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQBqaAQAbDvMlqplLVZpzw0F+UgxxsOL3kI2ATOH6jGrTqrWA/7bj8Ma
+oYM22iUjtuMPa9r9+F3IA08krhALvMhgRsseM8n0kxWxIWtcGEE37MlHgaCsNUXt
+FnkP8thyCr8CnwzqWpFj5ouXaNqtDhx+qFM08XBDJh2mkCDQriD8lqHE2NUnfgGl
+Du+vSV7PfHKMdpMYJLFmT+Ry3bjrNA/WibJkQ4Hf9OtuOQ4M5k3VodWj2LCO4Ybh
+lGfxo5nF26RIBrY4mtTninIvP75nJjAJoS029RDpoYpl8Mh8t+lxsY0tisaYoJgF
+FgGl1jbigT4J3Bxxv1wcRfblufkR5grP
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDRDCCAiygAwIBAgIVAPLtvCrrYfdTvxrnQNxT4wh/M2m9MA0GCSqGSIb3DQEB
+CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
+MTIxMTQyWhcNMzUxMjAzMTIxMTQyWjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
+cm9tc29jLmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9Z7Y1aEi
+Bjtge0mCkmRNZBB+ZCJa/w1WFVh2kuY0gFYzeHdsN91yxUiaDujaXigN9rl9Z+cv
+AE/RN0MQtZbRROu89WA6ZcDcgsvcKLWfXr/RjC/nmtxuwBcvfJyFphXaaz1V2334
+6m1lIFQ43aE5s4NhrtENXhiukbHeCvaN1rwjdski73+POVKTDUr4a00r8/tybJgO
+iUZrFDbRBZJ/TnQohhhGWTJEHbrvYApwKju8JQcMwk7R+bABsgf/oqki4pNmxXH8
+HevxO72Exn6uVi6AWO5rGiQX+jIyIJZprZCPeUoMjge5bpz3+vRlm9kO9Y0ablbT
+urOW9BAgDEHcNQIDAQABo3MwcTAdBgNVHQ4EFgQU6QJuMQqUcLoXMT4CrRK/yO8x
+z1wwUAYDVR0RBEkwR4IWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZYYtaHR0cHM6Ly9p
+ZHAuaGFpbmF1dC1wcm9tc29jLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQDmP+yXnrrlRJ2D+inYx0mRAClGzzo3fG4Jgr46DWXrsRcrCJH3sjQr
+5MKNtgyPyZDy/NXcNtVS3IFJZkg27pokUD28RQtRB1dcCT++YIoViKtXnPct9nSQ
+jnORWcsiw2Yx48rauTpJzA5vIEmwSv79iidoalBaxpiO7gXJL7JNqgVjhjBd9yDX
+RVL+pTLN5MhbSF6izeLcpvI/xhneStzW3b3IhHS+rPikg3GufLhM++5A45qAAqAz
+VRQosvXh6gvNKUDJpqCMK+m4b/Ue9rOBqtV9g8peJfZ9TQ9CKwDB0UbPPCfEEI/7
+MilG31thHKJnTIULp8CAkF+DIFtOcpk6
+ </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>
-MIIEejCCA2KgAwIBAgIRAOJDreYdfwftYXxuTiaSgikwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTcwMDAwMDBaFw0xNzA1MTYyMzU5NTlaMEQxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWaWRwLmhhaW5h
-dXQtcHJvbXNvYy5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALaj
-3QToxwLfTZdKn1LyscWG0WEFxqm4szedeTdv+Z0GN7vzAFkCJ5uIN0TMsS0pI7Bk
-DpgweMIgIjyAic13ibFgdPDK97duAhfqAGMlgxRvYeil42X6kCNC5OaUPszuXU8t
-HBLW2ZTpptKpqud5X0hNijbAghLZDmn7Eb+rQT8+4zQdZJwV4ApYjNT65oTWTmHX
-xj+LI65fYOyTPGW30rYtX9m7TJUoR1GNsaOzhTlulE0wFiXQMct8qWpRA43tnnPJ
-h+LSBtS5tqZeEd7NP0V2FM1FMkpghrDewy1Truj0+WniTcBZJTtnYUbzsImNZIg6
-OCNqkxNKtIkzLLX9h7kCAwEAAaOCAXMwggFvMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTsFp6mcbFldk8J8qcZ6VgvqL4y0DAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYDVR0RBBowGIIWaWRwLmhhaW5hdXQt
-cHJvbXNvYy5iZTANBgkqhkiG9w0BAQUFAAOCAQEAqWXIoIBh/n3Qd92KOkrtLD0O
-MCPdoOlIe+WfzPfEFEre1QcGNIiywbTH5zR7n0GttMvopttilSIEH4JePV9uiX5m
-DdcGukEMCCtMTaahMeXTSiS9v1RE2FGe9tx1zblHOkpI9V43pWLb9zk3hitGWqN4
-Zce+zsOUf6D8xfDHAReHt5RaWtfSmlHENVix51e5kQ8Q5WAkABvSSVEvOtB1Lqlp
-Ce+uSCFKDpGchEC4Wmfb3W3ka1Vi5Q5ARUNvsjPO02XSbXYJ0bTGFUnJcOKytFBp
-HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
-</ds:X509Certificate>
+MIIDQzCCAiugAwIBAgIUcuiw7sw3OSPjhIvrmbLChEBZ60AwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZTAeFw0xNTEyMDMx
+MjExNDJaFw0zNTEyMDMxMjExNDJaMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXBy
+b21zb2MuYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfLBJTJiLz
+o30Vpv8ZwM2q/p9p6RdXo/zpvhNO3nkcvLYHPZssOR/u6MDCNNbjP/3PeLdqepvo
+UOzEw3hPg/IWsoPTnr3MYHRWYmzvBnr33rA/QAmv6OnW3RQjtCwQFH5UXQ9S/Xv3
+o5YbB8vRaVrPZPd5EzyXoyo2zIZc5si2pbQj/0B40BPI8M+dsrInvtwOCJ6CgLkq
+zCD1bzY0P3EtbxGRFSA4fyZDO+72sIXX1fU0jniek/oEDTjRsi0svgUdwNcTi+qV
+totEXOvkjv8jRJnzh0E2jOqGeXcSv6673gZvddG+Tcy8aQlNhfF9nvA9scNxtU1s
+b9Kor1NNei7ZAgMBAAGjczBxMB0GA1UdDgQWBBQBxbm5XMUopQNiz45GhwbwO0MZ
+qTBQBgNVHREESTBHghZpZHAuaGFpbmF1dC1wcm9tc29jLmJlhi1odHRwczovL2lk
+cC5oYWluYXV0LXByb21zb2MuYmUvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAJitAtWal9yuAUxDZhwEcq8s7R8+UpopnmhanN/8/QbaJq5SnsDecbRe
+0vds9Q8WQ2C/WBUq33+Szk5jxSO2b830qqaQoS3+aaXM6f9tnROYGpLcGxubtpa6
+WS0SvJWfMV82YL6KMkRbKmhjOUaOsS9kzbG+pevWlB5HtqwqYo13auvD8pzdZj6O
+kXjj5QdTeFZqiqhfLGzAbN2PT8m9ooeompaKdXPPPE6lGxBbkxb7oaiTbhQ2Vq2a
+ThgBAs9l2+KxbBZMSIKonHuNy4rabps8OlUROSbh9uwTGfK/wP540Ig3zmKlNJ2n
+yre8A56stjeXAkdXHlOhm0/9YlW1hHQ=
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -103,5 +210,6 @@ HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
<md:GivenName>Technical Support</md:GivenName>
<md:SurName>Technical Support</md:SurName>
<md:EmailAddress>webmaster@hainaut-promsoc.be</md:EmailAddress>
+ <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
index b3ce6900..60e29cb2 100644
--- a/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
@@ -107,19 +107,19 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
<md:ContactPerson contactType="administrative">
<md:Company>University of Gävle</md:Company>
<md:SurName>Network Operations</md:SurName>
- <md:EmailAddress>nat@hig.se</md:EmailAddress>
+ <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
<md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>University of Gävle</md:Company>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>nat@hig.se</md:EmailAddress>
+ <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
<md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>University of Gävle</md:Company>
<md:SurName>IT Support</md:SurName>
- <md:EmailAddress>itsupport@hig.se</md:EmailAddress>
+ <md:EmailAddress>mailto:itsupport@hig.se</md:EmailAddress>
<md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml
index 93820b3a..46f5e92b 100644
--- a/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml
@@ -111,19 +111,19 @@ drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
<md:ContactPerson contactType="administrative">
<md:Company>University of Skövde</md:Company>
<md:SurName>HiS Netadmin</md:SurName>
- <md:EmailAddress>netadmin@his.se</md:EmailAddress>
+ <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
<md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>University of Skövde</md:Company>
<md:SurName>HiS Netadmin</md:SurName>
- <md:EmailAddress>netadmin@his.se</md:EmailAddress>
+ <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
<md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>University of Skövde</md:Company>
<md:SurName>IT Helpdesk Högskolan i Skövde</md:SurName>
- <md:EmailAddress>helpdesk@his.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@his.se</md:EmailAddress>
<md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
index 81717e21..bc1bd95d 100644
--- a/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
@@ -4,10 +4,33 @@
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hkr.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Högskolan Kristianstad</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Kristianstad University Sweden</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Inloggning i webbtjänster för anställda och studenter vid Högskolan Kristianstad.</mdui:Description>
+ <mdui:Description xml:lang="en">The Kristianstad University Login Service is used by employees and students at the university.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.hkr.se/sv/om-hkr/organisation/administration-och-stodverksamhet/it-service/kontoinformation/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.hkr.se/en/study-at-hkr/service-and-support/it-support-for-students/user-name-and-password/</mdui:InformationURL>
+ <mdui:Logo height="84" width="96" xml:lang="sv">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
+ <mdui:Logo height="84" width="96" xml:lang="en">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>hkr.se</mdui:DomainHint>
+ <mdui:IPHint>194.47.24.0/21</mdui:IPHint>
+ <mdui:IPHint>194.47.32.0/21</mdui:IPHint>
+ <mdui:IPHint>194.47.40.0/21</mdui:IPHint>
+ <mdui:GeolocationHint>geo:56.04848,14.14416</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -84,10 +107,26 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
<md:Organization>
<md:OrganizationName xml:lang="en">HKR</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Högskolan Kristianstad</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.hkr.se</md:OrganizationURL>
+ <md:OrganizationDisplayName xml:lang="en">Kristianstad University Sweden</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="sv">http://www.hkr.se</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.hkr.se/en/english-start-page/</md:OrganizationURL>
</md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:Company>Högskolan Kristianstad</md:Company>
+ <md:SurName>Service desk 3030</md:SurName>
+ <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
+ <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
+ </md:ContactPerson>
<md:ContactPerson contactType="technical">
- <md:EmailAddress>operations@swamid.se</md:EmailAddress>
+ <md:Company>Högskolan Kristianstad</md:Company>
+ <md:SurName>Service desk 3030</md:SurName>
+ <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
+ <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>Högskolan Kristianstad</md:Company>
+ <md:SurName>Service desk 3030</md:SurName>
+ <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
+ <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml
index 062a49ba..b9c32a74 100644
--- a/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml
@@ -7,7 +7,7 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iadt.ie</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Dun Laoghaire Institite of Art Design and Technology</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</mdui:DisplayName>
<mdui:InformationURL xml:lang="en">http://www.iadt.ie</mdui:InformationURL>
<mdui:Logo height="101" width="151">https://edugate.heanet.ie/rr3/logos/iadt.png</mdui:Logo>
</mdui:UIInfo>
@@ -51,8 +51,8 @@ Qrq4WvN81X5uUTN6qJPlL6wd+mT+LsrZPH+zyw==
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iadt.ie/idp/profile/Shibboleth/SSO"/>
</md:IDPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">Dun Laoghaire Institite of Art Design and Technology</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Dun Laoghaire Institite of Art Design and Technology</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.iadt.ie</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml
index 8ef45b05..15e94c83 100644
--- a/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml
@@ -15,35 +15,36 @@
<mdui:DisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
<mdui:Description xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:Description>
<mdui:Description xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.ifpb.edu.br</mdui:InformationURL>
- <mdui:InformationURL xml:lang="pt-br">http://www.ifpb.edu.br</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.ifpb.edu.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ifpb.edu.br/</mdui:InformationURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- 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
+ MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxLTArBgNVBAoUJElGUEIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhw61iYTEMMAoGA1UECxMDRFRJMSwwKgYJ
+KoZIhvcNAQkBFh1hbGV4YW5kcmUuYWxtZWlkYUBpZnBiLmVkdS5icjEVMBMGA1UE
+BxQMSm/Do28gUGVzc29hMREwDwYDVQQIFAhQYXJhw61iYTELMAkGA1UEBhMCQlIx
+GDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjAeFw0xNTExMjcxOTQ3NDNaFw0xODEx
+MjYxOTQ3NDNaMIG8MS0wKwYDVQQKFCRJRlBCIC0gSW5zdGl0dXRvIEZlZGVyYWwg
+ZGEgUGFyYcOtYmExDDAKBgNVBAsTA0RUSTEsMCoGCSqGSIb3DQEJARYdYWxleGFu
+ZHJlLmFsbWVpZGFAaWZwYi5lZHUuYnIxFTATBgNVBAcUDEpvw6NvIFBlc3NvYTER
+MA8GA1UECBQIUGFyYcOtYmExCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAuaWZw
+Yi5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC86dKAJidm
+TFuVKDguITfO7pAFVrPQ5xTMuuTPfkaajstKL6G28CkK2ovAl8VYkIeH50nqc78i
+2F1kjrxvXYdUU2IiZzILUiuZ6aZDPbxVGWfY1LTenoijNcWFTSsqT8ExvCUqFhCz
+2VPy7bkR3d6jvMDTn+wRuudDzBMIS6XmTXNoqDMp1tTCTrPiKwEJAQDhMQHkXAVB
+IC0U4DuIcARLLqw8nQ73K83BfFlkdbdcwV4A8Y3fNCSTBTslKp9PzA694GdbsfQh
+SbXWQXdO7kI0P3JnyXuxsNvlX3EGdv5tvwPx/W9NXXDH7H99uMpdhUTS6W7rRqWm
+dKf78jPlAeZHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKXXg2ofZPRNfNF9COfu
+NlHawtVoCdWi92smA6LeMt7N9MvCkkpC8ZdwCc1ebS4XDW4wKf8vd30GrQ1qI2PQ
+BB6Iz9r4w3pNwBhSB0iBKRAkkTYLCI80R1ghjdoOO4PHYWxMhzM7Q683PhU0Zhmm
+WO4aOIsUZ6Nse4205I4r/mkxJNrfLtmBxJQGWwUxckFeP4OYipYt8v2lnSPkJOc6
+miCjubGUFtcp0AyIauaCBrDa5yXQC7G4aGsdUmLM9rkVOohfyo6+KXbBXBdH4ohp
+T8Co/9psHWaWH/nbbWkLPelRY7xBqyLbUwdAFj8W6v8BExWLWMJqSZq8A4eD02Ky
+sHw=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -66,27 +67,28 @@ kCPbbyEGhzyWdtZGIWPGqY+fZw8Z6WcAOOr25/JEw/veCHLskaV6GA==
<ds:X509Data>
<ds:X509Certificate>
-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
+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
+sHw=
</ds:X509Certificate>
</ds:X509Data>
@@ -102,11 +104,11 @@ kCPbbyEGhzyWdtZGIWPGqY+fZw8Z6WcAOOr25/JEw/veCHLskaV6GA==
<md:OrganizationName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ifpb.edu.br</md:OrganizationURL>
- <md:OrganizationURL xml:lang="pt-br">http://www.ifpb.edu.br</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.ifpb.edu.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.ifpb.edu.br/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Jose Hermano Cavalcanti Filho</md:SurName>
- <md:EmailAddress>jose.cavalcanti@ifpb.edu.br</md:EmailAddress>
+ <md:SurName>Alexandre Almeida de Lucena</md:SurName>
+ <md:EmailAddress>alexandre.almeida@ifpb.edu.br</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml
index 5fd6603d..0cc155bd 100644
--- a/swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">UNESCO-IHE Institute for Water Education</mdui:DisplayName>
<mdui:Description xml:lang="nl">UNESCO-IHE Institute for Water Education</mdui:Description>
<mdui:Description xml:lang="en">UNESCO-IHE Institute for Water Education</mdui:Description>
- <mdui:Logo height="100" width="108">https://static.surfconext.nl/media/idp/unesco-ihe.jpg</mdui:Logo>
+ <mdui:Logo height="100" width="108">https://static.surfconext.nl/logos/idp/unesco-ihe.jpg</mdui:Logo>
<mdui:Keywords xml:lang="en">Research IHE UNESCO-IHE Institute for Water Education</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Research IHE UNESCO-IHE Institute for Water Education</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml
index 6e3ef804..f6f72a2c 100644
--- a/swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iit.cnr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iit.cnr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-06T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml
index c3679c3e..1465c255 100644
--- a/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iit.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iit.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-07-24T14:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.inalco.fr-idp.xml b/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
index 1f63f3fe..474533e1 100644
--- a/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
+++ b/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
@@ -52,11 +52,6 @@ BdKgqhQ4XdLkP9D+5i10GGHVDJL3NYCpNbAqNmHeTJGjc+aSG6XpBZPcVw==
<md:OrganizationURL xml:lang="en">http://inalco.fr/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Le Pendeven</md:SurName>
- <md:EmailAddress>laurent.le_pendeven@inria.fr</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:SurName>Casasnovas</md:SurName>
- <md:EmailAddress>fabrice.casasnovas@inalco.fr</md:EmailAddress>
+ <md:EmailAddress>ldap-adm@inalco.fr</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml
index 751442e5..7130d1b4 100644
--- a/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.infn.it/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.infn.it/saml2/idp/metadata.php">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-28T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
@@ -13,8 +13,6 @@
<mdui:Description xml:lang="it">Identity Provider per gli utenti dell'INFN</mdui:Description>
<mdui:Description xml:lang="en">Identity Provider for INFN users</mdui:Description>
<mdui:InformationURL xml:lang="it">https://web.infn.it/CCR/index.php/i-progetti/aai/federazione-idem</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="it">http://www.infn.it/index.php?option=com_content&amp;view=article&amp;id=268&amp;Itemid=427&amp;lang=it</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.infn.it/index.php?option=com_content&amp;view=article&amp;id=268&amp;Itemid=427&amp;lang=en</mdui:PrivacyStatementURL>
<mdui:Logo height="79" width="80" xml:lang="it">https://idp.infn.it/utils/infnLogo80x80.png</mdui:Logo>
<mdui:Logo height="79" width="80" xml:lang="en">https://idp.infn.it/utils/infnLogo80x80.png</mdui:Logo>
<mdui:Logo height="15" width="16" xml:lang="it">https://idp.infn.it/utils/infnLogo16x16.png</mdui:Logo>
diff --git a/swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..808907ac
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inserm-transfert.fr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-10-26T17:34:57Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm-transfert.fr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">INSERM-Transfert</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="fr">http://www.inserm.fr</mdui:InformationURL>
+ <mdui:Description xml:lang="en">staff</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">INSERM-Transfert</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">personnel</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVAJ0+TvIeavAjFYxpT+7F0r61FktEMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MTEw
+NTExMTYzM1oXDTM1MTEwNTExMTYzM1owIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
+cmFuc2ZlcnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyFxGe
+9J5hJ5TpheBI7GLLtSoXL8K7CzhW3FSGllYxg/rFOslJZ7reFKvochYc0PBAvXei
+S0XO1eAfMuDhNCchq7bIPkEW78ptBO6VPqCt5QLQTRfAh8TCIRYSPMU4Z643Yuy5
+VWOPhL3h66MYSBaYgFKpdImxO+1f6xlQu59NoshcWL3PhbX8rV/NCrjrk6v+ZBpi
+yMixH5eMihA636eU2JATjRtiqBOtoPyanGD6W095Ojk9PACthlKtEjTdy9p+rQt6
+0vymAAvCbrLSVc5sGwfAF08dGv/tQt+ry6BzQyeJQJW1H0moLfjvDyVi8DEGNDqn
+9QBSVydMSGmRImdFAgMBAAGjdTBzMB0GA1UdDgQWBBSzBOmHUIetjuQbwGmKlilB
+onqRmjBSBgNVHREESzBJghdpZHAuaW5zZXJtLXRyYW5zZmVydC5mcoYuaHR0cHM6
+Ly9pZHAuaW5zZXJtLXRyYW5zZmVydC5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQUFAAOCAQEAc5DK3X/GfYxevOJDvTdAc3W0PkfqBsp1D1ko4/khPvG6MJax
+EMjN/zE5e8miWXnkn+MQpzkKCHsLaeu6HD6LjHqkE+RtVK8fD6AMgw9XXWD+QCyT
+6MOahvn1ibDfQmZt+TOLL9kJOGLUMjeGtcH0yXkXb6bCdq9/yyiev7SnkNjS1YnM
+PtOxxP015w7/b9XDcshiRp7Xq/SExT4u5lweQiuYCtQG50GglyTnAiusgudwOJe2
+x3BVTdBOVbAslCRJv87S1z+DTBWmau+d8f5UDihF4YOpGRfIdo6wMf5JFn9BvZ7X
+JEYjjQM1FVU+uKub1f4DfSjgrc4HvczfZY1hnw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVAIJyc+Gfzp0eVbXdBuMNzE3AyFxwMA0GCSqGSIb3DQEB
+CwUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MDkx
+NzE0MDQ1NloXDTM1MDkxNzE0MDQ1NlowIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
+cmFuc2ZlcnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4J/qi
+FHfMKCtfFrKtx0RO/5ltByejYDObLpFXsRiVw3YgvFw7UEFKPQyDu+zydE3La76v
+eYvYkA0As/x9DxnUxui2FaZrFS8Fyd9Ty//MoeatQ7TptIxsLr8BGS2XXqE0LcuP
+5r/KAMazSvvz77OjjU0XW/prDL+6KSL1RRJoGkVzup9j4dKDtcQ3daj6/ISG3tif
+UfLDDfeW3Q0zBY+ROY69gM5hUytpASLTOXK9acJAle57a2YoyjK2JBdnrFUUHN7p
+h8IV+RB7kvJNVYrgQSM3/UGAgV7kbYfSizByBFcjwdOrkax3brcm1G8GSxmN6kuT
+a7gnycLSevkW5prDAgMBAAGjdTBzMB0GA1UdDgQWBBRIN86FLK0AxMvmltTCimJ3
+mLjKkTBSBgNVHREESzBJghdpZHAuaW5zZXJtLXRyYW5zZmVydC5mcoYuaHR0cHM6
+Ly9pZHAuaW5zZXJtLXRyYW5zZmVydC5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAQEAatuPIuWH5lqbqqSWL67JrE+BlawU0c/Q5B6Zjs0QRzvwQzrw
+NXzORY0nBEs1xg0VB35h8yMRhZowOj1gMCQDAkw3WeA9/TjZcDzlbHzVmmohlicm
+DF2hFjpP2dj9x2Vsn8/VuENBuJcQl2Zq6WoMlMPijQILJF3kErZM4JrXkbIB3fKd
+CJX0zPBriZsEKtzvHyKP/J8fI2Xn5uyvK8Z2WI1JyGr9r69EHXtN1ERk/jkdM+vf
+IDXLNZxDZcZALVhexi2xQG6uuu4dr/CnjWMJjDPN9nvx4WBsmPl1K7Tx0GRmF7gJ
+xIMPqERTBQpVvk4wmDf5mFKRvz1TjqYd32QhVA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inserm-transfert.fr/idp/profile/Shibboleth/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm-transfert.fr</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVAJ0+TvIeavAjFYxpT+7F0r61FktEMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MTEw
+NTExMTYzM1oXDTM1MTEwNTExMTYzM1owIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
+cmFuc2ZlcnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyFxGe
+9J5hJ5TpheBI7GLLtSoXL8K7CzhW3FSGllYxg/rFOslJZ7reFKvochYc0PBAvXei
+S0XO1eAfMuDhNCchq7bIPkEW78ptBO6VPqCt5QLQTRfAh8TCIRYSPMU4Z643Yuy5
+VWOPhL3h66MYSBaYgFKpdImxO+1f6xlQu59NoshcWL3PhbX8rV/NCrjrk6v+ZBpi
+yMixH5eMihA636eU2JATjRtiqBOtoPyanGD6W095Ojk9PACthlKtEjTdy9p+rQt6
+0vymAAvCbrLSVc5sGwfAF08dGv/tQt+ry6BzQyeJQJW1H0moLfjvDyVi8DEGNDqn
+9QBSVydMSGmRImdFAgMBAAGjdTBzMB0GA1UdDgQWBBSzBOmHUIetjuQbwGmKlilB
+onqRmjBSBgNVHREESzBJghdpZHAuaW5zZXJtLXRyYW5zZmVydC5mcoYuaHR0cHM6
+Ly9pZHAuaW5zZXJtLXRyYW5zZmVydC5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQUFAAOCAQEAc5DK3X/GfYxevOJDvTdAc3W0PkfqBsp1D1ko4/khPvG6MJax
+EMjN/zE5e8miWXnkn+MQpzkKCHsLaeu6HD6LjHqkE+RtVK8fD6AMgw9XXWD+QCyT
+6MOahvn1ibDfQmZt+TOLL9kJOGLUMjeGtcH0yXkXb6bCdq9/yyiev7SnkNjS1YnM
+PtOxxP015w7/b9XDcshiRp7Xq/SExT4u5lweQiuYCtQG50GglyTnAiusgudwOJe2
+x3BVTdBOVbAslCRJv87S1z+DTBWmau+d8f5UDihF4YOpGRfIdo6wMf5JFn9BvZ7X
+JEYjjQM1FVU+uKub1f4DfSjgrc4HvczfZY1hnw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVAIJyc+Gfzp0eVbXdBuMNzE3AyFxwMA0GCSqGSIb3DQEB
+CwUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MDkx
+NzE0MDQ1NloXDTM1MDkxNzE0MDQ1NlowIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
+cmFuc2ZlcnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4J/qi
+FHfMKCtfFrKtx0RO/5ltByejYDObLpFXsRiVw3YgvFw7UEFKPQyDu+zydE3La76v
+eYvYkA0As/x9DxnUxui2FaZrFS8Fyd9Ty//MoeatQ7TptIxsLr8BGS2XXqE0LcuP
+5r/KAMazSvvz77OjjU0XW/prDL+6KSL1RRJoGkVzup9j4dKDtcQ3daj6/ISG3tif
+UfLDDfeW3Q0zBY+ROY69gM5hUytpASLTOXK9acJAle57a2YoyjK2JBdnrFUUHN7p
+h8IV+RB7kvJNVYrgQSM3/UGAgV7kbYfSizByBFcjwdOrkax3brcm1G8GSxmN6kuT
+a7gnycLSevkW5prDAgMBAAGjdTBzMB0GA1UdDgQWBBRIN86FLK0AxMvmltTCimJ3
+mLjKkTBSBgNVHREESzBJghdpZHAuaW5zZXJtLXRyYW5zZmVydC5mcoYuaHR0cHM6
+Ly9pZHAuaW5zZXJtLXRyYW5zZmVydC5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAQEAatuPIuWH5lqbqqSWL67JrE+BlawU0c/Q5B6Zjs0QRzvwQzrw
+NXzORY0nBEs1xg0VB35h8yMRhZowOj1gMCQDAkw3WeA9/TjZcDzlbHzVmmohlicm
+DF2hFjpP2dj9x2Vsn8/VuENBuJcQl2Zq6WoMlMPijQILJF3kErZM4JrXkbIB3fKd
+CJX0zPBriZsEKtzvHyKP/J8fI2Xn5uyvK8Z2WI1JyGr9r69EHXtN1ERk/jkdM+vf
+IDXLNZxDZcZALVhexi2xQG6uuu4dr/CnjWMJjDPN9nvx4WBsmPl1K7Tx0GRmF7gJ
+xIMPqERTBQpVvk4wmDf5mFKRvz1TjqYd32QhVA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inserm-transfert.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">INSERM-Transfert</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">INSERM-Transfert</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.inserm.fr</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>resnat.dsi@inserm.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml
index cddaea1a..ad712716 100644
--- a/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml
@@ -4,7 +4,7 @@
<eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
<eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
</eduidmd:RepublishRequest>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-11-24T14:52:01Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-11-24T14:52:02Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
index e252d5b1..d13562a1 100644
--- a/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
@@ -17,7 +17,7 @@
<mdui:Logo height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
<mdui:Logo height="145" width="144" xml:lang="sv">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
<mdui:Logo height="145" width="144" xml:lang="en">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
- <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer&amp;docid=302</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer%26docid=302</mdui:PrivacyStatementURL>
<mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
<mdui:Keywords xml:lang="en">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
</mdui:UIInfo>
@@ -106,19 +106,19 @@ XCYbfP8E3cs4MB+K
<md:ContactPerson contactType="administrative">
<md:Company>Swedish Institute of Space Physics</md:Company>
<md:SurName>Mats Luspa</md:SurName>
- <md:EmailAddress>datagruppen@irf.se</md:EmailAddress>
+ <md:EmailAddress>mailto:datagruppen@irf.se</md:EmailAddress>
<md:TelephoneNumber>+4698079000</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Swedish Institute of Space Physics</md:Company>
<md:SurName>Mats Luspa</md:SurName>
- <md:EmailAddress>matsl@irf.se</md:EmailAddress>
+ <md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
<md:TelephoneNumber>+4698079022</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Swedish Institute of Space Physics</md:Company>
<md:SurName>Mats Luspa</md:SurName>
- <md:EmailAddress>matsl@irf.se</md:EmailAddress>
+ <md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
<md:TelephoneNumber>+4698079022</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
index 7dfe0e20..5fd74ac9 100644
--- a/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
@@ -18,7 +18,9 @@
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DomainHint>gu.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:57.6986,11.9712</mdui:GeolocationHint>
+ <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
</mdui:DiscoHints>
</md:Extensions>
<md:KeyDescriptor>
@@ -100,18 +102,18 @@ MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
<md:ContactPerson contactType="administrative">
<md:Company>University of Gothenburg</md:Company>
<md:SurName>Lena Ström</md:SurName>
- <md:EmailAddress>lena.strom@gu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:lena.strom@gu.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>University of Gothenburg</md:Company>
<md:SurName>Pablo Millet</md:SurName>
- <md:EmailAddress>pablo.millet@gu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:pablo.millet@gu.se</md:EmailAddress>
<md:TelephoneNumber>+46707104070</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>University of Gothenburg</md:Company>
<md:SurName>GU-Support</md:SurName>
- <md:EmailAddress>support@gu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:support@gu.se</md:EmailAddress>
<md:TelephoneNumber>+46317862020</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
index ec5e8cf3..202d3805 100644
--- a/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
@@ -96,19 +96,19 @@ VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
<md:ContactPerson contactType="administrative">
<md:Company>Stockholm University</md:Company>
<md:SurName>Helpdesk</md:SurName>
- <md:EmailAddress>helpdesk@su.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Stockholm University</md:Company>
<md:SurName>Helpdesk</md:SurName>
- <md:EmailAddress>helpdesk@su.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Stockholm University</md:Company>
<md:SurName>Helpdesk</md:SurName>
- <md:EmailAddress>helpdesk@su.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml
index 77613dd9..f01c7fc0 100644
--- a/swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml
@@ -10,6 +10,7 @@
<mdui:DisplayName xml:lang="en">Institute of Technology Carlow</mdui:DisplayName>
<mdui:InformationURL xml:lang="en">http://www.itcarlow.ie</mdui:InformationURL>
<mdui:Logo height="89" width="171">https://edugate.heanet.ie/rr3/logos/it-carlow.png</mdui:Logo>
+ <mdui:Logo height="89" width="171" xml:lang="en">data:image/png;base64,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AHAch5tuusk2Gi1x++232/POO08ccshmHnlkJ3fccYednJzkhBNOEEKW3PWrX5Emib3oGReJE44/njRJuOaaa2yWpjz88EPMzMygpCQKQm6+5WZ75ulnCIvlF7+4wZ5x+lliw4YNYmRdrrvuOlsUBevWrWNyclKMGllKydq1azn00EPFjh077CmnnCJarRYA3/ve96wQgmc84xliYWGBY489VuR57SvfeNMNdu/evaxfv56zzjxL7Nm7h127dtnHHnuMqakpzjrzPOH7Pvfeey+33367PfXUU8VombLW8oMf/MBqrXn6058u8jwfT5qJiQm+//3v2yzLePKTnyw2bNjAYYcdJrZu3UoYhtx9993s2LHDttttzj//fJEkCXNzc3z1q1+1GzZsYPv27WJ2dhZrLXfeeae96667uOiii8Ts7CwLCwv86Ec/si984QvF1NQU3/3ud61Siu3bt4tt27YRx/F46f7Qhz5kX/va14o1a9Zw5JFHirm5OUYDXQjBD3/4QxtFESeffLJIkoSqqrjllltst9vlFa94hVBKcf/993P33XfbiYkJTjnlFLFv3z56vR7XXnutffrTny6stfz85z+3vV6PJz3pSWLjxo0IIbjyyitts9nkuOOOE61Wi4WFBYqiYM+ePXbr1q2i1WoRhiH33Xcft956q123bh0nnXSSmJiYYM+ePVx11VV206ZNnHzyycIYw+TkJN/5znes4zhcdNFF4okxhBTiYMQ1mvWtVms4w2/BcRxe/OIXi+9+97tWa8tNN95in/ucS8QJx58kfvTDH9s0ydm0cQsnHH+S6PdjHnpwB74Xcti27WKiM8Xc7FqUdHls526rteXmm24FJL2VATf+4makdLj66p9aKR1+85vf2iCIeP7zXyDuvfd+qspYY8BxPKwVY3ckz0u0tlgreOc7/9E+85nPFkcffYz4whe+ZGdm5vjud//HOo7DLbfcYnsrA15w6YvE3r17GcQD7rzzTru4uMhznvMcsbi4yPz8PL1ej9tuu83+/u//vrj55pvtgw8+yNLSEp/73OfsM5/5TDE1NcVVV11lwzCkLEuazSaf/OQn7Yknniie/exni//8z/+0YRhy//3326WlJX71q19xzTXX2Oc+97nC8zyuueYaG4Yh73znO+3ZZ58t1qxZI66//no78tMOOeQQ8YIXvEB8+9vftiM/7/jjjxetVosvfOEL9rTTThNPfepTxbXXXmtXL/utVgshBGvXrh37oscdd9w4WNuxYwcnnXSS8H2fHTt2MDMzw7e//W37nOc8R5xxxhniiiuusAA//elP7Qte8AIRBAE33XSTbTabKKU47bTTxCh4O+qoo8RFF10kvvnNb1qlFF//+tftRRddJC666CLxla98xU5MTHDdddfZX/3qV/bYY48VvV5vvNRfe+219mUve5mIoojHHnsMgM985jP2la98pdi4caO46qqr7OTkJPfddx9Pe9rTxNatW8WnPvUp+0Tf3Rn5ZaujzZEPW5YlGzZsIAg8JiYmADjiiCPEe97zz3bTpk285CUvEZ4vMQbm5uoGW15eodcb0OlMUhQVzWabbrdLq9URWls2bz6EoqgIggjfD4fuhU+a5tx77/1ceumlAuC0084Qy8vLtqoMnucAEmsFxliCIEJKh15vQJ6XfPGLX7bNZpP5+QMArFu3gbLU3HDDjbzhDW8QeV7ywhf8nuj3+6yZW8f09LTASjas34Tv+9x8883WdV0++clP2iiK2Ldvny3LUrzqVa8S3W6XM888U7z3ve+1F198McYYkiThda97nfjGN75h9+3bN/bZer0eQRCwa9cu+8IXvlD0ej1OP/108YEPfMCeeuqpbN++nfXr11OWJVu3bhUj1GRmZgZjDMvLyxRFwZYtW8bB1ite8QrxH//xHzaKInbs2PE4P3kUUI6ClBHkJIRgamqKQw89lJmZGbTW4r777rMHDhwQcRxzxRVX2DAMx27GOeecI6688kr76KOPcuyxxzI3N4cQgjAMcRyHxcVF5ubmxr42wMUXXyxuuOEG2+12cV2XJEno9Xq89KUvFaOgc82aNWitecYzniE+//nP25WVFc455xx27drFi170IpHnORs3buSII44QRVEwMTFBGIZs3rx5HGCvHrAS5DjqAwiCgOXlZQCs1YRhiLV1Rygl6A9W7F/99V+Iy1/5UvGud/+jraNVAwiMgThOmZqaQimXqakZsqyg3Z4gSTKUclleXsFxPAaDhChqoitQ0iUMfDrtSdqtJlgY9BPrOj6e66ArwEqMBiUF/V5MVRpazRZR2OT3XnSZuOS5zxcve+krRFXC7l17CYKANWvWsbLSJwxDbr75l7bbHbCwsITnBQihKIoKz/PYtm2bOO+888RrX/ta8cxn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</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:GeolocationHint>geo:52.827382668158585,-6.935741901397705</mdui:GeolocationHint>
diff --git a/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml
index ffa454a1..b6a742e4 100644
--- a/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iuav.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iuav.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-01T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml
index f4109471..37a14302 100644
--- a/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml
@@ -4,7 +4,7 @@
<eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
<eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
</eduidmd:RepublishRequest>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-02-03T16:51:01Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-02-03T16:51:02Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
index 27f76fda..a6b29bf7 100644
--- a/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.izs.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.izs.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-27T16:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
index eea8fffa..cd11552d 100644
--- a/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
@@ -204,19 +204,19 @@ hJ2GrICmdWsVIb88lmoEw8Hn/ew=
<md:ContactPerson contactType="administrative">
<md:Company>National Library of Sweden</md:Company>
<md:SurName>Mattias Olsson</md:SurName>
- <md:EmailAddress>mattias.olsson@kb.se</md:EmailAddress>
+ <md:EmailAddress>mailto:mattias.olsson@kb.se</md:EmailAddress>
<md:TelephoneNumber>+46700073534</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>National Library of Sweden</md:Company>
<md:SurName>Mattias Olsson</md:SurName>
- <md:EmailAddress>swamid@kb.se</md:EmailAddress>
+ <md:EmailAddress>mailto:swamid@kb.se</md:EmailAddress>
<md:TelephoneNumber>+46700073534</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>National Library of Sweden</md:Company>
<md:SurName>swamid@kb.se</md:SurName>
- <md:EmailAddress>swamid@kb.se</md:EmailAddress>
+ <md:EmailAddress>mailto:swamid@kb.se</md:EmailAddress>
<md:TelephoneNumber>+46700073555</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml
index 2e05bea3..674daa5c 100644
--- a/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml
@@ -104,19 +104,19 @@ qowogArC+4U1+wcq4ctUoM0Lyh5YaTMs4U31GcmYAotsLw+sY97V0WGQKffURz4f
<md:ContactPerson contactType="administrative">
<md:Company>Kungl. Konsthögskolan</md:Company>
<md:SurName>Fredrik Reuterswärd</md:SurName>
- <md:EmailAddress>fredrik.reutersward@kkh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
<md:TelephoneNumber>+4686144064</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Kungl. Konsthögskolan</md:Company>
<md:SurName>Fredrik Reuterswärd</md:SurName>
- <md:EmailAddress>fredrik.reutersward@kkh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
<md:TelephoneNumber>+4686144064</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Kungl. Konsthögskolan</md:Company>
<md:SurName>Fredrik Reuterswärd</md:SurName>
- <md:EmailAddress>fredrik.reutersward@kkh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
<md:TelephoneNumber>+4686144064</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
index 833a47f6..ed164dbb 100644
--- a/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -104,17 +104,17 @@ SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
<md:ContactPerson contactType="administrative">
<md:Company>Royal College of Music</md:Company>
<md:SurName>KMH IT-avdelningen</md:SurName>
- <md:EmailAddress>swamid@kmh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Royal College of Music</md:Company>
<md:SurName>KMH IT-avdelningen</md:SurName>
- <md:EmailAddress>swamid@kmh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Royal College of Music</md:Company>
<md:SurName>KMH IT HelpDesk</md:SurName>
- <md:EmailAddress>helpdesk@kmh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@kmh.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 161939</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml
index 3c717a9c..1fdc86ec 100644
--- a/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml
@@ -102,19 +102,19 @@ SHHQuQC8v/yTq6ZVFlRvTNkZ+W/vPYOeE6x49Dygeu65WDf/H2NUy6dggcmH+LpS</ds:X509Certifi
<md:ContactPerson contactType="administrative">
<md:Company>Konstfack</md:Company>
<md:SurName>Håkan Pettersson</md:SurName>
- <md:EmailAddress>hakan.pettersson@konstfack.se</md:EmailAddress>
+ <md:EmailAddress>mailto:hakan.pettersson@konstfack.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 4504396</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Konstfack</md:Company>
<md:SurName>Håkan Pettersson</md:SurName>
- <md:EmailAddress>hakan.pettersson@konstfack.se</md:EmailAddress>
+ <md:EmailAddress>mailto:hakan.pettersson@konstfack.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 4504396</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Konstfack</md:Company>
<md:SurName>Helpdesk IT Konstfack</md:SurName>
- <md:EmailAddress>helpdesk@konstfack.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@konstfack.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 450 4399</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml
index db0a6b0c..8bbc9fef 100644
--- a/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml
@@ -34,22 +34,22 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIFkDCCBHigAwIBAgIRAJIIAUt70bEEHD01hp+3oA0wDQYJKoZIhvcNAQELBQAw
+MIIFkDCCBHigAwIBAgIRAPRpb7ML9+xEG/ROUJsB3TYwDQYJKoZIhvcNAQELBQAw
gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-Q0EwHhcNMTQxMjA3MDAwMDAwWhcNMTYwMzA2MjM1OTU5WjCBmjEhMB8GA1UECxMY
+Q0EwHhcNMTUxMjA3MDAwMDAwWhcNMTcwMzA2MjM1OTU5WjCBmjEhMB8GA1UECxMY
RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUIwQAYDVQQLEzlQcm92aWRlZCBieSBD
ZW50ZXIgb2YgVWtyYWluaWFuIEludGVybmV0IE5hbWVzIChVS1JOQU1FUykxHDAa
BgNVBAsTE1Vrcm5hbWVzIERvbWFpbiBTU0wxEzARBgNVBAMTCmlkcC5rcGkudWEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjShrR7ty5GFP8THkTY4JD
-q/N0cp+LLkjK0YQeSVdEDA8DZG983QzfL4/18b6lrxI30OugG/AtnVZCMTwFTi+t
-ytasbPdwSCCwR9L+rqkX6pdlE1qo54BLCNa/C9WuSP1fApb/GJiRBiXneXQ00HC4
-GU8xJmd+w2qYcJyrszupvc/aXDaPHRgygDYaSr4gohcUP1lxocDAInSHjdg7Zja+
-nCjWU/LveGF9wNVZsRhdpjRjcfpOpxl89B+itNm1F5YIM5KC9LwsSz1y3a6amYC3
-FWdCY5VPPa8upn1aFCrmEwgh1JMQAXHiOOHj1P0IvGJpSL1OYD82xedadrXVG5r3
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb2JYyoJKx3Z7kp7V3U5m3
+P8yO+KYxZZZSsxqhcvfJ0RCnPFjhdnHiFn1zkuYmUfx5y1MM3hp12MAQ1QQqK9c8
+SX5+zyJCJ+dUGCY6PBzHEEBYcoN9jKChsicJeHIJ++rkvedt9x4WXcfy9pWIF7Qt
++nX1shksdB5OxwbIQeVyi+aWIsJudOFCTpaaKTJT5yUBs3yg4FUNgRRliOhefp3T
+8c070I31VZta3ljIvgkAN3WrqKfE9TTsY/UgSuHZrpa+x279ALjIIwcDa9iBf8C8
+yz15gURdiEb8NkF91LeIOXDrIp9cTFSD1jNVQEip32adwJ9wg3QNItEQN151aTib
AgMBAAGjggHXMIIB0zAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAd
-BgNVHQ4EFgQU0UUinIqInadfn1BOUkL72VQMmKUwDgYDVR0PAQH/BAQDAgWgMAwG
+BgNVHQ4EFgQUxbZ3DShR1AHNzya9dgKB8z5+egAwDgYDVR0PAQH/BAQDAgWgMAwG
A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1Ud
IARIMEYwOgYLKwYBBAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1
cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0
@@ -58,50 +58,12 @@ ZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZD
aHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlv
blNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29t
b2RvY2EuY29tMCUGA1UdEQQeMByCCmlkcC5rcGkudWGCDnd3dy5pZHAua3BpLnVh
-MA0GCSqGSIb3DQEBCwUAA4IBAQBafwV+hrt59i7824IK9/EgZW6hQFTy7epEx/om
-k3KS9IkLFfu6FPw+KujKcsbQtFw6X1neIqmTuweC57OYBuRgQBIooMYCTJaaXYfo
-5Y4kK1GCCigjbL5EJCaAYxk10zcBfNkd/WmmDIpTNuam5Nw8/CYGd6AiCtnJZZpC
-3C1/JMQ5UDY3BcIDOsaoAMhR3AmHoFe9KNeFbfQ3lRRwZPdgik2AzT3XJh4VKBVX
-XJ1xgCKRNpyhKYfo4dXW0CjoVHA4jY61SXFqeWjFPZB/bJpx4mCxRAFV+xqJT4Bh
-y84K+R9gO0rTEcQb77Jd8p6yDG0DoKY6D/K0WywT/ePcsOig
-</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>
-MIIFkDCCBHigAwIBAgIRAJIIAUt70bEEHD01hp+3oA0wDQYJKoZIhvcNAQELBQAw
-gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
-VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-Q0EwHhcNMTQxMjA3MDAwMDAwWhcNMTYwMzA2MjM1OTU5WjCBmjEhMB8GA1UECxMY
-RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUIwQAYDVQQLEzlQcm92aWRlZCBieSBD
-ZW50ZXIgb2YgVWtyYWluaWFuIEludGVybmV0IE5hbWVzIChVS1JOQU1FUykxHDAa
-BgNVBAsTE1Vrcm5hbWVzIERvbWFpbiBTU0wxEzARBgNVBAMTCmlkcC5rcGkudWEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjShrR7ty5GFP8THkTY4JD
-q/N0cp+LLkjK0YQeSVdEDA8DZG983QzfL4/18b6lrxI30OugG/AtnVZCMTwFTi+t
-ytasbPdwSCCwR9L+rqkX6pdlE1qo54BLCNa/C9WuSP1fApb/GJiRBiXneXQ00HC4
-GU8xJmd+w2qYcJyrszupvc/aXDaPHRgygDYaSr4gohcUP1lxocDAInSHjdg7Zja+
-nCjWU/LveGF9wNVZsRhdpjRjcfpOpxl89B+itNm1F5YIM5KC9LwsSz1y3a6amYC3
-FWdCY5VPPa8upn1aFCrmEwgh1JMQAXHiOOHj1P0IvGJpSL1OYD82xedadrXVG5r3
-AgMBAAGjggHXMIIB0zAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAd
-BgNVHQ4EFgQU0UUinIqInadfn1BOUkL72VQMmKUwDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1Ud
-IARIMEYwOgYLKwYBBAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1
-cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0
-dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25T
-ZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZD
-aHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlv
-blNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29t
-b2RvY2EuY29tMCUGA1UdEQQeMByCCmlkcC5rcGkudWGCDnd3dy5pZHAua3BpLnVh
-MA0GCSqGSIb3DQEBCwUAA4IBAQBafwV+hrt59i7824IK9/EgZW6hQFTy7epEx/om
-k3KS9IkLFfu6FPw+KujKcsbQtFw6X1neIqmTuweC57OYBuRgQBIooMYCTJaaXYfo
-5Y4kK1GCCigjbL5EJCaAYxk10zcBfNkd/WmmDIpTNuam5Nw8/CYGd6AiCtnJZZpC
-3C1/JMQ5UDY3BcIDOsaoAMhR3AmHoFe9KNeFbfQ3lRRwZPdgik2AzT3XJh4VKBVX
-XJ1xgCKRNpyhKYfo4dXW0CjoVHA4jY61SXFqeWjFPZB/bJpx4mCxRAFV+xqJT4Bh
-y84K+R9gO0rTEcQb77Jd8p6yDG0DoKY6D/K0WywT/ePcsOig
+MA0GCSqGSIb3DQEBCwUAA4IBAQAsl4xNgSpfkVyTpTjDy8jGYR5XlNYEk6QSHGwc
+yVNfHLg1IpcXjLvE7skPjUyNIynQOYjLS3Bpakjy6yTkNQU5Cib4ygk5V3dFnddT
+POG+2dCXXuk432RvfumrJRDWO+HF9sAR6ByWCg3Hy+tZ9ZMPWKEbpRPFkQ5wPYPs
+fQW4RquXlpR/6PoDPP6Cf13Rwp7uUf8ztARG7ayFJezjBMfMN5hejC4tPwWG6UJY
+v5XnzHrd9qUFqh0E1Q5gpnAHvQRcpeZ2kvajhOn2pNc+iVdNuWHt04X6NvCHY5dz
+SG0FZDkYw5/MQEKbISmfTiDg+gCz4ZW+BnZRjt/x319pMgsv
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml
index 76310494..64a7cfea 100644
--- a/swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml
@@ -103,17 +103,17 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
</md:Organization>
<md:ContactPerson contactType="administrative">
<md:Company>The Royal Swedish Academy of Sciences</md:Company>
- <md:EmailAddress>peter.jacobsson@kva.se</md:EmailAddress>
+ <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
<md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>The Royal Swedish Academy of Sciences</md:Company>
- <md:EmailAddress>peter.jacobsson@kva.se</md:EmailAddress>
+ <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
<md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>The Royal Swedish Academy of Sciences</md:Company>
- <md:EmailAddress>peter.jacobsson@kva.se</md:EmailAddress>
+ <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
<md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f10afe50
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.leedstrinity.ac.uk/shibboleth">
+ <!--
+ This is an IdP (owned by Eduserv) for Leeds Trinity University.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedstrinity.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
+ DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
+ BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
+ MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
+ cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
+ SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
+ ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
+ ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
+ c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
+ jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
+ 7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
+ udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
+ MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
+ hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
+ UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
+ fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
+ +zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
+ d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
+ 31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
+ 4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
+ NE4=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/leedstrinity.ac.uk/c/ukfed"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/leedstrinity.ac.uk/c/ukfed"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Eduserv</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Leeds Trinity University</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.leedstrinity.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Athens Helpdesk</GivenName>
+ <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Athens Helpdesk</GivenName>
+ <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml
index cfc3722d..eb878621 100644
--- a/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml
@@ -83,6 +83,7 @@
<Organization>
<OrganizationName xml:lang="en">National Library of Wales</OrganizationName>
<OrganizationDisplayName xml:lang="en">National Library of Wales</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="cy">Llyfrgell Genedlaethol Cymru</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.llgc.org.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
index 34d305e4..2c477880 100644
--- a/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
@@ -121,6 +121,6 @@ nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>Linnæus University</md:Company>
- <md:EmailAddress>it.idp@lnu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:it.idp@lnu.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
index 538ea2a5..3175db5d 100644
--- a/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
@@ -106,19 +106,19 @@ dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
<md:ContactPerson contactType="administrative">
<md:Company>Malmö University</md:Company>
<md:SurName>IT Drift</md:SurName>
- <md:EmailAddress>drift@mah.se</md:EmailAddress>
+ <md:EmailAddress>mailto:drift@mah.se</md:EmailAddress>
<md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Malmö University</md:Company>
<md:SurName>Robert Faling</md:SurName>
- <md:EmailAddress>robert.faling@mah.se</md:EmailAddress>
+ <md:EmailAddress>mailto:robert.faling@mah.se</md:EmailAddress>
<md:TelephoneNumber>+46 768 428753</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Malmö University</md:Company>
<md:SurName>Servicedesk Malmö högskola</md:SurName>
- <md:EmailAddress>support@mah.se</md:EmailAddress>
+ <md:EmailAddress>mailto:support@mah.se</md:EmailAddress>
<md:TelephoneNumber>+46 40 6657555</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml
index 085b65dd..bc11a0a6 100644
--- a/swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml
@@ -4,7 +4,7 @@
<eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
<eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
</eduidmd:RepublishRequest>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-11-10T13:39:02Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-11-10T13:39:01Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml b/swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml
index cb80c6c3..8ea84382 100644
--- a/swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml
+++ b/swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mf.uni-lj.si/idp/20111101">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-01-13T10:01:06Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-01-13T10:01:30Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf.uni-lj.si</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -19,19 +19,21 @@
<mdui:Logo height="287" width="189">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAL0AAAEfCAIAAACbFlA2AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AACAAElEQVR42u1ddXwUx9ufWTn3izsRJGhwd22BGqVCXan8KlSo0JaWlrpQb98aLbRQqkChuHuwAAkh7noue3u7O/P+seG4XELuEoI23w/tJ7nc7c3OfueZZx6FGGPQgQ60EsTFHkAHLkt08KYDbQF1sQdwQcFx2GLh6+p4k4l3uRDPY4oCcjlhNNIREVRYGEWS8GKP8fLAf4I3bjfKPsHs3uPMzHTl57F19byHQRyHEQIEASgKymREeDiV0Vdx882GYcNUHewJCnhl68WlpeymjY41a62HDrrNZkEQMEFACAEAAJ7mhjgBGAOEcFQU/fEnCZMnay/2wC91XLG8KSvz/vG7edly86lclufP0KVlIAS6dpUNGKCgaSjOC4SQIqFUCpUqQqUijAYqPIIKD6cjI2mDgZRI/qMK4hXIG5db+PtPy+df1GWf8Ig7UauAEEDIb04gEPkGIQAAEgSQyaBcToSHU8kp0u7d5QMHqvpkyMPD6It93xcUVxpvCgo8b79dtWqlze1G50lN8d/XIARKFdmli3TqVN011+hSU2UXewIuEK4o3uzf53zhhYoDB1wh7krtApFABAGTk6W33KK/dZYxJkZysWfivOPK4c2RI+7Zs0tyspmLdRoS98Q+GYrHH4+YMkUnkVzJh7IrhDduN5o9u/ivP60UdZGfliBgjYacdZvxiScio6KuWKXnCjkOmEz8sWNugrj4S5wkodOJvvqybvYDJUePuC/2cM4XrhDehIdTw4erMb4kpCeEAEKwZav9wdklmzfbL/ZwzgvI+fPnX+wxtAMoCvburTCZ+Lw8luNwGwQPxiCAc+eoWRMErK3l9u5xdkqWpqTILpiefmFwheg3IpxOYcUK83ff1mdne0K39WEMCAIYjRRNQYQBQpjnsdeLvV7M8xghIAgYAAAhaMMxTRBwQoLko0Xx48ZdUTboK4o3IioqvGvWWP9ZbTt6lLFaz/gW/B+5KF0wxhDCiHDqppsNM2caZDIoICAImGWR243cbmS1CpUV3rJyrqrKW1HBVVVyFgvv9WIIYejmREHAnbvIvvgisX9/5cWem3bDFcgbEU6ncOIEs3ev68ABV36ep97EOx2I5zHGgCShQkHodGSnTpJBg1QTJmh691G0fBBjWeRyoYoKb3Y2s3eva99eV34+y7KhmhYFAQ8fofr666TY2CvEtHPF8sYHrxdbLHx1NWeq5x0OwcthlZI0hlGRkXR4OKVQtPpkgDGoquK2b3P8/LNp716X14sIAgAAg37q3vuMb7wRJ5VeCWeRK5835w8WC//bb5bPPqspLvIG1cQxBioV8emnCddcq7/YA28HdPDmXHHokOuVlyt37HQQwXRmQcADByqX/pwcEXHZ2wOvBJl5cdG3r/LTzxImTdKgYAuQJOHhw+4//7Be7CG3Azp40w5ITJS+/Xb80CFKFIw7HIeXLzfX1XEXe8jnig7etA+SkqSvzI+Ji5Mg1NLbSBJmn2B27nRe7PGeKzp4024YOFB13/1hJBnkbW4GbdxgF22Jly86eNNugBDcfLOxZ095y5wgCHjwoKu25vLeqjp4056IiqKvv17fsjEQQlBRwRUVeS/2YM8JHbxpZ4wdp46IoFowbkAI3G5UWOi52CM9J3Twpp3RqZOsS1dZywcrnsdVVR37VAf8oFAQ6d3kQY2pDodwsUd6TujgTTsDQhCfIAnq7/SwHeepDjSGXk8GPY1f7t7Ny3v0lyYoKnh4l1x+ecf/dfCm/eFmUMtWYwihTnd5V3To4E37o76Ob9n0R9MwIqKDNx3wA0K4pJhtQd5gDGQyGBN9eYdSdPCmnWF3oJwcTwv6DcbAYKBiLvOA0Q7etDNO5TIFBWwL4X8Y44QEOjysY5/qwGlgDDZssJvNfMvnqd59FAplsJP6pY0O3rQnKiq8/6y2tvwemYwYOFB5uafhdfCm3YAx+PVX88ncljYphEBCgiQj47JPpOrgTbvh2DH34sUm1KLfCWM8dKgqJubyPkyBDt60F6w2/r33qkuK2RbyODEGajU5dZr2CqhX2sGbdoDXiz/7tGbNGlvLWVQI4f79FYMGqS72eNsBHbw5VwgCXvxD3Ref1wt8kHfKZMTNtxg0msv7JCWigzfnBI7D339X/8YbVU4navmIJAh44EDFpElXSFWKy9v6dHHhdqPPP6v56KMapxO3XJ4CY6BSkffdH67XXyETfoXcxoVHVRX3wfvVP/1kYlkctKYJxnjaNO3EiVeIsAEdvGkb9u93vr6gaudOJ8bBy3IhBJKTpf97LFIuv3K0gg7etA4WC//LL6YvPq8rLfWSZPD4LIyBRAIffjgiPV1+scfenujgTajgebx3r/PjRbVbttg5DoRog0EYT7lKN/Mmw+XuWAhAB29CwsmTzPff1//xu6W2lifJUIu0IQF0S5c/91zUlXH29kcHb4KgqIj9/Tfzzz+bCwtZCGGIYgYDjDHQ6sjnn4vq1u2K2qFEdPDmrCgs9Pzxh3XFr+a8PBYh0MratpAkwH33hV91te5i38d5QQdvAsHzOCeb+eMPy6pV1sJCr9h1obXNiDDCU6bqHnk0gqavLL3mNDp4cwYOh3DggOvPPyybNtkrK3kA2sIYAIAg4J495fNeijYYrtjpvWJvLHRgDMpKvZu32Ff+bc3MdNlsQqvKEwcAIRARQb/8SkzXrlegWuPDf5o3Lhc6csS1epVt40Z7UVFDgf5zCXLAGEil8IknI8ePv3JMw83iv8gbjEFZGbtls2PVKmtmptti4UUB0y5hMTfdrL/rrrA2i6vLBf+tOrQuFzpyxP3PauuGjbaiQq8oYNrLIocQGDpM+d13na7gtlM+XPnyxuEQqqu5khJv9gn3jh3OA5lui7k9BYwPkAAch5cuNXVOkyUlS+Niaa2WvBRaYp0PXJnyxuEQSkrYE8eZQ4fcx44xpaVek4n3eLDYCPP8mfwRAgBgiYTQ6sj4eLp7d3nv3opevRSpqVK9nrqSXA1XDm8QAtXV3hPHmT17nPv2u/LyWLOZ57xiC6C2n4/aBrFZK8aAoqBGSyZ3kmb0VQwZouzXVxkXL7kCjDqXPW8wBpWV3oOZri1bHXv3uEpKWJcLAdCWXlHnb4Ri2TaplIiJofv1U4wapR4yVNWpk/SidwNtMy5j3lit/KFD7nXrbNu2OoqKvB4PghBAeKnQpVkgBDDCtATGxEiGDlVNmqwZPFgVfRnWGLj8eIMQKCz0rPvXtnq17fhxxm4/JzPdRbwLjLFMRqSlSSdN1k69WpveXSGVXsKUb4zLiTcsiw4dcv/+u2XjBntpqdfXyO6yhljxJCKcGjZCNfNGw7BhKo32Mgi6uDx443Kh3bscy5aZt2511Nfzl6OAaRmiDqRSkf0HKG6aaZg4SRt2aResuNR543ahHTscixfX79jhtNuFK0DAtACRPVIp0bevYtZtxilTLl32XLq88Xrxrl2Ob7+t37bVccUzJgCCgKVSom8/xT33hE2erL0EwwUvRd5gDI4ccX/3Xd3qVTazmT+vjBHvXuzt6/sVNNc83P9PvlPbeaWyIGCFghgxUv3A/eEjR6klkkto3VxyvKms9C5ebFryk6m83NvujPG1fxbzVygKymSEXA61WlKtIZVKQq0iNVpSJoUUDSUSgqIAQoDzYi+HWBY77MjhEFwuweFANpvgdiOPB3EcRugMmdp9wAhhnY669lrtAw9GdO9+qcRmXEK88XjQmjW2zz6tPXzYLUbZtQt8pluCgEoloTeQMdGSpCRJaqosLp6OjKIjI2idjpTLCZkMSiSEL7ulab9xhDDHYY8HMQxyOFBdLVddzVVUegvy2aIitqKCq6/nnU7E87htTepbuAWMcVIn6b33hs2aZbwUwsEuFd6cOuX5+OOaP/+wOp1Cu7gbEQIIYYKEGjURnyDp2kXWq7eiRw95p04So5FWq4l29DhiDNxuwWzmy8q47BPM0aPu7GymuNhrsQg8jwmifU5/CAGKAqNHq5+cEzVkiOrinigvPm88DPrjT8uiRTW5J9lzl/MiXSQSGBVFd+8uHzxYOWCgsnNnmcFAXTCjPsbAauWLi9jMg+69e51ZR5myMi/DoHYxHwgCjoqi77sv/N77wi6i4LnIvCkpYT/8oObXXy1uNzqXORU3EYqC0dF0v/6KcWM1g4eoEhIkMtlFtvOILYMOHXJt2uTYu8dZXOxlWXSOWxhCgCTBuHGauc9F9et3cUq+XTTeIAQ2bbK/ubDq8CE3OAcxIxrsdToyo6/i6qt1I0eqO3WSnuPRQ2ShKLpEDVp80qEk9p59nLiigtu31/nPP9bdu121tTxC+Fx2ZEHAiUnSOXMib77ZcOGXx8XhjcuFvvuu7uNFNWL6Y9suIvoZEpMkkyZqpk7TZfRRqNSts3MwDHI4BLNZqK/namu4ujreahWsVt5uRyyLOR5zHBIEQJKApgiKBnIZodGQOj2p01EREVREOG0MowwGSq0mQn9yLItOnvT8+6/tn9W2nBzG6227twQhoFAQs24zzHkqMjrqghbSvgi8KSvzvvVW1W8rLKFUAGkWgoBpGnbrJrvuOv206bqUFFmI1/F4UG0tX1jgOZXH5ud5CgvZ8nKvzYYcTsHDIFHABJTIhwAETJCo5xIEkMsJlZrU6cj4OElysjStszQtTZacLA0Lo0KhUVUVt369bcUK88FMt9vdxs0LYwAgGDlS9er82D4ZivZ6RkFxoXlz9Ihr3ryKHTtcbVOBBQFTFOjZU3HbbcarrtbGxARfZByHq6u5EyeYAwdcx7KY/HxPTQ3PMEjgMTg3Cx7GAGCAAUAIi7uYQkFERtFpqdJeveQDBirT0+WRkXTL+rjVKmzdav9xsWnPHqfbjdomfQUBd+4se/XVmMlTtBcmMvXC8QZjsH697eWXKk6e9LRhdkSLTnq6bNZthmuu0QdljJfFhUWePbtdO3Y4srKYigqv240AOC/WOf97FHUjggAKBREXL+ndWzFihGrIEFVSkrSFMD+bTdiwwfbjYtPevS6WbQt7EAJh4eQzz0TddVfYBWiKdoF4w/P411/Nr71aWVXFtXZSxCcRHy+ZdZth1qywhISWGIMQKC1lt213bNpgP3jQXV3NiUkLF8HagQHCDUaB6Gh6wADl+AmaESPUcXGSs7HWYuH//sv6zTd1J054MG615RMhoFDAhx+JeOKJKJXq/N7wheANy6Jv/q/unXerbdZWH7YFAWs05PRrtA/cH9Grt6IFOeF0CgcOuP75x7Zls6OkhOU4HKK9xN/5AE5vWM3qGv4+rFY5FsQwP4mUSE6WjBunuepqbd++SoWi+cGVlHh//LFu6VJTVSVPEKBVWo8Y0Xz7HYYXX4wxGs+jdee884Zh0Ecf1Xz8cQ3jbp0WLI4rI0P++BORkydrW5C9dXXc5s32X3+17N/vsoeQpevveZBKoVJJaDRkWBhlNFJ6PaXTETo9pVQSNAVpCaRIKAjYy2Evi10uZLXxVotgsQqmer6+nnc4BKcTeb1YVHGC6rai1UCvJ4cMVc2caRg1St2s7Q4hfOCA68MPqzdttHNc60phiIaDG2boX389NjLyfEWgnl/euFzovfeqPv+szuvFrVIpBAEbjNQdtxvvfyA8Lu6sG1N1DbdqpXX5MvOxY4zH09KRxBccLpFAg4FKTJSkpcnSOktTUmTx8RKjkVKpCKWSpOmQSq9xHHa6BKdDqK/ny0q5/AJPXp4nP48tKfFarbzXi0GLgfHiYORyIiNDccuthquu0oaFNfOAbTZh2S+mL76oKypi27C5T5+uXfhmXOz5aXR1HnnjcqG33qz86qt6jmsFacQto08fxdznoidO1Jxtvurq+FWrLEuXmI4eZTjurAY08QmRJNTrydRU6YAByr59FV27ymNjJRot2Y7aMULAZuPLy7iTJ5mDB12ZB90F+azVKrScsSXG2WT0ld9xR9hVV2mbrVJ7+JDr7berN260C0Lr1HmEwFVXad9977xQ53zxhmHQe+9Vf/JxbatIgxCQy+GMG/Vz5kR16iRt9j1uN1q/3vbVl3WZmS6vt3nG+OgSHk716aMYPUY9aJAqJUWqvVChuxYLn5/P7t3j3LLVnpXFmOp5sfJSs1MhCFgmI4YMUT44O3zMWI2syY5sNvPfflP35Vd19XWtM5MiBK65RvvOu/HtvmGdF96wLF60qPqD92tYthWkEQQcHU3PeSrqttuMzeqMGIMDB1xfflG7bp39bG5zUYHQaMheveVTpuhGjVSlpslaVQBWQNjLYpmMEEfOcdhmEwwGqm0nMpdLOHXKs3Wr499/bcePeZxOoQX2aLTk1Kt1s2eH9+4TaMFDCK9fZ1uwoOrECaa16s6NN+oWvhnfviGn7c8bnsdffFH75sIqhmmdpOnVSz7/1ZgxYzTNfqqujvvhh/rvvq2vrOSanXrRzhsbR0+YoJk+TdevvzJE6ZKV5T5+jOnRU96rl8LtRh98UJ2QILn1VqNor1u3zvbBB9Uff5zYpYus6WcxBl4vCsVeYrHw+/e5/l5p3bzJXl3dUJSp6dUQwomJkgceCL+1uTib7GxmwWuV69fbxUix0HHbbYYFr8e1o7gl58+f317XEu98+XLzgtcqg5ae9/8IAGDKFM2HHyX0769slhBbt9rnzi1f9ovFbkdNnYviJKalSe+5J+yll2NmzTKmpMjOZumvrPRu3erYt9elUBLiSfWbb+qef64iJVU6aJDq1+WmDRtsDz4QIf6J5/GHH1b/s9qekioZMKCZPi4ulzD/lYoNG+zVNZzHgyQSqFA0rzbJ5URqqmziJO3o0Wqthqyr4ywWIaBstngis1rR9u2OrCwmPl4SYOwJD6dHj9awHnz8OMPzoVIHY3DiBIMEPHiIqr2CSdqZNxs32p5/rry+XgidNBQFZ91mWLgwLjGxGYXGYuE//6x2/iuVOdmeprmYCGEAYGqqdPZD4a+8Ejv9Gn1EBB0gxv2tMvv3u959p1oQwMlcBiHQu7cCAFBYyK5bZxs6VBURQX/2Wc0zz0T37NWwTeTnsz/9VO92IYdTmDZN11SuVFRwr86vys31GIzUpo2OokJ22DC1uIE2W0qdJGBUFD16tGbceI1WQ1ZWcRYLH2AtghBgDAoK2C2bHQDgrt3k/t+rUBBDh6nkcuLwYZfHE5JEhxAgBI4edWs0ZN++inZxRLQnbw4dcs15sqy42BtqsVYM5HL42P8iXngxplkzxrEs93PPl/+42OR0BpreRZEeG0c/cH/4awtip07VNXsYQQj89FO9yykkJEg5Ds97sTw2VvLK/NiJE7WdkqQyOQEAqKjwrlppi4mld+92jhqlmX6N3vfx334zx8VKoqLorVucw4ermjL7+HFm8WLTxEnaDz9MmDhR26ePQq0mIQQsiz75pKa6mmu2CC2EwGigRoxQjx2rkcmIkmLW4RACVgVBQIcD7dzpLChgu3WV+2snNA37D1BGR9EHD7ocDhQadTDHgUOH3AmJ0nap3N5u1uiKCu/LL1Xm5obqe0IIKFXE3Oein342St0k/kEQ8MqVlnvvLV7zj61prLEgYJWKuOVW/ZIlyfNeiklJkZ7tWyAEFgv/519WhDDP43oTv2WL4/ffLaWlXtlpZTnMSEulcM0a219/WqurOdH6AgCw2YQD+10TJ2knTtKyLPrnH6toAfJHbq7H40EJ8RKPB6vVZEQELUqLX34xv7mweutWewvaI4SgSxfZq6/G/PhTpxtu0MvlhCA0ejdBAI7Df/xhufe+og0bbP6Xoih4y63Gd9+Lj4ujAj51tm8jCGCxCK+9Wrlvn/PcH3f7yBuXC82fX/HPaluIMhAhoNUS8+bFPPBAuEQSyF2nS/jis9pXX62qKPc2FTMAgH79FK8tiH300cj4eGnAajty2L1mrVUhJ41GSnQCGI3Ub79ZBg9WhYXRFjP/55+WlSutq1dZd+1y6vVkp04ym11Y8avZoKf0OmrTJntkJN2rlwJCsGOH45dfzCYTn53tLipiq6v5yZO1Oh3lfxeiAUkigTt3OI8fc/fprZBKiZ07HR99WFNXxyd3kk6dqvPNicnE8xyWNla8CALGxUkmTNSmpEiLi9naWh74OedFjae6mtu2zSmhYfcecp9zVKRdaprsYKbbYhFC3LAsFr6gwDNqlOYcdeR24I0g4K++qvvyi7oQDVMIAa2WnD8/5q67w5q6iOvquAWvVX7+WZ3bhQJYKAhYr6fufyD8jdfjBgxoRsXDGCz+of7llyvXr7fX1HKREbTRSBuN1KGDLodd6NtX2aOHPCVFihCuquYPHXRnZTGTp2gpCv663BIdLXn6mcht25zbtju6pcsSE6WfflIzYYL2+hv0AwepeB5v2eRMTpb6x2U6HMKnn9byPP7wo4SBg5QaDZWaKisp9X68qHrGDMPx44xSSVx/g0GkviDgNxdWffVVXWqarKkzn6Zh9+7ysWM1GOFTpzweD/LftAgCOp1o506ny4n69lP6q/wpKbKuXWX797vM5pCoQxCwrIyz24RRo9RNV+wF5c2mTfaXX6pwOELyWWIM1GrixXnRd90d3vTBFxWxc58tX7HCEkBB0fXYp49i4Zux99wTHrDo8/M9S5bUR4TTBgOl0ZLr19lMZn77Nue6dfbKKm9kJBUVRa9dYxs7XqNSkj16KqZN00+erKVpsGOHc/wEbWQkvewXs9eLn50bHR5GrV5tO3TITVFw/37nU3OiUlJkERG0TEb88YfFahWmTtX5Hlt+PvvF57XJybJHHolITJSmpsqsduHFF8p79lLccIPh1+VmgoAzZxrEtZGf73n1tarqam7mTcboaFoQsNuNA+JZdTpq9ChNcor01Cm2ro4PUJZ5Hhw65Cov9/btp/DP4ExKkqakyvbucVltIVEHAHDypEerJfsPULXZYn6uvCkpYZ9+uiw/PyQHCsZALifmPhf1wAPNFBLPyWGeeKJs00Z7gIaIEJBK4U03Gd55N37gQFWAEPJ60fz5FR8vqo2IpIcMURmNVH6+Z8gQ1eDBypwcz4YN9rVrbW4XOpnr6dFdnpAgLS1lZTIiKoqmKLhrp/P228PUanLbNodCQUyapB0yRCWXE2FGiiTB6FGaAQOV4lB0WkqlImLj6O7pcvXpZ7Zhg/3X5Zax49TTp+shBAyD3n23qqzUy3nxgQOuw4cZqZS44Qa9QkFgDL75pu6ff6wP3B9xw/X6I0fdH31Us2qVpUsXeYDXmiRht27yESPUZhOfl+fxt9OImtPx455TuZ7+A5T+54DkZGliomTPbpc9BDVZpGB2NpORoUhIlII24Zx4wzDo9der1q6xhUgaigKPPRbx2GORTSXk0SPuJ54o27vHGXAphIDRSD7zTOSzc6P9jeU2m3DwoIskoV5PSSRw3Tp7aal34iSNwUBBCLOOMq+9Fjdpskavp/Lz2O3bndVVvEZLjhunXb7c/NNP9eVl3n9WW6dN00+cqJHLibFjNddfbwgPpyUSYsgQ1YSJ2qHD1Onpch9/ZTJi8BDViBFqtd9C53lsMFLDh6u7dpVxHP7889qcHOaTTxPHjNXK5cSePU43g2bMMGi1ZGkp++r8SgzAuHGav/+y/vuvrVOSZMYMY2qqjKZh07KmYWHU6DFqiYTIOsZ4GptPIQQFBeyJbE+/fgp/b2hqmiwyktq50xGKuRVCYLcLJSXeseM06lYGZbcDb5YvN3/0YU2IBigIwW23GZ9/IVqhCBzooUOuxx8rPXTIHUAaQcBdusjeeSfu1llGnw0DIbB5s/2zz2q2bHYQJOzVS5GQICkq9m7e7AgLp4cMUYWH03/+ZUlOlvbqrRg5Uj1+gsZgpKqq+MpKbvJkrcFA1dRwSgVx7XX6qVN1FAUJAqpUpELR6ky86GjJ6NGazp1lEAK3G2Wf8NxyqzE5WaZUEomJ0o0b7cVF3htn6sPD6W+/qf97pZUi4d69rrHjNM/NjZ40WRcbKxFJ89FH1UePMF27yfztNDIZMXiwKilJknWUEZPk/WYSlpSwx7KYfv2U4eG0b3q7dpVJpHDPbmcoT0RUdBDGI0ao2xBe2Hbe5OYyc58tq6kJycSHEJ48Rbvwzbimdppjx5gnHy89coRpKmkGDVJ++FHCqFEa32LEGKxYYf53rfXee8Pvuis8LU0mlxNi2tS6f+25Jz3jxmliYyWlpWx2tmfESDWEwGCghg9Xj5+gGTJYmZwii4+XjBih7tdfGRMjaRcLmDg0qZQYMEDpk4iCANavt5/KZa+9Vi/weN68CoWcGD5Cffy45+abDf4txNessb38UmV2tmfCRI2PBL5Hm54u79VLfuKEp7qa85dIEMKyMm9OtmfgQKVvpyMI2KuXgnGjzExXiN6jU7me7umytDRZSO/2Qxt54/Gg1xdUbd3qCGXqBQH36aP48MOEhITA3TQ3l3ni8dLMTHfT8/bkyZoPPozv3r2Rh+/ECffbb1XOfS4mI0MplRJyeYP3MSKCrqryrltnl8vhqFFqpZJc8pNpxAi177RpMFAJidILVsiTIGC3bvIuXWVJnaRLlphWr7bdeWfYiOHqVats3brJRoxU+27/qTllNhuaPz9m9Gh1s5MZnyAdPFgppqAHHLLKyrhTpzyDB6t8ug5FwT4ZiqIib06OJ5TdimFQWZl3/ARta3erNp7E1vxj/fNPc4in7uhoev78mLTOgaQuK/c++2z5vn2upnLy2ut0H3wYn5IS+JF16+xOJ05KCuQfScJZt4XFxdHLl1kOHHB16SK75hrdRcxEFY0rd94ZlpoqNRioAQOUM2bo4xMkNA0LC1nRUme18QvfqMrNZR95NGLmTQbfJJhMvFgS1Ydu3eSLFiVMnqwNuCOCANu2OV58oby2hvO9qNdRL82LyciQh2IPJEmYmen+5pu60IyHfl/dhkkpL/MuWlTrdOKgsXGiJ+HpZ6JGj9YE/Mls5ue/Ur5tq6MJafCNM3Vvvx3nb+TwVakpL/fW1nDl5WzA1Xged+kimzZdZ7MJe3Y7pVLi3vvCW45gvzCQSonHHo9c+ktyj54KrZZUKoniYq/bjTAGP/1oWr3adu21uocfPnO6tNuE5+aW/f67OeA6iUnS9z+Inz69KXXgv//aX3+9yuEQfC+mpErnvxobE0M3NXA3+4x+XGzau7d1RuRW71MI4U8/q/vzT2soOxTG4NZZhjlzoujGhgqGQW8urFq61NyUeTNmGBYujPft9AjhvXtdv60w9+6tkEhg9glmzRqbTAZHjWoUCrhypQVjMKC/athw5bXXtT3v1eUSTCbe40Fy+ZkTDs/j+nqeomDbnMkQArWKJEkoqmL1Jn70aI3dLjw3t8JgoD74MMEXj4cQ+Prruqxj7tkPRjR1t2k05JAhquJi9tQpNsC4lZ3NAAgGD1b55iQxUUpSYMd2Z1BjLITA6RTsdjRxkiZ0S2Cr5zfrKPPzUlMoW4Ag4IwM+VNzogLCphACP/1k+v77+oDMSIzBtGm6Ba/H+vvwamq4V16pWLiwevEP9QjhiZM0CQmSHxebly6t5/mGQRw96t60ya5Sk527yKZN05+LBT0ri7lpZsGsWwvz8s6ItD17nI88XFJdxbX5siJUKvLJOVGLPko0GKi6Wq6+nrvlFoN/WM/2bfbVq60vvRTTKVnqdArffFNbWOjxv0JUFP3Wm3HjJ6j9p060x3z5Rd1vK8z+RcFuuz1s2nRdKPFVBAE3bbKv+ccW+r20Tt54POiNN6p27XIGPblhDPQG6s234vr3DyyYsHmTfd6LFTZbI/syQnjcOM1778VHN7bBy+UETcEdO5x79jhTUmTDh6vVanLrVvvGjY6aGs7pRJs22tevt99xR1iABt02KBTEn39Y9+1zpaVJxZEjBL76so4gwMyZxnYpzKPWkDQNJVJi925nly6ygafPVqdOeV5+uWLWbcarrtKJsW/zX6msqeHHjWskBjRacsAAZVaWq7TE6xP5EAKWxVlZ7owMRXx8wwRKJUTXrvJdO50BpuemgBB4vbiqips0URtijn3reLN1q/29d6s5LiSDzQMPhN99d1jAdpaf75nzZFlBQSP7siCAvn0VH3wYn5wcqAgTBEzvLlepyPUbbAf2O/v0UU6eok1Lk9bXcwcz3dnZTEQk9eCDET16tE9qtEJBWCzCli0OAMG0aTqahrW13Jdf1t13f1hq6w+rLX9RYpJ09SqrQkno9VRBgefV+RW9eilmPxRBknD5MtOC16oMBuqxxyK7dZMHzKFeT/XsKd+/311by/tbk61WIb/AM2aMxueFCAuj1Cpy82Z70EdGELCmhgsPpwYOCsn50AreuFxowYLKY1nB41sFAffrp3z9jVh/R5J4hfmvVGzaZPcnDUKgU7Lko48S+vQ5I5lsNj4nhzGZBIWCkMmInj0VCOG1a+3HstyDh6iGD1dPm6afcaPhllsNkyc3H3nTZuh05L//2ktLvWPGqGNiJJs22QuL2NmzI87FC9gsEhIkKamyf/+1rlxpXbvW1q+f8vEnIhUKcu1a63PPVdA0fO/9eJ87XeCx/7RHRUmSU6TbtzscdsGnhxEErCjnvCwaOUrtU8WSk6VFxezx40zQQwxCoKrKO3GiJuCpNYtW8GbTJtsnH9cFtUViDDQacsHrsQE7FMZg8eL6zz+r8/e5YAw0WuL112MnTTrTWHDXLsecOeUfL6pdtsy8d68rMpJOTpZmZCjq6vh1/9pF70xUFK1Wk60KOA8RWi118qRnzx5XXKxk4CDV55/Xjh6jHtBfde5XborISHr4cHX//sqrrtJNnKiVyYitW+1z5pQxbvzmW3HXXqsXJ6q2lvvww+rEBKnOb4UkJUlVKnLHDmdAxkhuLpuQIOnZs0EA0zRMSZFu2eII6jCHEJhMgtFIDRkSXOSEyhunU3jt1ars7ODCBmE880bDww9HBpw+Dh92Pf9cudncyL5MkuCxxyPuuSfcJ4F273Ys+qimTx/FiBFqm1XYscOxbbszJUXSvbsiI0OZk+PZvt0ZFUUPHqw8T9VpSRKSJPznHxvjRkmdJJs2OR5+KOL8VRAmSajRkGo1iTHYts3x1Jyymhr+5fnRs2YZ/dQXuG+va/MWx7BhKp8vAkLQrZvcZuczM92+q4mayqlcz4gR6vDwBpKFhdEIgW3bHEFVZIRAVRU3frxGH6wCXKi82bjJ/tmntUGFDUIgIV7SNE3Q4RBefqli/35XY7UGXz1V98orMUplw1PJy/P88L1p9kMRt95qFNulYAS2b3Pk5rITJ2lioiVdu8ri4ug77wxTqs5jJpReT23b6sjJ8RQWsBkZimnT9Beg5LbbLbz1ZtXu3c4nnoh85NFI2m/V0TSMjqY//bTGbhMG+R22KQr26iU/fsxdUMD668gmE8+40dhxGtEsBCHo1Em6/4CrxE+VbhYQArNZCAunhg4NInJC4o3Hg956q/LoUSbogQJC8PDDEdddZwgwMPy81PzVV412KIRAWpr0vffjfc6Hmhru+efKIyLpW29tWGpKJTl4iKqujt+yxTF0mCotVRYVRQ8Zovbx7DxBLieqq7lNm+wOB5r7bHRC4oWwH9I00b27vLaWi42R9Oun9HeJ5OYyL75YcWC/u6CQ1eupnj3P1FdQKsnkFOnWrQ6bzT+CAhYWsskpUl+9Y4WC0GiIDRscQROuMQZmEz95SpAi7SHpB4cPuXdsdwUlDUKge7ps1m3GAE9nQYHniy9q/XPwMAZKJfHU01H+56DMTNfOnc4fF5sWfVTjPm1oVyiIO+406vQEzzW8cgGWPoRgwkSNwUj26SPv1fsCFbGCEKSlyd5+O76klF2woNJn/921y/HgA8UbNziuv17/wQcJf/5pWbvW6v/B/v1Vjz0eIZVCf+ON0yl88klNWZnX97bx47UTJmiCWpAJAuTmev79N4gtJ7i84Xm86KOaXbucQTUbkgRPPhk5dqwm4OPvv1+z7l+7P5kwxjfO1D/+eJT/qkpIkCQmSPcfcK1dY7PaBF+lD6cT7dntvP32MOMFbHKh11Nx8ZLJU7Spqe15/A4KlYrs31/JenCXLnIIwfLl5mefLS8r5R79X8TLr8T26CEPC6MIAvh77iAEnTvLck+xJ3POaJ8EAWtreLWaHDZMLa40moYGA7XuX3vQ7Bmexw4HuvpqbQvHjuC8yTvFvvlmVdB8C0EAffrIX5wXo2qseezd61r4RqV/MBFCIDVV9vY7cdHRDfI/O5vhOKzXU917yDMyFNknmNWr7YVFbO/eCoOB+me11Wikpk7TXZgKZCIoCvbooWjqwL8AUCrJ7j3kdpvw7jtVb71dBTB8+eXoRx+NFCc2OVmakiKz2wVBAL5VJ5USiYnSLZvt/rsVwqC4mB0+XOXrSx0VRZ865Tl2jAmm5cD6er53hqJL57OumeD71PoNtspKLkhFGYBpGt92myGgdTbDoP/7us7fPAUAkEjgQw+Fd+3asPVWVXHzX6nIyWHEX4cMUX31ddJVV2lXr7I+NLv4669rT2S7mw1GvrJRWen980+rQU9/9FHCvfdF+Id0HT/mnj27+Kuvav29DX36KO69L4z0W7MEAcrLvd9+U+fL7JFKiTvuDDMaqZYPVmIY2qqVVo476/uC8MZqFdassQV1siMBdO0mv+pqXcDrO3c6Nm2y+7Eb8wIaNkx5w4yG3DZBwD/+WN+1m3zECA3GYMcOR3m5NzVV9tGi+DvvCsvMdC9fZrnrrvDLsQPlOaJHT8Wbb8V++lnC9Gt0vkXLMGjpkvo77ixc849tyRJTZuYZJzZBgFtvMfbvr/B/WAQB16yxZWa6fK/0768YM0YdVMuBEO7c4cg75TnbG4LwRqzBGVyzIeD11+mjGpfQdbnQ99/X2/yC7DGGeh310MMRPovk7t3On5eaEhMlEILcXObdd6pqazkAQEQEvXBh3AsvRL+2ILbZlMcrHgQBpk7V+8efnMxh5jxZ+tRT5U4Hnjcv+qHZ4Z9/Vltfd8bbGhFJz54doVSS/gpyfT2/eHE9yzaIJqmUmHmTQTQXtfztVVX8+vVn1Y5b4g1CeO0aq8MhBLXZJCZJpl+jC3jbzh2O7dsaBQQihKdM0Y4apfb9umePo6aGf+WVyrlzyxZ9VDPlKm1GhhIAUFDgOZXLzHkqctiw82KovbxgsQg/fF83a1bh8uUWuYJ44MGwp56Ovu32MI2WXL/B7v/OiZO0Y8c2EicEAdevsx84cEbkDB2qGjhQEVTkIIT/XWezWvlm/9oSb6qquF27nCEEZ+GJkzTJyY1USJZFy5eb/LVpjEF4OHWnX5VUgoCzZ0d+/kVi1y7S776tW7nSCgBwuQRBwJ98UrN1q+M/1OHu7GBZ9PbblU8/XWazCc+/ELVoUUJmprugwCOTES++GDNxgtb/zUolcdfdYVptI5FjNvPLl1v408qKWk1ef70+aCsCgoDZ2Z7jx5nm/9rCJzMPuIqLvUFrLOp01NSrAw87hw+7t251Bgqbq3QBfSg0GvL66/U/LUme+1y0SkW+/FLlIw+XfP55rdnM3zLL2EEbAIBEQgwdqo6Jlbz3fvzTT0dPnarr2VO2aaMdABAZSXM83rzJ7q/TDBumGjeukZ0GQrhxgy075wwDRo/RJCdLA+KfAgAhsNuELVua906clRSCgDdusns8LV4bAIRwRl95QIV3QcC//WY2mXh/YRMWRs2aZRBpjhAoKmRNpgYZGB0tee65mO9/6DR6tHrVKtuij2ruuis86rzVwry8ACGYMkV73XX6kyc9HIcJAjz2WNTMmwziXy1m/pNPqouKzkSZyeXEbbcbNX4ihyBAVRX3558W3ysxMfT4CeqgIV0Yg+3bHFZLM1vVWXlTVcXt3esKulNQFJx6tS4gGr64mN24we7/WYTwqNHqjNP0Mpv5R/9XcsP1+fPmlW/YYKuu5gAAQ4eqvvm20wsvRt11d9iIEeoQpxUhgDDwnwGMga+VCzjdkSpgbSHUUJ8LYyAIWBAwz+OALR+hhvzixlfGviv73uZyIv/riwNodqhnu3LLoGl47z3h+/c7d+92AADUatIXOtItXd4tXSFu8T4MHqwcMkTZ+Hbgv//aqqoazMcEAa++SqfXU8G0Y5ib6zl+opmt6qx2v927nD/9aGpZlCEEYmLoZ+dGB9SO+/03yx9/WP2FjUpFvvBCdJfTNhuSBGWl3r//tu7b61q50rZ+nf3ECcblQlotOWaMZvhwVYjBLvX1/NtvV/31lyU6SuI7q+ecZF57rXLzZnt6ulytJr/4oub/vq7zctjnrBEE/H//V3fsmDsjQ3nihHv+/Mq1a+zbt9tXrbIdOeI2GKiICNrlRB+8X7X8V7NSSfjSJ8rKvAteq1y92pacLPVFQGdluefMKYmPl/oC7Q4fdr3+epXLKXTzy/isrPQuWlSdmiqTSokPP6z++WczxrhLl1CPilod2aOnIjFB6m9WLa/wLvnJ9Ptvltxcxt+jJJEQEIIN6+3C6Vh1CIHVitLTZb74Cq2O2r7dWVLCtnBYhhB4PDg5WTJsWOAyPuvj2bPXKTY0aAEY4/79FZ0aZ6U4HMLqf6y+4F8AAEK4T4Zi8NAzJyMxyv+224wZfRXXXKPzsOjHH03331d844z8o0fcobcX8HrRmn9sS34ym81nZKnVwv+2wrJqpc3lEiAEhw66lywx+8cLiy8eOewGADgc6I/frbt2Oa66SpeaKv14Uc0TT5TW1HAQgo0b7T8uNlVUnDnoOp3C339bf1thsduF0zMA/lltXbPG/tefFt/6rqvjly8zP/98xd9/ndka7Ha0eZPD5UIY461bHd99W19QwILWoHu63JfXV1TEfvxxzU03Fsx7scLhEEgK/v231f/No0dr0tNl/nqPl0WrV1t9iodGQ44Zowrl0LNvr4thApnQ/BNyOAT/k9vZQNNw3HiNRNrou48fZ44eaWTyIUk4dapW29i/qlaTL7wY3aWzbOxY9V9/pX39f4nXX69L6yxLTW2FaV8iIRQKQiqFcr/6o1IpQVFAJoNSCQEhUChIiQRqtWfeQBBQpSbEj8hkBE1DrY7q3195221hiUnSkzlMdTVHS6BYBtu/0QFNQ6kUSqTQly9Rb+I3b3HQNNyyxVFe3sAwpZKQSom6Ov6llyo3b7af/lIgkxMNacVKgqZhG7z6PI8PH3a/Or9yxoyCl1+qtFiE2Q+FLf815cMPEzZssPlrOUYjNaVxbxiCgAf2u0/5mfJGjdYYDGQw2zHMzvaUlnoDXm+eN0WFbN4pT8vmPoRAZCQ9eHCgfWXrFrvVyvt7o+Lj6fHjNU2vEBlJP/Fk5D//2GpquBtuMHzxZdJnnyWGhbdCHSYIQJCAICDl9wjEnrwEAQkSAABIEkAIpI03PoqContf7CQFRVW9iLVZhf79VXGxErHwIIQgIA6GogiSOFP/a88ep9FIjhunKShgd2x3NIwKwtRUyYgRqtJS73Nzy8X6VlD8IgggBATZ0D0v9DsVwXrwu+9UvfNOFeNGjz4a8euKlDfeiOvTR9Grl+KqKVqfPwEAACGYNFkbGUn5H8jr6vjtpwcJAOjaVZaeLmvZkEMQoK6OO3LEHfh6s+8+foIJGlaIMe7eXe7b1EVYrcLWxnFlGONhw1Q+FcFi4fPyPLm5npwc5sgRt9ksxMVKXnm5oqDAQ9NQLJLVOt40dBHzF2+AJM+8CAkAACAbu9JJEoqqG4SAJEFtLff6goo3Xq8cMVL1xsJYYxiFMSZIACEgqYAri98IAQA8hzdvtF9/veH2240QgtX/WBvkOQRRUfRbb8WNGKk6edLzzDPlJ064afJ01wgISAJACMjWx7gqVcT11+sffiR8+a/JC16P7dGjIWRdIoH33R8RUCm3SxfZgAGNtGOE8ObNDtdp9UOtJgcOCt6e0+vFhw4FJpw3E5mAMThyxM3zQbo/QggHD1YGuNqzs5mTOY0ElVRKjBuvEb2SSMAfflj9888WAgKex14vFgQsCIBh0IsvVHz6WWLbazP7V1SEjeoB+la5Pzgv9neUyuXE0KFqiZRYudIqkdS+9lpss/nSEEL/W8vL9+Se8tx+h5EgYWwsvXeP69gxZuBApVi/My1N9u678Y88XJyZ6X722fLHH48UK+hCfHq0bbJOXXud/vob9E23gqbrTSolxo9Xr1lj8zuQw2PHmIJ8T6/TBVMHD1YplXUeT5Cj3YnjjMsl+KvkzTwnl1M4cYJp+UIYA42GaMrWA/tddjvy36QSEyUDB57eyyCcMEGblcXs2ulMTpZ2SpYq5IRMRkikUKMm3W6h2fG0AN952381QAJCAoqF0wEAMimBEPCy/ssOuNxC9GnXPcJApSLHT9CMGavesd257BfzxImaq6/WIQEAALCfRihWqRFP0QCAtWts1dXcx4tqIAQUBc1m/u+/zeISxxgLAk5Pl7/3XsIjj5Ts3OG0mHmpjIAQYACQADAGSAh+g01BUbC4mN261SGTESoVoVKRtATSJJBICJKCCgWRmCjxLYmhQ9UxMXRZWUM4gxhCmpnp8vGme3d5XJzk1Cm2BesuhLCoyFtVxaWltcibqiquuJBtWdPGGMTGSgLqX7As2rvXKQhnljLGuP8Ahe+ETBBgxAh1j+7yX5aZDux3Tp2mnzRJqzqHSGHRDBNgUIEQEBAgjMVTaEyMBGNQWnbmWORyCRXlnGgiQghgBMTHLJUSMhkUBOB2Y4wBL2CMgdDI8AogIX4drq/nt2y1z38lpn9/JYAg84Dr4YdL1/1rf/ghL8ZQEBq6cvbrr3zrnbj/PVqaleVJTZOKUyegwCu3Fnl5Ho7D5eXeulq+X3+lx4P27nGWl3Ndusp++qmTL7U+IVHap4+ipORMUjbP4T27XXfcESY+o4gIOj1ddvJkS7osQYB6E5+b6/F/3M3wpqCANZmDVLVBCHftKg0oZlNezgV0D6AoOLRJjW69gXr44cijw9RLl5p273befLMxI0PRtvAajsOMGzEM3rnTUVvLORxC375KAAAvYDkkxH12zBh15y7Sv/+yDBumyshQuNxo2S8mmQyOGaMBAHi9yOvFTifKy/McP85kZzPp3WUDBig4DrucyOvF+/a6AAB2m5CeLg+PoARBVMPhhvU2jMDoMQ2FORUKoksX2YEDrrX/2hITJB72jCVw9CjN66/HznmyzMtiJACEsMuFOA4HNXOcDUlJ0jfeiAMAnDjBfPll7bPPRP290vLXX2a5nLjjDqN/ES6pFA4eoly9+oxbmyDg0aPumhpOTBygadirt+Kvv6wtfyPrQdnZzNSpuiC88XiCVMknCNirtyKgnMzJk0xtLe/7IMYgPILqe5bG6L17K9LSZKtXW99+u+q66/SzZhnbMIMkCYYOU3XvLs/PZ/NOedxuFBlJR0bSnBdrtaRaTQAAuqXLv/wy6Ycf6r/8otYYRpEEjImlF74ZJ0pBmYyYPEWDAfj5F7PNyt95V9hNNxlSU2VOpzBgoCI2lq6t41avtjqdSCojDAbKyyKNlpTJiXoTf+NMgy8XXaejbp1lCAsn7TZerpAOHqwi/LTDadP0bjfasd0hkUIIQb9+Co2ajIk5V0dK584ymQzOeap000ZHRAT9xsLYSZMCoxIGDFDpdKTVKvjaz1ZWcvn5rC/hpGdPuUJBtKziIATy8jyCcEblDeQNxiAvjxG7JrVwIYUC9mySWpuV5WaYM4XNEcJpabLEsycDKBTEzJmG/v2VQb1gZ0N4OP3uu/Gi2uvrTPbnnxaPB4+f0CAJIARi2ymHXWA8WC4ntH6dp3r0UPzf/3XCGIvVtX0mR6WSfO21OH9FDQC8fbvDYhZumKGPiaEffDDC/4wGIbj77rA77jACAEkSDBqk9pegBAFuucV4ww0GsS/aSy/FtqF9ZlOYTHxFBff339YhQ1RvNZeKDwBITZUmJUl8NfAgBC4XOn6c8UWzpKbKwsOpkhKuRRUHlBR7nU7kWyeBvHG7UVGRN2jAjV5PJSU1IgTL4qyjTMBprUcPeVDrVkAARqsAIfCPB2BZ8Msv9evX2x57LOKhhyMCbI86PaVrcgWCEK8AW76yIOA//rCsWmW77Q7D//4X2axFW0zYO/1zM6P1XbBdyn6dPMk8N7d82zbnxAnat9+J63yWWGCtluzeXX7w4BkDjCDgI0fcPuERHk7Fx0uKi70tHPAghJWVnMnEn5U3VitfXu4NphTjqCg6wEBnNvH+2V/i7PTpI7+QsRA0DSdO1F51lS48nG7f7yUIOGKEZsQITUQEdSHD41tARQV34IBr6jTtwoVxAVY0f5Ak7N1b7i/8IAR5pzw2q2AwUgAAhYJM6iTdvr2lukkQAptNKC9nfYs8kDf1Jr5xBlczwBgkJUkCOg1XVnn962VgDLQ60hd8fmFAECCUTvRtAIQgIOT+oqNPH8ULL0bPmGEI2suuW7pcqSSczobHShCwqoqrreNF3hAESEuTBc3jdLtRddUZJ2CgvK2t5d3uIIYFggDJKdKAE1BxMet0+ocSg4hw+txVvw6cDUYj9fDDkaE0QExIkATkMNjtQmnJGWdWSrI0aPifIICKyjNeqkB5U1vNBc3LIgjYVDAWFLD+3S4RwgkJkqa5ogiBlrIjIAA45IxM2KLFFfr+d5a/AQCA707hWd93SWxKZ7mN0MZmMFCxcXRREdtwQxB4PLiw8AxvIqNopZLwnbmaBcbYPzQgkDcVFd6ghymJBAYkpmAMSorZAONbcrI0oMWoGPiyfYeTpgAAEGMg+iMFBAgCEBCIhxrRJgsJQECAMQAQEISYxNpQidLvMIJJAoqXgrCBdgACSACMAQSAgACDBi5CwvfXhlfFu8QANFSzbaAtgKDB6SjaFUUfJEkChBtKVEJ4+qtgw9MT/xMnoMEqDM+QEgIASYAxhgASEIo/NLxLHC3A4gdFCyYJIYAAYwAJACHACAIozgYWfR3iyZEkIMINfcvx6YFpNOSMGw3+5fsVCiIpSbrDT4NBCBeXnBEe4eGUSkW03FQGY1BdxXEcFpX6wH2qppZrOVYLY6BSEQH9rlkWVdc0iiYkCJiQIAlYrAgBnsdOhzBxolYmAxSFx0/QRERSTqcwbpwmNU1WVeUdPkLdu4+ypNTbv79y8GBVSSnbOU02fLiqptobEU4PH65yOnmKAkOGKMPCqPJyvn9/lVpNVlR6+/VXdO4szTnp7txFlpQkyclmunaR9eotLyz0qNVk794KmoIlpd4ePeRxsXRWljspSdotXVFXx9vtqEtXeZeu8ooK1u4QunaRJSdLGQb9/oflx59Mx465d+92fPNN7Z49Do0aJiVJEhIkOScZu0OIjqb37XNBAkRH01YrfyyLiYqkZVK4Y7tdrSbCw+iso0xNDW80UiYzv3+fy6CnKyu8Bw+5tFqSE9D6jVaJBHhYtH69jSahlIYbN9qtFkEuI3fuchYWshIpPHLYffiwm5LgggLP1q12goTV1d5//rEgjO0O4c+/LE4XYhj055+W2lquro7/4w9rbR1vsTR5FvGSxnnWoKrK6xP8Gg1pMFAth42K8e2+QJxG8gYjYLUGUW4wBgolaTQ22oCcTlTfuIgcRYGmyg1NQ5qCN9ygnzXLmJPNTJqsHTFCXVfLZWQob7rJsOJXs1yuvfvusF07ndXV3tmzIwoKPEePuh/9XyTLon17HY/+LyI8nD561H3HHWG9eyt++L4+MVFyz71hX31Z272H7I47wg4fdlVWcI8/Frlzp8NmFf73WKTdLmQdZR79X0RsrOSbb+p69lLcdVfYoUOu+nr+8ccjCQJWlHsnTNAOH6ESBFxQwFx/vZ6iiBUrzMePM6NGqm+caRgxXOVwCn/9aV250nroEDPzJsOUKVqlioAQ3nlnmMMpDBqkmjBBm5PD/N//1T38cARC2GIWZtyoT02VRUfTdfXco49GFhZ6Pvqo+qGHwvPz2e+/q3vs8Uiex06ncOONhrh4ydy5ZTffYkxOlspkRGyc5MYbDQmJdHU19/jjUTt2ONats819NiYvz/PpJzVPPBHpdqOXX6q4995wo5F6bm7ZTTcZevaUkyQYPFg1cpT62WfKRLtlwMzHxjUqDg8hqK3l3G4kum/lciIsPKhnEDocgi9Uo5G88XLIvwzu2aBSEgE9FlwuwWzm/avhy+UwoonK5nKhEyeYgQOVZWVes4Xv0V1utwt5pzz9+yl4HmdmugYNVAIAdu129M1QQAj27HGlpckUCuLQIbfBQEdG0rm5DMfh1FQZy+KsY27RZngim+nbVwEA2L/f1bWbDEKwf7+zVy85AODkSUYuJyIiaI7DublMjx5yAMCRI+7UFClBQJOJr6/nU1KlAIBTpzwHD7o/eL/mySdLPR688M24RR8nxETTv/5qtlqFhx6O+GFxpwkTNN99W3f77YV797rEAKhu3eTHjjEAgLg4ideLS0pYqZSIi6OPHnUDAHr0kOfleRgGxcZKKIrIyWGSk6VeDuXne2QyIi1VtmevUy4nUlKke/c4AQADByozD7h4Hvfrpzx1irXbhe7d5WYTX1LCJiZKSQoeO8bo9VR0DL1/v5OmYXp3+a5dDgBA/wHK3budUimR1lm2Z08zJ+qoKFoqacQbU73gcjYID4kEajVBA7iAw4l8+XuNeMOyOGj9AIyxWk0EqN8OB2KYRh9UKim9PlApzjvloWnYubMsM9OV3EmqN1DZ2YxKTXRKlpWVed1uoWcvhc0mlJSwAwepBAFnZbmGDlMBAPbvdw4arCIIuH+/q3t3uVJJlJWxPA/S0+WFBSxJwM6dZRyHT53yDByoZBhUXOzt108FAMjKYrqly2ga1tVxDIPT0mQYg7xTHrFBd0kxq1QSSMBLfjI9+0y5y4l69lJ89VXS66/H8jx+bm7Z//5XsmKF5cEHS555pqys3Hv/A+FLlqZMm6rLz2PX/Wv74ft6g4EqLfVyHFarycREyckcDwCgTx9lTo4HAJCSKoUAVFR4pVKiZw/5oUNuhYJIS5OJrBo8VHX8OIMxGDpUnZXlRgj06q1wu1F5uTclRaZWkzk5jMFAJSdLDx1ySySwX1/Fgf1OCMHQoSrRjjd0qOrkScbL4gEDlLV1vMnEjxiuPn7M3TSvW68n5QrCjxnQ6US+TYckoSZY8V4IgYdBvkLujaST14tdzuDyRqMhAyyedjvv9RsrxkAqhU0d3Xv2OkgKHjnC/PuvrUcP+cFM18qVVomEOHzItX2HAyF48qQnJ8djtQoVFVxWlruokLXbhe3bHYcPudPTFQf2u7ZucYwarcnMdG3f7kAInzjOrN9ghxBkZTHV1VxpqddsEnJzrXV1fHUVZzbxu3c5h49QZWa6so663W6Um+tx2IWCAtZmQ0cOuzdssGdmuu67rxhAMH2adtp0vUpFbN/uWPhGVVmpd8gw5YcfJaSlybKy3MuWmZ94vLRHD/kttxhvu914/fX6VautK361OBw8w6CPF9VoNETeKc/hQ+7yCraqitu9y6VRVxMULCj0fvJpbec0aX4ee+qUh2FQTrZn8yZHbS3vsKF9e51vv1UlCHj3Htdbb1Up5ER+Pvveu9WpqbKCfM+nn9Ts2uXIyfHs2OEsKmRLS73Hj7tdbmS18tu3O6VSKCCcmel+7bUKlZrMPsEsWFCp05E7dzn//NN840yj/xNSqUmZjMD4jJeKZZHD71nrdGTQ05nXi52nt6NGfedrqrlp0/JajsbgeXz9Dfpvvknyt9+sW2e9685i3wEeIdC9u2zlqjR/rZ5h0OOPlVA0gQR8NMs9bJia4/DePc5Bg1UyKdy509G9uzwsnN67xxkdQ3dKkh456qZI2L27PL+AtZj5/v2VNTVcXp5nyFAVwGDXLme3dJleR+3c5ejVS2E0UMdPMBiDXr3khw66FAqiS1e52cRnZTFDh6poCTyw3xkeTicnSwuL2MpKTqUkTpzw0DTs3Ud+00zD2HEansdr19r+/MPidAkTJ2qvu06flibzTSXP46xj7hW/mnftdCYkSG6+xThqtJrn8D//WH9eaj540O3xoLAwCiEcGUnTNKyp4eVyqNFSHgaZTHxMjAQSoKrSq9GSKiVZXuE1GkmFgrSYeY7DkZG0xSKwLIqKknBeVFnFiW3Dy8q80dG0RALLyzmDgVSpiMoqTiaFRiNVV8cLAoiKou12wWYT4uMlDINqarjERKnZzI8cpVq0KNGfBxWV3qlX5xUVNmRRil0Hf1mW7EtU+OCD6tderWrhuYsRV78sSxk6VBUobwQE+BD6O0hoGBAK6HIhnvcvp4VVKiJAJuXleWRy4q234teutSUmSp95Nmr/PhdFgdffiKso9zoc/OtvxAMAXnqxbM7T0XFxkhdfLL/hBsPAgcp33qnq0kV+7bW6xYvr+/ZVPPRwRGmp1+7gX3893mziXW7hjTfilEpy/vyK8eM1w4apnn+u/OZbDP36Kf/91xYTQz//QgzLonkvlt9/f0RCouS996pzshmeJyZN0tx8i2HAAGVdHb94cf3atTapFF4zXXfV1bqA4oQAAIqCfTOUGX2Up055/vjD8sEH1d99WzfjRsNVU3RTp+o3rLf99JOpuJgFEL/8SsygQarFP9RJpcTNtxirqrgPPqh+/vlog4H64ouamGjJNdfq33+vKqOvcvwEze5dzk2b7PPmxRzY71r7r/WlebFisd9HH4mIjZcsWFAxbaqu/wDVxx/XJCdLpl+j/+Vnk8MhzJ4dsXmzfddO57x5MTk5zPc/1C9YEGuzobferHxxXkxpqfevvywc16gJo0xKKBSNSMHz2L97iFQaPKlaPA6LPwdUwMc8F5w3YsC2PzgOC42P71IpEUDefXudPXrI5XLi8CHXoMFKioKZma6MDKVcRhw+7E5OkRmN1MmTjFpLJiVJy8u9rAf17Cm324WyMu+AAUpBACdOMIOHqEgSHj/OxMdLwsKoI0fcKSkyvZ4ym3irhe/VS15ZybFe3KWLnCThieOMGOxRV8dbLEJmpmv2g8WbN9qnXKX75JPEDz9KCAuj3n6r+u67ivbvcz34YPiPPybf/0BEU9L4IHZ5ef756MWLk8eN1/y42DRrVuGyX0zDhqt+WpL8yvzYlGT5e+9WL1liCo+gq6o5o5Hq2lUWHkZZrYLRSA0bpi4uYY1GatBgVWEhq9dRgwYpPR7k9eJBg5WcF7sZISFR0rmLLK+ADQujBgxQ5uR4dDpyxHBV7kmPWkWOGKEuLfWSJBw8WOVwCC436tVbIZUQ1dV8crI0JlaSn+/p10/JsqikpFGSDUkAqeTM3gIhEBDwV4NoOrh3Xuyl3QxvBAEIIQQv0k1s0jwHMGr0Ikk1CsX1eFB2jmf4cHVNDWe1Cn37Kt1ulJfvGTJEiTE4fMg9dKgaALB/n2tAf5VIqc5dZGo1eey422ikEhIkxcUszzfkzh0+7BJbfx096h48WAkAOJHNREbSYWH0kSPu5E5SrZZ0u1F5hbdnT3lFhXfpEtPOnc6flpgyMpQ//Jj80rwYtxs9+0zZQw+V1NRyL70U8+13STNmGPzD0GpruaVLTF98UfvFF7Vff1135Ijb/7gRHy955JHIn5Yk3zrLuG6d7fbbCr/8srZPH/kPizs9/njkrp2ODz+o2b7NeeIEgxBITpEePOgSj4G1NXxFhTc9XV5czNbXc2o1GR5OZWa6lEoyOkZyYL94mFJkZjpZFvXtqzx5krFahW7p8rp6rrSUTUyUEhBkZzMGAxURSWdmumgadukq273biRDu21exZ49TJoMpKbL9+50BsbMBfiHsJzwAABI6iLwRjbE+sdJ4nxJC6QLRTJAAx4mWTD9u0Y3iSzZtth875t6xw1FaypaXs3/9ba6t4U/lejZvtv/7r23/AVdUNJWby6xfbxs+QrV4cd3KldaUFOmPP9Zt2eKgKPjjj3VHjrirq7lfV5hYD96506lQEnl57P79rohIKr/As3WLUyIBi3+sW7vGHhVNLVlaX1vD5Z70fPtN3b79LpWKfOWVmEmTtXIZsX27Y/4r5cXF7JChqg8/TBDbzDS9x19+Me3c4RJJWVXFbd5s//rrpAC3SXg4dfvtxunTdVu32n/91fzPauuIkeqbbjJ89XXS7t3OJUtMDz9UHB0jMZt4i1XYudPJ8+D4MdfDDxXL5MSJ454HHyhWKImiQu+WzY7fVliKith/19pWrrK5XMLJk56KSg4jcPSIe/bsYrmMOHLE/eQTZQYjefwYk5vLxsXT+Xns1i2OlSutlZXeulr+YKbTYhHy89nyMq6szGux8jwP7rgj7LQvE1CN1QaEMO/XqIQIIVgXYyCc3lQCmsk2ZI20DIEP/p4AHMp0pabISBIeOugeMFCJBLB/v6tbNzlJwkOHXHGxtFJJnjjOyOVkVJSkpMTrcuKUFFl9vVBa4r3mWr3bhY8dY8aM0fAcOH6c0WlJvY7av98VGUmpVKTFLJSWeqdN09bW8GYTP2igcvtWx7//2kkShkfQTz4RNXKUmmXx2rXWP363OBxo/ATNi/NiO3eWtaAG1tfzo0apH/1fBAAgJ4d58cVylkUANDO7Wi15zTX6CRO0+/Y6ly03P/xwSd8MxS23GD/9NDEz0/XD9/XHT7gZNzboqW7dpAShKCxkBw1SellcU8Nn9FX07Enu2+dCCKeny/btd3lZFB5BW61CWak3vbs8JVVaVMhmZCi7dJHl5nqMRmXXrvJDh1wREVRyivRgpstq5aOj6doavqKCi4qmlSoiL8+T1ElaUcFVV3GNREhTiQDPvCTwwQWGmDPUHG8oSIbAO//8LhE03VTjOZNG7/Egi0V4+JGI6Gj60CHX449HKZXE0SPuhx+J6NxZVlTonTBRM3Kk+uOPawYMVN58s/G338xqNfnggxG7dztM9dz//hdZWMhm5zDiB99/v3r0aPX11xuqqrwDBugnTdIeOeKurOCeeCJq2zbHli2O48eZwkL2hhn6mTMNffooamu577+rW/OPjaLhtOm6qVfr4uKDx1pACHyZR4IQ3LmpUBBjxmqGj1AfOeJavtz8zLOlaamyW241frQo4cQJ5qef6vPzWK2OGjtOs3at9Y034vLz2cU/1C98M46i4CuvVEycqBkxQv3GG5V9M5RXXa3bus2+fr1twYK4vFOezz+refOtOJcbzX+l4sUXYwwG6oUXyu+8M6xXL/nrCyoHDlJOmqT9+qs6WgLvvjts1SrriePMc89Hf/hhtb+ihhrvSgAAovHO5eUAbtGjjDEgCOg76zRacSQB6RDiw3k+sLwDTcOAtctzZ8o7FBayHI87d5bt2+eMiaGNBurEcYaiYVKStLTUazLxPXrIHQ7hVK6nf3+lIOADB1xi6syuXc6MvkoIwZ49jtRUmVJJ2GxCYSHbt6+yvp6vrODEfI7MTJfeQC77xbzwjUpTPZ+YKPn0s8S33opTq8m33qy6846iXbud994X/uNPybNnR4RCmjaDpuGAAap33on/6qtOnTrJFi6s+t+jJRaz8Prrca8tiC0v8765sGrnDufeva7UVClCoLzcS9OwXz+FGMc5ZIjq0GEXQYC+GUqHXaip5rp0kcnlRH6+JyqSTkiQZGW5lUqid2/5wYMuioJDhqoOHXSTJBw2XJWTw2AMBg9SVVVxTicaMUKdddTtVwEDBxgDCaJRKioXwnmIIICPatTZ/tACWC8SBBwQ2kcQjXRq1tsQ0I8Q2L3b2amTFCGwZ49r0EAl40E7dzk6d5YJAt671xkVRclkRGami6RARDidl+exWITkTtLqai4vj73qap3DLhw86L7mGh3jRsey3DQFjAZq9x6nRkNqNGRBAbt6lbWggE1IkFxzrX76dF1YGHXwoOuZp2sPH3Z36Sp74cXooUNVrc22EZeX+DNJti6agiBg9+7y7t3lt99h/Psv65df1f7wA3H9Dbp582LKyr1Ll5rmv1IxYoTS5RLWrrW63RqCgJkHXHv3OnkBnDjObNtmV6lIJIC//rIMGaKiJcTff1kQAjIZsXaNLTKCpki4ebOtRw85y+IjR92bNtkhBCUl3pUrLZGRtM0u/PabOT5OcuqUZ80a65AhKqORQgiwXuTvCCKIRucbjwfhYBEs/iKqkd3PZOKvvy7/yBF3C5magoDHjdcsWZLsbw9Yv852551F/na/9HTZqlVpxjAqL88z+8HiiAharyczM119+ijkcmL/fldamsxopA4ddoeHkYmJ0hMnGAhBerq8uNhrMvF9+yrq6ri8fHbQQKXbjY4eZfr1U8jlxMmTDMagZw/FocMumw3FxdFmsxAZSc240TB+vIam4Y4djmXLzEVF7KCByhtnGjIylEEjkprFggWVtTX8jBv1AICCAvbvvy3ff9/JEKzbRbOoruLWrLX++afVw6Crp2onTdKa6vlflpk2b7JbrYJcTkhlhNuFZDKCoqHdLogVERgP4rxYrSbFjBmNhkQIOxyCWk1CCO12XqEgKJpwOgSahlIZFCvMi5kJPI+VSsLlQlIp/OKLxAkTtRUV3qlX5xUVNbL7LVuWMvR0+cSXXqr4eFFNC88dY2AwkL//nirWyGo0ERIJFHNHWobDLgSINbWGlEigfy6F243cDDICwLhRQqL0mWeitm61K1TE7Acjjh51u9zo6aejq6u8tbXc089EAQDee7f6/gfCo6Lod9+tvnWWoXdvxVdf1g0dpp4wQfP77+a4OMms24xuF3rv/aobbzTUVPOr/7F6PLh3L8Ujj0YOGapk3HjNGtvvv5ttVmHceM3zz0V36So/l4SBa6/R/fBD/S8/m8SVcOsthja3X4yKpu+5J/y66/SbNtlX/Gr+6y/ruLGae+8Jv21W2PJfzf+stmnUZJcusvh46S23GDIzXYcPu++5J5xh0Fdf1dx8szEqiv7667qRI9U9ust//sUUFycZM0azdo3V6RZummncv9956KD7wdkRxYXsH39ZHnsswulE//d13ezZEZVV3IYNtoy+SgCA0yl42EYORIkEqjVnJshq5TDGLchVjIFEQvjSnxvxRiolVMEqlEII7Q7B6210uNBoSJomADjTQsHDIqdTAABkZTH9+inS0+UrVpgnTNCmpso2b7IPH6bq2lWWn8f07CnPyFAezHTFxEpGjFBXVnAyGTF+vJYkgceDJk/WJiZKzWbh+uv1qamyrKPuslLv4h9M9Sb+2mv1M27U9+ihqKnmvv2m/p/VVoKA06brpk7VtUsb3569FO++lyCqaG2rHREAvZ6aMcMwZYp2107nsmXmxx8vHTxENWOGfuZMw19/Wtatt7ldiKLg9Om6vDxPjx4yvZ7KPOiQy4kRI9QF+ayXQ0OGquwOYf9+18CBSpmMWPxDXZ/eithYyYkTTEqKtEcP+Y5djrAwevBg2batDokUXnONbu8eh5jd53Ai1hPgQCR8ezfPY4c9eCqSXAEViub0YpqGmhDkjcuFnM5GX6NWEQoF9Cecy4UsFoHz4oMHXX36KMrKvBXl3i6dZRYLn5XF9OypcLvRnj3OXr0UHg/ascPRtYuU4/Cu3Q7RI3PwoJumYVgYlZvL2KyCSkV+803dM8+W8zwYOEj5zTdJry2IlcuId96uuvvuot27nPfdH/7zL8kPPxzRjr2fRW3PV/GkXaBUkhMnab/+v6T33k8QBDzvxYqlS03jJ2g++yyxbz/FU0+VLlxYWVLMHj3iAgAMHKDev8+FEO4/QHn8OON2o969FZWV3upqb2qqlOdxTi4TGUkZjdShQy65nEjrLN292wkhyOir2LXLqVKT8QlSsY6R2cS73Y3kjVpN+GpCsCy22oSgSSxqFSk5HcDZSN5ACHR6Kqjd0OVCJhPfqdOZvCelijQYqZISry+ClXGj+nou95Rn2zZHfj7LcaiszDtnThnnxfn5nrIyL0mCkyc9hw4z331XfyrPEx5Grf3XXlzslUrg0SPuqiqO8aB77i4ym4Xqam9urkerJW+6yTBlikanow4fdn/ySe26f221tfygwcqePeU11dySn0yn6+ZhAADGZ4KIsc92cboPOTr9Kzz98hnS44a3nVkZfnULGi4OznzA90Wnry3+19heAk+/CM5EvsqkhEZDLPvF/Pdf1pEjVTfMMEycqF2/3rpnt/Ott6pXrrLZbELWUbfFyiME9u51PvFEqUJBHD7kfuaZ8ogI6sgR9/xXKpOSJNnZzP797rVrbSUl3tpa7uhRd309n3vSU1XNFReya9fa3G4BCY2sJxhjYxilPJ2RwjCorpYP6qBSq0mptLnzFAAgOiqIwRlC4HahutpGtj+ViggPaxQxLwigspILj6Dr6vj8fFaMgS0vtwMACAJWVjrEH8RQZ4KApSVnTM6+ZpB5p1iZjBg6VDnjRsPo0WqDgWIYtGqVdds2h8nEZ/RViHVuck56xMDhhph20ZyFG4YLAYTQRxBfYDD2Ba6fORdCCE/zAcKGqHcIG4gCG/7u4wgGUKyQciaKuOE7G0KNT6fzQeALfQbgzAgJCDt1kqYkyzAACIHMA87BQ1RPPRU9bZr+/ferv/u2HiFAEjA31wQAIEmYd4oV5yonxyMe9zBmfOe+3buc4mCOHGbEH3JyPAQBeR4nJdrT0mSCgMjTJXfEbBPFaXljtfKhxHmGhVE+ERXIm5hYCUkGKXXJcbiqcTNtiYQISC9CCJcUe3v2UoDT5T/EH8S/Nv2h8QPwHYAhTQOzRfh5qWnJTyZRlvA8IAgAfCVtgtodYNMXRE5gMXYdQogbAsNh0M+e+Yv/tzcdSQg7mx9dG0TiwYPM55/VESSw2QSahjzfMAm+2QiYH/8V3vRtvsReJIDSUq+fAAYQgphY2vfO+nreP4fpbPcbHUOfNT88IoKSyQm3q6WoP0HAJaVswEWTkqQB55fCItbLIo2GhPAcCp9jUFTA+j8R0dIglxGMB0EIfKX2QgQEgOMxwyCagjI54fVilkUSCSGVtmKIGAO3G2EMRGOEqDooFEQbbhMJwM0gmQxCABgPVigIMaMjIBK3zRAELCBcXMz6j40gYFLiGTWjqooL0H6amTcIY/0CxpvhjUIB3S3WhMQYFBayXm+jCI+UVIlE0rBExK8pLmbj4iRLlySH4mMPGfijj2qqa7mX58W8tqAyPJx+ak5kq6xyEIJt2+yvv1E1YqRq3osxK1aYP/u8bsYN+vvuDw8uuk7DbOGeeabMbkcffhAvCOCpp8sMBvKdt+ND6aAcMJhTeZ5XXql48slICMHbb1e//XZ8SrI09NLGocyYzSY88WRZ4+hvwj8tX6ym03LyE0U1yoUNvE+jkTboqbralqSWWJ3A4RD8w/mSkqQqNWkxn4lErKvlfQVp2hERERTDon4DlFotERFB9RvQ6uuXV3oBAAYj2W+Acu9+J8Y4Oobu178V/RDrTZxMTjAM7tVbwQuYoqBcQWb0U7TBMCiRQYkUdukqIyCkadizp7xrt3busLdzp8NsbpRtotWS8acPnoKA8/M8Yuba2SD2tYxuQd5otWR8vCQnp+UCTLCmhqut4fx5ExUliYigzKYzvLHZhJxsT2t543IhX16PTEoEFLkFuKE6uhjycbaKVV4v9tVGIUmoVAaGp4HT+m/Dz00uJAhY3InEe1EqCP96Ng0l1jAQEG4ordWkRjrGwOVCPiedXEbQzVmuxdpbCDVozk2TWTkO+wLICQIolcEDgQNw7BjjcvkXz8PRMbSvS7TTiYpLglQgwRjo9VRs7Nl5I5cTnZKlQVUkq1UoKGS7pZ8pG2AwUKmpsuwTZwjH8/jIUfetrWnPsXKl5fvvTDyHAQQYgZhY+oUXo5OSWlfopKLCu3BhZUkRJyZokhS4dZbxxhsNZxlGM0VM3G700YfVu3e7fMrvyFGq/z0WGbouhRBYtsy0fJkZCUC8l+QUyQsvxrS2OEFdHbdwYVVeLiveCyTAjBn62243hl4TQxDw0SPuxsXzQJfOUp/5u6aGKy8LXoEkLk7iL02bkaudg1UnAACwLMrKcvsX7pJIYO9eitWrrP5vO36ccTiEEJu28xxe9ou5UyfJuHEaAAAv4I8X1e7Y4Wgtb/buc504zjz2WJSo6u7a5Vi2zDRtmq6FLqMBKC3x/rPadtfdRnFHLy3zLl1quv4GvX831JbBMOiXX0x9+igHD1ICABgPWrSo5sAB17RpuhCvIOLIYfe+fa4nnohUKggAwKFD7mXLzNdcqw/d6WGxCNk5jD8rSBL27qPwPeJTpxiTSQja9ScxSeJfyqgZ3qSkShUKomUFGyFwLIthWeRfQahnL7lcTvi8mwQB8/PY4iI2xFbKCGOOwwMGKK8+Tcfff7O2oRSXx4MiIulp03TiviAgfPw4E7RNlz+8XiSTwYmTtImJUgBAXr5nxQpzKJEGfvODEQJDh6mmTNYCAFgW/fyzyeNp9QGBZbHBQE2dqhMPbgolsWuXM5QYKx/y8jwlxWfazYtp2mL+oYisowzLopYlBUHALl1kjU5kTd+UnCwNCwveKSQvj62ra2T969pVFhlJB3TMOngweL3+xjPe8APP45CiVpsAAgDwmcQMAYFWH48hxOCMqtHm8yA6fQVe1IHaZo3wvxfBd4ehYv9+p39lYIxBXJzElwjsYVHWMSZoRQCFAqY31tab4U1kJJ2SKg2aZV5ZyYnpiT7ExEh69JT7r2yOw7t2O1u1UjvQjvB40J49roCS6X0y5D6luKqSy8kJ0j8VYxAeQaemBeONXN5IjjULCIHLJezZ2ygVWSKBQ4YoCbJRc8eDB90VFV7QgYuBwiL26BGXv5ijaThkiMpn9s3KcldX8UGUG4RTU6QBBZqa/0Sf3vJQwp3273M5G+cFDxyo1OvPVMQgCFBe5t271xn0UmcGdHpEFNlGM7PoMDhjbidCt+edAWxksG/DKMR7OXOFhro9bQBsMpKQL7Nrp7OmRvBXbsLDKV+rSozBnj3O4BokBD16ygNOFc3bqdK7y8PD6ZbbzYvN0AoLWV/RdgBAly7y9HT5zh1O31x7vXjTRrtYgjXI8CAkCHDypGfvXifGQBBAbS0XSj5YACQ0NJuE3budYg7iiRMM0UpPB0UCD4sP7HdVVnEAgOKiRqXEQgFBQAjA8eOMXk9iDBgPsliEEJuxNRoJDW02fs9up1JJQAiystwA4FByVgAADIM2bbT7Fx1GCPfurfBZii0W/sD+4NqnTEb06xd4smmeNwkJ0m7dpOXlLHF24oi9qXfudPrzRqMhx4zR7Nrp8nsb3LPHVVDAdu0a5BBLUXD6NboffjDt2u2EACAMwsLIIUNa3Qe6f3/l39GWBQsqidMO6ltuMbTKjRWfIBk2TPX5F3Wi/1hAYNQoTasqTspkcNo03YoVlvXrbAAAhEF8vERscd0q9OwpT0uVvflmlSgyEAbXXatrtudIU+TkMJkHXQHFeMeO0/gkx7HjzKlTLBGsW1R0NN2rZ2i8USiIQYNUmzY5QIsQBLx5s/2uu8L8Y41HjVJ//lmtr+gXQYDKSm7DentQ3kAIbrklbOJEHXemYzER4hz5o1Mn6ZdfJtlPB7BRFDAaqVbFjKrV5IIFsRZrQ+4yQQC9nmqV45Mk4X33h193vd7nsNNoiDZ0ooiNlXzyaaLdLohbHEUBg4EKRfJhDNautdXX8Wc2KQSioqkRw1W+N2zZbLfbhZavhhDu2VMe0zRh/mwfGDRYpVKRrhYd4wQBjx5hTp3y9Olzho/p6fK+/RQb1tt9AxIE/M8/1ttuNzatiNPkgiA8eOGn4FCpyHNpFwIAkMqIqKhzKmhOkjAioh3KqSqVRICfJBTU1nLr/rU36h+L8aDBypTT7QTNZn77NkfQ65AkHDxE1VTZPeuA0rvJOiVLWjaXiVuVrxWg7z6nTtX5azMEAbOy3Dt32sFlAoRAdTV3/Jg786Dr4EFXTg7ja1l9uWDzJvvJkx5/WSKTEdOm6Xx22oMHXbm5bNATuN5ADmqut9lZF3dYOD18uCrraJBGVAjhtWttd90V5u+8GDNGnZQkzc9nfW2PXC60fLll/Hht6Mb+i4WTJz3ffVe3ZbPDbOZ5AUMAaJqIiqanTdPdfrsxoJDqpQm7Q1j+q5llkb/I795dPnx4Q7UbnserV1mdzuCbVI8e8mYVjLPyBkIwdqzmx8Umtxu3vFWdOM7s2+ecMkXnezE+XjpxoiYvr9Zn2iQIuHOHM/OAa8TIUBuDXxRs3Gh74fkKk4kfMVLVpYtcrKPrcApHj7g/+bhm2zb7O+/E+/pJX7LYvdNxYH8jjZgg4FVXa3z7ZlERu22bM+gZkyDgmDHqZnf8llZ/Rh9laqo06FblcqGVf1v9jcIEAW64QR8R0cjnYLHwS5aYfIUFzyswBiyLxX98yN6cw4fdTz9dptGQYjmS5GSJWk1oNGSfPoqFb8Z98mlCWSn7zDNl1VVcKNUXAAAch33DuAB3LcLlQj/9ZPJV1QcAIARiY+lrr9X7XtmwwVZWxgb1ZRqMpK9tTABaUkKNYdSoUeojR4JsVQQBt2xxZGczvf38lz17KcaOVS9bZvZJQoKA69fb9+11jRx1fkVOVZV30Uc1vq42cjlx513G0aM1LX0GApZFixbVkAR8/Y3YHTscq1ZZjUZKpaQwxmYLz3H40UcjFr4Z/79HSxf/WH/33WEtjwEh8Ndf5j9+P9NHvXdv+SOPRAYtv3ju2LbNvm2b01/YYIwnT9b6GsbUm/g//7T423XOcgu4T29FQK9XH1qiHIRgyhSdwUAFy8QD1dX8H79b/N1jEgm8+WaDTkcGuDm//76eaWuftxCxZYtjzx7nhAmaKZN1U6boKAp+/72paQ0Nf5AEzMn27NzhvOOOsJ07HJs2Od54I27p0pTFP3Za/GOnpUtTbr/d+N671SQBrrpa+/df1upqruVYYodD+L+v62NjJFOm6KZM1o0cqf7rL2vTbsrtDodD+P67eoejUaOM8Ah65k0GH0u2bLZnHfWQwdoJUxS86mrt2dpABflwr96K/v0VoQQhrFplLS5u5OYcPEQ1dpzG/7MEATdssG/ceH4PVi4HSkqS3nNv2J13G++8yzh2rNrDoKC77eHDLooCEZHU2rX2l16OGTFCLYaIkyTU68k77gibOdOwZIlp8CBlTQ2Xn8+2vFVxPOZ5PG269s67jHfebbzr7jBjGOlfT+88YfVq644djYQNQviqKZqMjIatwOkUli83BfUtiA11x449q5AOwhulkpg6TRfURUAQoLjY+8cfFn/JJJcTd91p1OsbtT53OIQvv6ytr+fA+QMEGAOfwU1AwQMPEAaVlV6tjszLYxMS6YHNxSxPn64zmQQvhykK1tRwwU1v8EwkBs9jgFsX/9AGVFZ4v/6qzr+QNMYgMpK+444w3xPcscOxd487aFwexnjsWE0Lya/BFbwxYzSdkqUo2FJBCCxbZikqapQfM3iIavLkRiKHJOG+fa5ly8ztGrJ/rsAYeDyAIkFtLRcfJ212nYSF0woFYTYLBAnbEIF1vkmDEP7xJ9PRo4y/1oIxnj5d18dP2Pzwg8l/FzvbbGi15NRpuhYUoOC8iYuTXH21NqgTliBAQT67fLnJn2FSKXH//eExMbT/izwP/u/r+qys877Z++YhNA8yxBhyPKLPYqCBEJBUSPWFzjqK84n9+10/fF/vP88IAXG/9kUWb95s37HdEVTYIIQHD1YNaDFRJDhvxEN1dLQkqMjBGPy63JKX10jL6ZOhuPkWY+OkL1BczC76qMYZQm32tgH6xWO0NhkOt/FvzU7d6bOkWHnpvMlYq1X48IPqqqpG8QskCe6409itW4O1yWYTfvi+vmXHkQiZnJh5k75l50ZIhohu3eQTJqqDRm0SBCgq8n77bZ3/oiRJeNddxvTuMv8MD4KAa9bYfv31vOxWJAmsNuFkjic3lz11ii0v9zbOiL0QEHtpFRWxp3LZ3Fw2N4d1uxDZph7pQYEQ/unH+s2bHf6ZOoKA+/ZV3HrrmRX711+WXbtcQYWNIODeveVjx2hafltITkSKgjNnGlautNisKGjVgd9/s0ybphsx4oyRJjFR+uijEXOeLPOFrIst1z76sLZ3L0W//u2cmNevv2LFCvPDD5eIc8Rx6PY7jG2I4zkXqNXkyBGqL7+s++47EwBAEHBkFH2euo3u3u387LNajgP+ndu1WvKxxyN9aTelpez//V8dy+KgcQE0DW+8UW8wBiFGqM7nAQOUEydqly+ztBz8Jno6v/i8tk8fhX8IxDXX6LdscSxvZAYEJSXsm29WfflVUlhYO/jAfejVS7l4cbLV1rAJSiQwNlZy7s26WwWahs/Ojb79jjCf3S8sjGpbmbeWUVnpXfhGZVWV198egzGYcaN+0iSt+Ksg4MWL608cZ0IRNr16K6ZN0wf93lCnUyol7rozLGieAwCAIOCmTY7ffrP4v6hQEI8/HikW0fSBJOGWLY6PPqpuXzM8hCAiku7cWSb+S0qStku/7tZCzMH2DeN8kMbtRu++U71nj9ufNIKAu3eXPfJIpC/4Yd8+15KfzKGc6GgJvP12YyjJga1Yhv0HqKZM0Qa1AUIIWBZ/9mntyZONHBTdu8ufnBMVUJYLIfD9d6Zly0yX1LH8sgBC+Icf6n/5xez/orhDPfNsVErKmWDQDz+orq7mgmp4goD79FGEmBnYCt5IJPDOO8Mio+gQRA7Iz/d8/HGtL7FZxIwZ+ptu0vvr16Jb9O23qrduuWyicy4RrF1r++CDmoDmyxCCO+8Ku/pqnfgrxmDpUtPWrY5QQgRlMuKuO40hxpq1btvP6Ku48UZ9KLIBQvjXn9bff2+0GmQy4sk5UQMGKhufrUBlhfeFFyrELnAXD62SeO278aHWHvH37nW+NK+ivq5RCosg4JEjVY8+GuHbl/fvd37xeR0XgnFeEPCIEapQNBsRreMNRcF77gnv0iW4+VjscP/++zUBbEhIkM6fHxMf38gaRJAwO5t5/rly/6bWLV28odrZOT09eHqcwC+XEp6dEQ3fCP0/LJYJa2gC3baj/ulKbq2wFOTkMM8/V15Q0CgQAiGQmip9ZX6sL9GptpZbuLCqvNwb9EyAMdDpydkPhWt1obrrW62spaRI77k3bN4LFUIw6hAEKCxg33qz6vPPE/V+WuHQoernno9+bm65vw2KJOHu3a65z5Z/8GF8fIul8MVcmZderjh1iq2s4Oc+W9aq8UMICgpYjMHRo565c8uyjrpJEm7dahcQqKnhDh3Cp3K9LldZU5nK8zg312M283Y7/+9aW3U1x7jRu+9UIwxcLqG6Crz2aoVcTrRKUROPnzYr+u6bOgAgx2MuWLRQQYHnmadLDx9uVJscIaDTEfNeivH5LzkOf/5ZzY7tIe1QCOFrputGjtAEfeeZkbchB9ts4u+5p2jLlpDGRBDgiScj586N9j/UeL34nXeqFn1Uw/ONlinG4KqrtO++F9+0h/Tpd4C5c8u+/r86AkKCABiAoJKvmSFBQBANXXHEn8WLiCM5S1kdDAEUPwUJgFGD+BEL4RBkQ/2btiX4ESQQK6HqdeSvv6X0O3vFoJIS75NPlG7ebG8cXgMkEjj3uajHHov0uRRWrDA/NacsaJdd0OCOkCxdmtw9WJKuP9pyODQYqSeejDp2jDGbhRC0dPDVV3VpabKbbjL4XpRI4GOPRdZUc0uWNFKAIARr1tgIArz5VlxcXHNSB4Lb7zCOHKW+wPbfCwAMAE3BlOSzFm0pLPQ8+0x5AGkAAAQB7r47bPbsCB9pMjOdC9+osttRKFYrmgazHwpPb2Xwa1vkDQCA5/HrCyoXLaoN5fkhhBMTpV//X1JAZHxNDffE4yVr1wZOBMZgwgT12+/E+5dI/o8jN5d55uny7dudAVRAGNxwve7d9+J99qHycu+DDxTv3OkMZTcQBDxlivarrxK1raxMSM6fP78Nt0EQMK2zbN8+V3m5N6gVEkJosfC5uZ6hQ1X+5i+ViuzXX3kyx1Nc7A04TObne7NPML16K9olBelyx+FDrjlzSnfvdgeSBoHJUzRvvxUXcVoXtlr5efMq1v1rD6UgF0IgOoZ+6+04X1mT0NFG3gAANBoyIpLestnBMDio1BFLXJeUekeMaBQfr9dR/fspjx9nSksb8Q9CUFLCHtjv6pwmS0j870odjMHGjbY5c8oCAmsAAAiBsWPV778fHxffMD8eBr31VtWPP5qCdgQSQVFgzpzI66/Xt8Hr23beAACSkqQMg0MsNwEhKMhnLRZ++HC1f7a20Uj166s4fsJTXsY1ljqwuprbtdtlNFJdugQvHXflgWXx0qWmF1+oKCryNiXN6NGq999PSDq9lXMc/urLuo8/ruW4kEgjCPjqqboXX4xpW0bbOfGGIGB6d/nxE0x+Phvic83OZtwuYfAQlX9xhvBwetBAZW5u4IZFENBqFbZtc7As6tlL3toS15c16uv5d96pev+9GrNZaEqaSZPU73+Q0Om0Ei0I+IfFdW8urG452c3vCjits/T99xPi29r975x4AwBQKIiUFOn27U6LJXhjCLGX8NGjDOfFgwap/E/mxjBq8GBVUZGnoMAL/Cqaid6ufftcBQVsly6y8PD/hLpz5Ij7+efKfl1u8XobRT6IG9D06dp33olPSGggDUL4559Nr86vtNlCOkBhDNRq8rXXYscEC7JpAefKGwBATIzEYKC2bXOwbHCyi9Q5fNiNBNx/gNKfOno9NWy4qr6eP3nSg1Aj6mAMTp5kd+x0aLVkaqoslGaOlykYBv3yi/m5ueUHDrgDqvZgDGga3nGHccHrsVHRDXICIbx8ufnllyst5lBJQxD44Uci77sv/Fz6I7UDbwAAnbvIWA/at88VmusKCAI4eNDtYVD/AUr/iqRqNTlihJoXcNZRd8A+LZpWt2xxVFdxqWnS8xGWcNGRk8MsWFD56Se1dXXN7E0qFfH4E5Fzn4vR6xvunefxkp9Mr7xSGbSQrA8Y42nTdK/MjznHeh3twxuShL16yYuKvDk5nlD2V5E6hw657XZ+wEClv+IikxFDhqjCjFRWlttuFxofsqDXiw8fdu/c4ZTJieRkaRsqWF2asNuEpUvNLzxfvm2bs6HhjR8EASckSF59Nfb++8J9aizH4W+/rVvwWoXFIoSoXAoCzshQvPd+fGzsuXZ3ax/eAABkMqJPb8XRo+6AE/XZ4NN1Kqu4vn0bBQdSFMzoq+zeXZ570lNdzflHB4t+xNpafstme3a2JyKCiomRXNZHLY7DW7c6Xnm54ttv6+vqBF/PJREYA4zBoMHK999PuPrqM4kpTqfw8cc1771b7XCgEG8fIZCYKH3//fg2lP1qijbai8+GI0dcs2eX5GR7Qtw7xS8fN079+huxTcNv8/I877xTvfJva9PAWIwBQjg8nLr+ev0dd4alp59TF9aLAkHAR48yi3+oX7nSajbzAYwBACAE5HJ4442Gp56OTPQzYtXXcwsXVi35yRTikVu8lNFIvvd+/HXXhRop0TLamTcAgM2b7Y8+WlpZwYX+IBHCGRmKBa/H+gq0+OB0CkuXmD7+uLa83NuUi+JyjIujr7tOf8uthq5dLw8zj8Dj4yeYpUtMK1daq6q4powRV0WnTtIn50TOnGnwN7Hk5XlefbVyzT+2EI174tXkCuKV+dH33XtOurA/2p83GIPffzc/N7e8vj5UZQ0AIAg4Pl7y7Nyom24yNq2kt3+/84P3azZvdgScS0WI3uz4eHrKFO2MGw29e8v9de1LCgyDDh1yr/jVvH6dvbLKCwBs9nZkUjhpsvbJJyN9qZbixG7dan91fuWRI0zoEyt6y594MnLOnKhWlShsGe3PG3DaovDSvEqLpRXUQQgolcTd9xgfeyyyqVvKauWXLzN/+WVdYaGHIJpJpkMIYIzDw6mRI9XTr9ENHaq6pHxbVVXczh2OlSutO3c6zWZeLLobAFF8du4ifeThiBtu0Kv8dD63Gy1davrg/erKSi50mSEe3R96OHzu3Gj/2p3njvPCGyBaMH+of3V+ZYjefN99QghGjlI+/3zMwEGqptNz/Djzf1/X/v23zWJpRiEApyW8XE507SqbMFEzdqwmPV3e5pbx5w6rlT92jNm00b5xo/1UHst6UAvDDgujbpihv+++cF+tGhGFhewH71f//ruFYYInQPlfkyTB/feHvzgv+hxP3U1xvngDAOB5/M03daEHgpy+WYAEEB8v+d9jEbfeamxah9brxTt2OL78snbnDqfbjZpffBgICEMIdDoqPV02cpR66FBV166ysDDqAihAAsJ1tXxODrN7l3P7dkdOjkcsJNvsUEXGqFTkmDHqB2eHDxmi8rdqchzesN729tvVR4+KXXpDHYNImrvuNr70Uuz5WDbnkTcAAJ7HP/5Yv+C1qlZtWAAAhIBUCidP0T7+eESzHfPsdmHDBtvixaZ9e12esyxicPqpQAjVaiIxUZLRV9G3r7J7d1liotRgoNoxr8rrxWYzX1TEnjjBHDrkPnLYXVrqdToRxrjlsSkUxNBhqrvuChs7RuNr6C2ipIT98svaX362WCx8q/RZcXu6//6wuc9Fh9j8q7U4v7wBAAgCXrbMPP+Vyro6vlXUEac1IUFy/wPhs2YZjc1lnlos/Pr1tl9+Nh844HY6hbM9Id/VMAYUBTUaMiaWTu4kSU2VpaZJExOlERG0VkuKfdUJArYwToQAQtjjQQ4HstmEmhqupITNz2Pz8z2FRWxVJedwIJ5v4ErLg9FoyMGDlbfeahw3XhPwdBkGrfnH+vHHtVlZDGhl/yGMgVQKH3oo/Olnos5WLevccd55I871yr8tL79cUVLibe05ECFA0WDoENWDD4WPG6tp1iVutwu7djp//dW8Y4ejvl7AOEjlOh+HIAQUBeVyQqkkDAbSYKA0WlKnI7VaSqkkJBJI05AkoSBgzou9Xux0CTabYLMKNptgNvNms+B2I4ZBPI/F/u9BtxJBwJCAkRHU6NHqG2fqBw9WBWgeCOGDB91ffVW7do09aJ3YZqdLoyHmzIl6cHb4eS35eyF4I2L7Nsfzz5cfP860wYQgCFijIa+6WvvA/eF9MhTNXoFl0bFjzNq1tvXrbKdOsR4PavbM0hTiBIhN7X2NWFt+MxQTV2CQN/sgnvUUCqJrV/mkyZrJU7Td0+VNd8mCAs+PP5qWLzM3a9QJZZYiI+l5L0XfcovxfKc2XzjeAACyjrlfeL585w5Xq1Q8EaKQiI6mp1+jmzXL2LOn/GwabnU1t3ePY8NGx969rrJSr1j5tg2P4RwhDhgAIJMRSUmSIUOU48drBg1WN9tIoKSY/e03y7Ll5vw8FmPQBtu3IODOnWWvvhYzZYruAtzpBeUNAKCszPvmwsoVv1l5LqQIowAgBADAMbGSa6/VzZyp795dcbaFJQi4vMKbud+1c6fz0CF3URHrcCBBwBACgjhf9XB8OyBJQo2WTO4k6ddfMWK4ul9/ZUwM3ZToGIOiInbl35blyy25uUGaeLfwpRiA4cNUCxbEZvRtRRf0c8GF5g0AwOEQvvqq7tNPaiyWVu/fIkT2REbR48dpbpypHzBA1UJxKISAycSfymUOHnIfPerOPempqPA6HIjjGlQcccdpA5FEM524u0EC0BTUaMi4OLprV3nvPop+/RRpaTKDgWr2yhyHT5xg/vzTsnq1tajQ2zbGiHcnlcAbbtQ//3x0m4P32oCLwBsg9gdYbX3zzarck542G1TExa3TkYMGqaZN044arYmPl7T8+HkeWyx8aYk3v5DNO+UpLGBLSrxmM2+3Cy4X4nmMUENH+7POFwQkCQkCUBRUqQiNhjQaqYRESUqqNC1VnpIiSUiQ6nVkC6W16uv5vXucq1ZZt21ziN7+NntkRYXmscci7ro7rN0tey3j4vBGRHY28/ZbVWvW2DmuFWbQAIjsoWmYnCwdO04zYYKmTx+FMVi5KBEch91uZLPxZjNfV8fX1/NWq2Cz8ja7wHoAx2GOQ4IAKApQFKRpQiaHWg2p1ZE6HRUeTomlkLRaUqEggoYgOhxCTg6zZbNj/Xp7djbjdqNzUblEIde3n+LFF2PGjNFc+FiAi8kbAIDNJnz7bd1XX9ZVV7fC7dIsxDOLSk107iwbOVI9erQ6PV0eHk6fIyMb9jICtk0sWix8Xp5n507X1i3248cZs1lowRIY+p0qVfDmm/WPPRaVeJGShC4yb8RZ2LPH8d57Vdu3OQWh7UJbhO8Uo1aTCYmSvn0VQ4aoevWSx8VJtNrWdb1rM5xOoaqKy8lm9ux1ZR5w5eezVquA0LnSBZw2FnTrJn9yTuQ11+guotv/4vNGhMnEf/99/bff1lVWtMV00RQYA4wAwlgigXoDlZhAp6fLe/VSdO4si4uThIVTSiXRLsEoCAGPB5nq+aoqLj/fk3XMfeK4p7CIra/jxXL27WUCEASs1ZIzZugffjgioJv3hcelwhsAAMYgM9P12ac169bZz+qwbOuVfU4GhYLQ68noGDopURofL4mOoaOj6ahIWqUh5TJCLidkMkjTkICwoaQNFqteYEHAHg9mGORhkNOF6uq46iqusoorL/MWF3srK7n6et7lEsQavCGaHEMEQoAkQf/+yv/9L2LiJG0oLbrPNy4h3ohwuYTVq61ffFGXdZRp8+m0BTQ6PENAklAigVIpIZdDhZJQKkiFAtI0QVGApiFJQSRgjsc8BzgeMwxyu5DLhRgGeVjkZbHoYTiXw3wIo8VJnaR33Wm85VZjQPP3i4hLjjciKiq8y5aZf15qEtPwzrde4u9q8P0agNNeBej38/kdEkI4IoK+5hrtPfeGp6dfWk32LlHeiDiV6/npp/o//rBUVJyTnePygsgYg4GaPFlz511h/fsrL8E8w0uaNwAAhPDx48zy5eaVK61lpRw4/7Lnot4swBgbw6jx4zSzZhkHD1G1Y0Rw++JS540IjEFODvPbCvOqVbbCQtYX4HLFQAytj46mJkzQ3HyLsV8/5SXLGBGXB298KC5m162z/fWn9cgRt8uFWo6xuvQhbkkSCUxNk029Wjttui49XX4J7kpNcZnxRoTFwu/e7Vy92rprp7OigrvsxI8vejUsjBowUHH11doxYzTnnnt7IXFZ8kYEz+PCQnbLFvv6dfasLMZk4gXhkibQaboAjZbs2lU2Zoxm4gRNenf5eQ3MO0+4jHnjg8uF8vI8O3c6t221HzvG1NfzXq8YZ3PxOSSaixDCFAV1erJzmnT4cPXoMeru3eW+shKXI64E3vjgdqPiYvbwYffevc7Dh92lJV6nE/H8heaQzzxNEFCpJKKj6fR02ZAhqoGDlKmpsouYzNWOuKJ44wNCuL6eL8hnj59gsrLcOdmesjKvzSawLBZD/nzWoHYhk3h+Fg3HEgmh0RDRMXRKiqxPb3mfPorUNFlkJH0pOAfaEVcmb/yBELbbhaoqrqTEm5/vyc9jC4vYujreauHtdsHrxTzfIB4AAG2TTFFRdFInSUKCJClJmpomTUuRxcTSOl175mddarjyeRMAjIHHg+x2wWLh6+q56irOZBIsFjGvhS8r8+bnsWazAEI2MCIEnno6cs6cKJkMtqMv9hLHZayatQ0QArmckMuJyEi6K2jk9OF57HKh3Fxmy2bHqlWW7BwPCiEeCCFcXMRKpf8h0oD/oLwJEeXl3uXLzT98X19aGiRXECHQtav0r7/SoqIvFWf1BcDlZzm4MIiLkzz1VNR333caO1bd8jshBBUVXH6+J7QLXyHo4E1LGDBA+fkXSTfMaCmTDULgdKKjR5lWXPfyRwdvgiA6mn7rrfhrrtW1sJ8LAs7OYYJ2rL2S0MGb4DAaqXnzYtK7y87GDAhBYQHrdre+hdpliw7ehITkZOnNNxvOdraCEFosgsPRwZsONEH//kqFgjzbbuV2C6qEfY4AAARkSURBVAFNr69sdPAmVJyPsPPLFx28CRX79jldLuEsFdewVkudp4polyY6eBMSiorYX5dbztY7GGPQtatMF3Lz7SsAHbwJDrtdePedquzs5ktnYAzkcmLSZM1lEd/ZXujgTRDY7cJbb1WtWGE92xsQwsOHq8aNa3sPsMsR/zm/ZqtQU8O9/nrlsl8sYvBXUyABJCRInn4m6rIO3msD/lt32yoUFLDz5lWs+/esHTSQgCMiqVdfjR08WHWxB3uh0bFPNY9dOx0PPlC8do0NnCUmUBBwUrL0vffjr73uQtRhvNTQEUcRCK8X//ab+c2FVWeLoBCrQ4wYoXpxXsyAAe3QA+xyRAdvGsFuFz7+uOarL+scDnS2hkWdOknuvMt4663GS6rfzAVGB2/OoLLSu+C1yt9+s/B84N4k9hdOTJRMv0Z3yy2Gbt0ureoQFx4dvGlAQSH7/HNlG9Y7QGOFRqzBk5oqve463fU3GDp3lv0HtZmm6OANAADk53uefLJsx3an/96EEIYE6NpFdsutxunTdUlJF6cC46WJDt6A0lL2scdKt25x+MzBDVWukqS3ztLfNNOY2MGYJviv229sNmHBgkp/0ohddK+9Tv/oo5Hdu//X9Ziz4T/NG4TA99/X/fmH1ZdphxCIiCCfeSZ61m3G9m1IeYXhP82bw4ddX39Vz/MNKXYIgago6q134q6Zru9QflvGf3dJcRxevLi+osIrkgZjoFQSL7wY3UGaUPDf5c3Jk8yG9Xa/HQpPnaqdOdPQQZpQ8N/lza5dzupq3idsdDpy1m3GZvswdqAp/qPTJAj46FG3IDTYIBDCKamynj07Tk+h4j/KG47DFeVe368Yg8QEummv8g6cDf9R3ggCZtlGoVgKJXlZlya9wPiPThVJQrmc8JnKIQBWq8DzF3tYlw/+o7yhaRgVdSYKAhKwoIA1mTqIEyr+o7whSdijp9wXlkUQoLiI3bXLcbHHddngP8obAMDQoaow45m8XYZB335bX13NXexxXR747/Kme7p83HiNr8QEScJ9e13vvFPlcAgXe2iXAf67vJHKiNkPRXTqJPFZcTAGP/1onv9KZU1Nh9QJAnL+/PkXewwXDZGRdHg4tXuXU2wRAiFACBw54s7KcsfESOLiJG3ubX7F4z/NGwhB167yuDg6K8ttMQtir0MAQFEhu3Gjo7TUqzeQYWHUfyqBN0R0xPsBAMDBg65Fi2o2bXQ4HQIkIEEAjAHCODyMHjZMOXmyduAgZWyspMN75UMHbxrgcqFt2+y/rbDs3eusqeE5rsGajDGQSGF0FN0tXT6gv7JPH0VCoiQ8nFKpSLEc+n/Tf97Bm0bwenF+vudgpjsz05WX56mu5mw2gWEwxyGxwbNCQRiNVHyCJC1VmpIq7d1HkdFH+Z+qfCOigzfNA2PgcAgOh1BXx5tMPMMglkU8B0gS0BKoUpJaHWk0Uno9qdFQ/0HHVgdvOtAW/PdWSgfaAx286UBb0MGbDrQF/w9GcVjvyzp41AAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNC0wOC0wMVQxMTo0Mzo0NiswMjowMNf1Q+IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMTItMDZUMTU6MTc6NTErMDE6MDCrFyOJAAAAAElFTkSuQmCC</mdui:Logo>
<mdui:InformationURL xml:lang="en">http://www.mf.uni-lj.si/eng/</mdui:InformationURL>
<mdui:InformationURL xml:lang="sl">http://www.mf.uni-lj.si</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.mf.uni-lj.si/eng/</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sl">http://www.mf.uni-lj.si</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIDezCCAmOgAwIBAgIFLt8WEPgwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTEzMDEGA1UEAwwqVW5pdmVyemEgdiBManVibGphbmksIE1lZGljaW5za2EgZmFrdWx0ZXRhMB4XDTEzMTEyNjA4MjcxMloXDTE1MTExNjA4MjcxMlowVjELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTEzMDEGA1UEAwwqVW5pdmVyemEgdiBManVibGphbmksIE1lZGljaW5za2EgZmFrdWx0ZXRhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvuIhlHGsp4L0wv7dXjHO85oBTcem25GHraf4Gv4nX9N98ijqCv2S/KwUVJ2M/mYnxteBHRpeLl67c4it2PtJDJBP21HkbJt4fhGhLUyn/IGc3IM3CFg1elqSuQHad2tqmILFosavrCv+Ka9ADjXkbkoKkuPrRm4jNO3emCo5RlqPxhOpEDQS/PuqyPoqN6G0GFpuRilAxSQIBW9ccIt1aYE2ImlFivI1uPBND9EQJ9KAgYFhwfXXrNP6nRPcD013oKB0RhOu5curJH/uh9UWxEaDHP/9YWeObRX0DME7+oYZPJvDRn7xpoI23Rb73lRouCFhF6SYy2yvPuwqE2geEQIDAQABo1AwTjAdBgNVHQ4EFgQU1yofWR7pZ+mgKZ2FFr8/mpj15FAwHwYDVR0jBBgwFoAU1yofWR7pZ+mgKZ2FFr8/mpj15FAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEACI8Aec2jDOVcpd9mjjVcxsmDCZP2fNG86pxt3fivOOJkBZIZhcDHRybl6sI4dDSEDyFMwIlZhmM2jnAHA2heQ/k5zAMox27YqQ6krR3MavAUDPSxHpDIqirjDWCPd7FJI4jPkFGdaxBgEZsYuxHwLv7nicU9EDtpvUklGeCu+PcfZwOZrWMeIEJ/sz767Bg4f90/DfuW8KRx0s/qC3CmGJCISANm6zqxypouZTCd6FXV2+6mWYBNwyla1at5vYwYACimnbKjbq1XGfq+63O6K60GCPSJJ98gejbgFbpEmxwvq3N26mpNRWCz0pos/CDJPYKIHTGt32z6m9Yx+sLXgQ==</ds:X509Certificate>
+ <ds:X509Certificate>MIIEBTCCAu2gAwIBAgIJALBMH+OaXfh8MA0GCSqGSIb3DQEBCwUAMIGYMQswCQYDVQQGEwJzaTETMBEGA1UECAwKU2xvdmVuaWphbjESMBAGA1UEBwwJTGp1YmxqYW5hMQ4wDAYDVQQKDAVNRiBVTDENMAsGA1UECwwESUJNSTEZMBcGA1UEAwwQaWRwLm1mLnVuaS1sai5zaTEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckBtZi51bmktbGouc2kwHhcNMTUxMjE2MDgxMzU1WhcNMjUxMjE1MDgxMzU1WjCBmDELMAkGA1UEBhMCc2kxEzARBgNVBAgMClNsb3ZlbmlqYW4xEjAQBgNVBAcMCUxqdWJsamFuYTEOMAwGA1UECgwFTUYgVUwxDTALBgNVBAsMBElCTUkxGTAXBgNVBAMMEGlkcC5tZi51bmktbGouc2kxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAbWYudW5pLWxqLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlkEOHCZe/rh/aax/1sCGsiMvOHzmtSNADTKXadns9/z1Wixq6rW3UbRPGIV+luQ76P5d76Z5xt3LAQ6sbxuaLv41eqAPUdvum5h/NmWF7l34auGsPBc0LxzzLqG+HQFQTi3eLfdTUZqLQwNs9Ka40zSxfeGH5nB8ePtnErg3fYKzCu8X5nETy4M7gous7lVzUePBkxDOe8IPhpH5lUg2YrlxaIoLVLsv+sn3ZhAOOnlw8uJuQwmvBcc0bGwmpGtjVJ+uf79U9xs/QKNSjGx4e0dcZul4/54QEQNLLhGqCsjwrAJLzAgFdD0a8A2D0x5ZvFtDN9VpaMyFcDRHG3TwOQIDAQABo1AwTjAdBgNVHQ4EFgQU+YFl/0f0mbE1vFL1Cb42QZZReuswHwYDVR0jBBgwFoAU+YFl/0f0mbE1vFL1Cb42QZZReuswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAZ1MWeKkY+YVeD0jENxVUzgoA6Kjnwuo0Xwc+oGP0RjecuK1ZzIpt0ed3+gqof8AXAMmX4Q8KFtUrsPGQuB0uAqAb4ZEpwRbhGddE0AcHYT6yQkqxGsEU6I2vrNjiDOi6KNuoWRG/wL+bjQmgqWNY9krVrDW2KpGPurlbhzwDpyvgurxpUZcEJSyfWacrfJbbhyqX9wAaKK47sXExPCtKSzoMS+8tzSir5zG7F5+uxmCsTyG97EuD5eHAjmWRZtUTLh4VX88pQt2RURkWuLpx/7Zah4nt5VgrtjdxJ///jQ5ArTK1WGmeGcmcKWx82sFcA3mTvjI758355gzjtglyFA==</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>MIIDezCCAmOgAwIBAgIFLt8WEPgwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTEzMDEGA1UEAwwqVW5pdmVyemEgdiBManVibGphbmksIE1lZGljaW5za2EgZmFrdWx0ZXRhMB4XDTEzMTEyNjA4MjcxMloXDTE1MTExNjA4MjcxMlowVjELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTEzMDEGA1UEAwwqVW5pdmVyemEgdiBManVibGphbmksIE1lZGljaW5za2EgZmFrdWx0ZXRhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvuIhlHGsp4L0wv7dXjHO85oBTcem25GHraf4Gv4nX9N98ijqCv2S/KwUVJ2M/mYnxteBHRpeLl67c4it2PtJDJBP21HkbJt4fhGhLUyn/IGc3IM3CFg1elqSuQHad2tqmILFosavrCv+Ka9ADjXkbkoKkuPrRm4jNO3emCo5RlqPxhOpEDQS/PuqyPoqN6G0GFpuRilAxSQIBW9ccIt1aYE2ImlFivI1uPBND9EQJ9KAgYFhwfXXrNP6nRPcD013oKB0RhOu5curJH/uh9UWxEaDHP/9YWeObRX0DME7+oYZPJvDRn7xpoI23Rb73lRouCFhF6SYy2yvPuwqE2geEQIDAQABo1AwTjAdBgNVHQ4EFgQU1yofWR7pZ+mgKZ2FFr8/mpj15FAwHwYDVR0jBBgwFoAU1yofWR7pZ+mgKZ2FFr8/mpj15FAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEACI8Aec2jDOVcpd9mjjVcxsmDCZP2fNG86pxt3fivOOJkBZIZhcDHRybl6sI4dDSEDyFMwIlZhmM2jnAHA2heQ/k5zAMox27YqQ6krR3MavAUDPSxHpDIqirjDWCPd7FJI4jPkFGdaxBgEZsYuxHwLv7nicU9EDtpvUklGeCu+PcfZwOZrWMeIEJ/sz767Bg4f90/DfuW8KRx0s/qC3CmGJCISANm6zqxypouZTCd6FXV2+6mWYBNwyla1at5vYwYACimnbKjbq1XGfq+63O6K60GCPSJJ98gejbgFbpEmxwvq3N26mpNRWCz0pos/CDJPYKIHTGt32z6m9Yx+sLXgQ==</ds:X509Certificate>
+ <ds:X509Certificate>MIIEBTCCAu2gAwIBAgIJALBMH+OaXfh8MA0GCSqGSIb3DQEBCwUAMIGYMQswCQYDVQQGEwJzaTETMBEGA1UECAwKU2xvdmVuaWphbjESMBAGA1UEBwwJTGp1YmxqYW5hMQ4wDAYDVQQKDAVNRiBVTDENMAsGA1UECwwESUJNSTEZMBcGA1UEAwwQaWRwLm1mLnVuaS1sai5zaTEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckBtZi51bmktbGouc2kwHhcNMTUxMjE2MDgxMzU1WhcNMjUxMjE1MDgxMzU1WjCBmDELMAkGA1UEBhMCc2kxEzARBgNVBAgMClNsb3ZlbmlqYW4xEjAQBgNVBAcMCUxqdWJsamFuYTEOMAwGA1UECgwFTUYgVUwxDTALBgNVBAsMBElCTUkxGTAXBgNVBAMMEGlkcC5tZi51bmktbGouc2kxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAbWYudW5pLWxqLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlkEOHCZe/rh/aax/1sCGsiMvOHzmtSNADTKXadns9/z1Wixq6rW3UbRPGIV+luQ76P5d76Z5xt3LAQ6sbxuaLv41eqAPUdvum5h/NmWF7l34auGsPBc0LxzzLqG+HQFQTi3eLfdTUZqLQwNs9Ka40zSxfeGH5nB8ePtnErg3fYKzCu8X5nETy4M7gous7lVzUePBkxDOe8IPhpH5lUg2YrlxaIoLVLsv+sn3ZhAOOnlw8uJuQwmvBcc0bGwmpGtjVJ+uf79U9xs/QKNSjGx4e0dcZul4/54QEQNLLhGqCsjwrAJLzAgFdD0a8A2D0x5ZvFtDN9VpaMyFcDRHG3TwOQIDAQABo1AwTjAdBgNVHQ4EFgQU+YFl/0f0mbE1vFL1Cb42QZZReuswHwYDVR0jBBgwFoAU+YFl/0f0mbE1vFL1Cb42QZZReuswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAZ1MWeKkY+YVeD0jENxVUzgoA6Kjnwuo0Xwc+oGP0RjecuK1ZzIpt0ed3+gqof8AXAMmX4Q8KFtUrsPGQuB0uAqAb4ZEpwRbhGddE0AcHYT6yQkqxGsEU6I2vrNjiDOi6KNuoWRG/wL+bjQmgqWNY9krVrDW2KpGPurlbhzwDpyvgurxpUZcEJSyfWacrfJbbhyqX9wAaKK47sXExPCtKSzoMS+8tzSir5zG7F5+uxmCsTyG97EuD5eHAjmWRZtUTLh4VX88pQt2RURkWuLpx/7Zah4nt5VgrtjdxJ///jQ5ArTK1WGmeGcmcKWx82sFcA3mTvjI758355gzjtglyFA==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml
index 33268bb1..d012e423 100644
--- a/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Helicon Opleidingen</mdui:DisplayName>
<mdui:Description xml:lang="nl">Helicon Opleidingen</mdui:Description>
<mdui:Description xml:lang="en">Helicon Opleidingen</mdui:Description>
- <mdui:Logo height="41" width="108">https://static.surfconext.nl/media/idp/helicon.png</mdui:Logo>
+ <mdui:Logo height="41" width="108">https://static.surfconext.nl/logos/idp/helicon.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Helicon Opleidingen MBO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Helicon Opleidingen MBO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml
index e96b9f50..89e8e892 100644
--- a/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml
@@ -44,7 +44,9 @@
</md:IDPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="hu">MTA Titkárság</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Hungarian Academy of Sciences</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="hu">MTA Titkárság</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Hungarian Academy of Sciences</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="hu">http://aat.mta.hu</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://aat.mta.hu/en</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..95be6f6d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nescol.ac.uk/idp/shibboleth">
+ <!--
+ This is a Shibboleth IdP for North East Scotland College.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-28T15:27:48Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nescol.ac.uk</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abcol.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVAKEDzkStX1FCYI1ncdQf2sHeDpAgMA0GCSqGSIb3DQEB
+ CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDIx
+ WhcNMzUxMDA3MDc0NDIxWjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvvRWSfVCncXhsWHo1pS9k0CN
+ G1uVARjMiMJWYKWZZMpQwAae2rTUmG8LehI9dLcSwyj0FypFAd1Rm65VMeNmSUnZ
+ vH42FBOu9zUB0wEeU3Gd+d0NIl0iGtMvFqEKyCNXs9BFwXU3c7xuxFYNP7HL2S0z
+ QXCmP/fKQ1dbrtqcoRH5/i5M1ARdRBDOBQNINjeNznpW5P821MgRoZsVomFoj0ns
+ 4FWzP5MPIVz6UsYUVHUfsqc9R8+ZL7yVEaYmBNr8PncJPDBMTXScJsq+PbeRElb6
+ QGFNzD7tecIddocqtLP9i8TYtW3qQcvS0HYDdkUkAuXMauVz/+6laoUyyCh/7wID
+ AQABo2cwZTAdBgNVHQ4EFgQUZfGr2q28H23OzD5rr8a7im0zJWAwRAYDVR0RBD0w
+ O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
+ cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCbjtSu5h4rRIO2CaVZZHhX
+ MSpA7ujPbk8SqRiEmdavqvAZuVe0amQIH0jDHKDrj6EL2Q5RiUtSPGtu3fBEH9KR
+ vJ+ty1Hy8A8TDx8o+RzIELwwSQAb/vEoB6lsMeaJPMwKX//hNt1EIA6YIBl5L6Fp
+ 5WVVHY3RnaL8TmC6OKukeQTacexRe/P/knf89A6yro3RHujkkA85B5xznRQAaGME
+ npzDfkAZg6ZDHz2b/XDpz3p07Eb7th/Uxhyhtg9YDBJji3g0ozzEC8xTVGPiXyyV
+ 90sld2GFXRpujyBGKqq8A2kcuZzp/svH+PaKhkbV6fhL6RIlRemx6dEMA31Ct813
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVAIMqlry3pKY0TO9+Ll0+SdKXHYjFMA0GCSqGSIb3DQEB
+ CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE4
+ WhcNMzUxMDA3MDc0NDE4WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiQOliKKmqz3QoabzR3UdhP5B
+ qq1u4lL6Zy5jpL3UvQ4lT64cZVXO3RhWo0gqa7mynzHJ7Kf11iTHI/7QT6d9iY8I
+ 8HSrM1QszFgH+TlkKdNd7Dw5EHZeyY9+TgxmBX2a6A6s8wC7diyttKui/XpeM21t
+ tvzYboR5iU7IAkDq9u83ChSCDfAgzmHKWjrAEko9ZRQ6EUafDUQcaae/tLIZJKVY
+ wsbfECBMznnK0WkxaHZN663Si8EnV7/vlshpQbfFBnQr3HCVDYoh/jT2QSoOImAR
+ Na3Ixk86lQLjukmYe3XIgzb7CA4+6cVmN2SkUA6QCP0cYeFyxd26Zvi8nQsBjQID
+ AQABo2cwZTAdBgNVHQ4EFgQUl5vAQkdSv1GDlG0FhFkgPrUVPf8wRAYDVR0RBD0w
+ O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
+ cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA4ozGUVO6h6JaeJ3JrzGmp
+ 38fxbmvDXSasLHoEhVb5JkKOdKTBJpq49YyxmdFtYZSAqBDoC5izY/IsImCzbiKo
+ +yGdOfxR0pKMkvNKaA+JA0bB9OipPGoxrDxz3IUR8OG916ybd/yWmdKBQlQ2tIob
+ rEwBCTD1figB3ZUnUTG05zMn6GR5qDtGcw6JgRiBxEwU/U8D7ttAIaLYD5RsyoQF
+ LLZOOH1RKpXXNoRp521Lei3Mr/EYMwe3pucZu4IC4uERtbVUz/L3XmSzYcCMhCM3
+ ruIQQmwfNLTUYaaqf0RFqHo7tm1BBqeuNuw8t+lGEwI+DQkO6CTrfmct9MzHWs0V
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVAPQaMyaBdI++UopEGmsCDtG4CXdlMA0GCSqGSIb3DQEB
+ CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE5
+ WhcNMzUxMDA3MDc0NDE5WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfvPYUl5SsgvF204YhwitXfS
+ 0Lbc+BsJvq/BV/PJIvPkdyr5o3ctVFOm7NGGG0SH3W92rirMrxXdHSRlP+OJkK2G
+ MaygZoz/Fi/RbHlhNRYJXsDTODhKcj9i72LUTLoJZ6cZ0rUvVaGrJjtyKj3YQ+EP
+ tNx5h80WG5txTlWxxBDOVtgJovnOd7ycMU9+Y5QdPqAscXYE13GcyrrR55ihQZou
+ i8+Q7kOr7AJ+64PGzCs1Dl+wNxrzfk4Y5huNqFV6IZndY/xrsD+hXv5RlacEHhNU
+ lT4AmPqKiHyC0TmaT2khfMxUxrdVol1aEEhku8o5eNHY3PNub3MrTPjgJOqFDwID
+ AQABo2cwZTAdBgNVHQ4EFgQUb6hWpMHLzhNa1MWB0vB9AQ7XqMcwRAYDVR0RBD0w
+ O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
+ cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBDecwbJizYy+q9KsC34EK4
+ 6H4bcF0ViqYgSI0+PtRZX8awqy1vTaMDJ8UDWu6IfMuA9bx//OORKJqgGYwUaz2X
+ wBLUWJqWfLxmrt233xLsEj/Bwo84jItiXQG5s/bFaDDrI89HgDO69kdbkivLTrIs
+ 9B/FSaktbAznrzxFiTxY/VZXEUFiWmjYGrmeXspFU/x7tr9cNl0lXA9S21BfWfC9
+ IDGil+m69K3wBXk7WnA+yAi66E2MWUwOi4qWBCtMq1icN++lpLHZoAa743qkRUly
+ zsjInuoJhw2oC82Qyj8cZIqtSa78iFkJEnih68qBekU4B54y2PvqtkvVZonmTskY
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nescol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nescol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nescol.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nescol.ac.uk</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abcol.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVAKEDzkStX1FCYI1ncdQf2sHeDpAgMA0GCSqGSIb3DQEB
+ CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDIx
+ WhcNMzUxMDA3MDc0NDIxWjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvvRWSfVCncXhsWHo1pS9k0CN
+ G1uVARjMiMJWYKWZZMpQwAae2rTUmG8LehI9dLcSwyj0FypFAd1Rm65VMeNmSUnZ
+ vH42FBOu9zUB0wEeU3Gd+d0NIl0iGtMvFqEKyCNXs9BFwXU3c7xuxFYNP7HL2S0z
+ QXCmP/fKQ1dbrtqcoRH5/i5M1ARdRBDOBQNINjeNznpW5P821MgRoZsVomFoj0ns
+ 4FWzP5MPIVz6UsYUVHUfsqc9R8+ZL7yVEaYmBNr8PncJPDBMTXScJsq+PbeRElb6
+ QGFNzD7tecIddocqtLP9i8TYtW3qQcvS0HYDdkUkAuXMauVz/+6laoUyyCh/7wID
+ AQABo2cwZTAdBgNVHQ4EFgQUZfGr2q28H23OzD5rr8a7im0zJWAwRAYDVR0RBD0w
+ O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
+ cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCbjtSu5h4rRIO2CaVZZHhX
+ MSpA7ujPbk8SqRiEmdavqvAZuVe0amQIH0jDHKDrj6EL2Q5RiUtSPGtu3fBEH9KR
+ vJ+ty1Hy8A8TDx8o+RzIELwwSQAb/vEoB6lsMeaJPMwKX//hNt1EIA6YIBl5L6Fp
+ 5WVVHY3RnaL8TmC6OKukeQTacexRe/P/knf89A6yro3RHujkkA85B5xznRQAaGME
+ npzDfkAZg6ZDHz2b/XDpz3p07Eb7th/Uxhyhtg9YDBJji3g0ozzEC8xTVGPiXyyV
+ 90sld2GFXRpujyBGKqq8A2kcuZzp/svH+PaKhkbV6fhL6RIlRemx6dEMA31Ct813
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVAIMqlry3pKY0TO9+Ll0+SdKXHYjFMA0GCSqGSIb3DQEB
+ CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE4
+ WhcNMzUxMDA3MDc0NDE4WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiQOliKKmqz3QoabzR3UdhP5B
+ qq1u4lL6Zy5jpL3UvQ4lT64cZVXO3RhWo0gqa7mynzHJ7Kf11iTHI/7QT6d9iY8I
+ 8HSrM1QszFgH+TlkKdNd7Dw5EHZeyY9+TgxmBX2a6A6s8wC7diyttKui/XpeM21t
+ tvzYboR5iU7IAkDq9u83ChSCDfAgzmHKWjrAEko9ZRQ6EUafDUQcaae/tLIZJKVY
+ wsbfECBMznnK0WkxaHZN663Si8EnV7/vlshpQbfFBnQr3HCVDYoh/jT2QSoOImAR
+ Na3Ixk86lQLjukmYe3XIgzb7CA4+6cVmN2SkUA6QCP0cYeFyxd26Zvi8nQsBjQID
+ AQABo2cwZTAdBgNVHQ4EFgQUl5vAQkdSv1GDlG0FhFkgPrUVPf8wRAYDVR0RBD0w
+ O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
+ cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA4ozGUVO6h6JaeJ3JrzGmp
+ 38fxbmvDXSasLHoEhVb5JkKOdKTBJpq49YyxmdFtYZSAqBDoC5izY/IsImCzbiKo
+ +yGdOfxR0pKMkvNKaA+JA0bB9OipPGoxrDxz3IUR8OG916ybd/yWmdKBQlQ2tIob
+ rEwBCTD1figB3ZUnUTG05zMn6GR5qDtGcw6JgRiBxEwU/U8D7ttAIaLYD5RsyoQF
+ LLZOOH1RKpXXNoRp521Lei3Mr/EYMwe3pucZu4IC4uERtbVUz/L3XmSzYcCMhCM3
+ ruIQQmwfNLTUYaaqf0RFqHo7tm1BBqeuNuw8t+lGEwI+DQkO6CTrfmct9MzHWs0V
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVAPQaMyaBdI++UopEGmsCDtG4CXdlMA0GCSqGSIb3DQEB
+ CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE5
+ WhcNMzUxMDA3MDc0NDE5WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfvPYUl5SsgvF204YhwitXfS
+ 0Lbc+BsJvq/BV/PJIvPkdyr5o3ctVFOm7NGGG0SH3W92rirMrxXdHSRlP+OJkK2G
+ MaygZoz/Fi/RbHlhNRYJXsDTODhKcj9i72LUTLoJZ6cZ0rUvVaGrJjtyKj3YQ+EP
+ tNx5h80WG5txTlWxxBDOVtgJovnOd7ycMU9+Y5QdPqAscXYE13GcyrrR55ihQZou
+ i8+Q7kOr7AJ+64PGzCs1Dl+wNxrzfk4Y5huNqFV6IZndY/xrsD+hXv5RlacEHhNU
+ lT4AmPqKiHyC0TmaT2khfMxUxrdVol1aEEhku8o5eNHY3PNub3MrTPjgJOqFDwID
+ AQABo2cwZTAdBgNVHQ4EFgQUb6hWpMHLzhNa1MWB0vB9AQ7XqMcwRAYDVR0RBD0w
+ O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
+ cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBDecwbJizYy+q9KsC34EK4
+ 6H4bcF0ViqYgSI0+PtRZX8awqy1vTaMDJ8UDWu6IfMuA9bx//OORKJqgGYwUaz2X
+ wBLUWJqWfLxmrt233xLsEj/Bwo84jItiXQG5s/bFaDDrI89HgDO69kdbkivLTrIs
+ 9B/FSaktbAznrzxFiTxY/VZXEUFiWmjYGrmeXspFU/x7tr9cNl0lXA9S21BfWfC9
+ IDGil+m69K3wBXk7WnA+yAi66E2MWUwOi4qWBCtMq1icN++lpLHZoAa743qkRUly
+ zsjInuoJhw2oC82Qyj8cZIqtSa78iFkJEnih68qBekU4B54y2PvqtkvVZonmTskY
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nescol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">North East Scotland College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">North East Scotland College</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.nescol.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Martin</GivenName>
+ <SurName>Sherrit</SurName>
+ <EmailAddress>mailto:m.sherrit@nescol.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Martin</GivenName>
+ <SurName>Sherrit</SurName>
+ <EmailAddress>mailto:m.sherrit@nescol.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml
index b7a8a0ac..9b0b69f9 100644
--- a/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml
@@ -85,7 +85,7 @@
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">Newham Sixth Form College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Newman Sixth Form College (Shibboleth)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Newham Sixth Form College (Shibboleth)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.newvic.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/idp.nhl.nl-.xml b/swamid-interfederations-2.0/idp.nhl.nl-.xml
index 560304d5..adc5d2ef 100644
--- a/swamid-interfederations-2.0/idp.nhl.nl-.xml
+++ b/swamid-interfederations-2.0/idp.nhl.nl-.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">NHL Hogeschool</mdui:DisplayName>
<mdui:Description xml:lang="nl">NHL Hogeschool</mdui:Description>
<mdui:Description xml:lang="en">NHL Hogeschool</mdui:Description>
- <mdui:Logo height="47" width="68">https://static.surfconext.nl/media/idp/nhl.png</mdui:Logo>
+ <mdui:Logo height="47" width="68">https://static.surfconext.nl/logos/idp/nhl.png</mdui:Logo>
<mdui:Keywords xml:lang="en">NHL Hogeschool University Leeuwarden HBO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">NHL Hogeschool University Leeuwarden HBO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
index ccde6921..d9cc2778 100644
--- a/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
@@ -100,15 +100,15 @@ JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
<md:ContactPerson contactType="administrative">
<md:Company>NORDUnet</md:Company>
<md:SurName>noc@nordu.net</md:SurName>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>NORDUnet</md:Company>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>NORDUnet</md:Company>
<md:SurName>NUNOC</md:SurName>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..24bed3d0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.oniris-nantes.fr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-11-13T11:01:44Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oniris-nantes.fr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">ONIRIS</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/ico;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACAklEQVQ4ja2ST2sTURTFf28yzUzmD4mTWoi2UVFapOBGEDdCS+ln8bu49RtUEPeuLIKgCwUJ7Uaq1do0tRiapH8y0+Zl3sw8F4lJUKiLelaX9847997zjtBaay4B4zKP/4uA+buY3EQIMarTTCMEGBNnf02gNWzshTx9vc/H3S6TrnzYPmSnGY6a/GmZAXDWT6i3JY+XrrNzeM5pT43IlcBHqgytNZv1IzbrR8O74bRaa12rd6kGNj86J0QSzKk8nw7OyJuCq45gsVri+fsmK4sBZS/Py40W9+Y8lu8Ggwl6cYrISfxSk4fz07RDRaVk4dkm08UCfZVRLduU3TyhTJgNLB7NXxmvMFc2ebH1hFn/Do2OpOiYlByTom2SMwy+NbtM+3kQ4ORzaA1vvxyPBaqBS6Vwn9r3mDdbxyxU3JFJcZIyU7Qwhp+g0ozbMwWifjoW6J4nLPjL7LUiHtx0aZ+ekyQKdEI/VuQQkKWcRD2OQ8m7z22uFc1xDr7WDzjoppiqz+7PPkKAbdmDHACNbkiapcjeFFEUMedZTIlsLGDrM063a/i+T5JleJ7HyuoqhmGgteao0+HV+jpOoYCWklApTtQNuLU0EBBCoJRCSklQLrPfaPBsbQ3HcUjTFMd1cV2XdquF67pIKclb1jgHk+nSWhPHMdaQcBGEEAOBfzIvwC9GKvSMrFiGLwAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:InformationURL xml:lang="fr">http://www.oniris-nantes.fr/</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Teachers, students</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">ONIRIS</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Les enseignants, les étudiants</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPDCCAiSgAwIBAgIVAOz8cFkBTLbxVln29ynPAKgeQJHNMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMMFGlkcC5vbmlyaXMtbmFudGVzLmZyMB4XDTE1MDkxODE0
+MjA1MVoXDTM1MDkxODE0MjA1MVowHzEdMBsGA1UEAwwUaWRwLm9uaXJpcy1uYW50
+ZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN+nrKBD7GWB/T
+aJGUh8V98CXhBXVcZLdOvyssCD7FmjDISGEimgaAFRCnExN+0XoZWutK37Mthtn7
+fAPFF92sucimPRluwEFniPHyHGd2Fl1kP5NJM+I0SfyYF/QH3yg/D9ZVd7x4XLFL
+EnH3aPxL+cmUcdAcct26PuvuKiUDXPnAALgUwDaHHN/sPcgmXuJbskka7fzN9eZI
+XAzjP+pHnqZI3gBujQmUeRf5FK12mEcNdL+gYJVjUhnpOj9bgnIA9gB0yxtd+wXo
+zwNc0w2rbu3EuSo58izreXEaiy3CFZrhB+sr8GRqV7YUdNACuxZhRq1PC2rqbdZm
+rd9LylwxAgMBAAGjbzBtMB0GA1UdDgQWBBTZTZo/XqVYLds0PI9G9SObpiScSzBM
+BgNVHREERTBDghRpZHAub25pcmlzLW5hbnRlcy5mcoYraHR0cHM6Ly9pZHAub25p
+cmlzLW5hbnRlcy5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
+QZvGx+m1HA5knbytovMAYLsstIryni09aHxCdP99Ak++pSXWTevvb4DukifIKgfv
+U8vleBoAortLhq+25dAZUsDL45st8tHx2umUOR/0xrujAPzMetZ+eFt1YdgYH1f+
+7d6IVwhObN7FiaV+/D+WZ40eAZT+3nY8V+XnpkP5H6rrauZ7RIJVjGXUW1PuNnAT
+yfFkeSjliStwTQZGY6qn28he9NDqOq7M4ye6zihzbtSa0Md9bYS/OlJHU7UNqbaD
+ujowHlafOBa/eC9WGKT2m2VT2yjF7opAf0d5Y+rIgM4pDglCV2/p9Sz5GGGbO1Fe
+ZKXiB3CTQrnXASQ6EfUC+w==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oniris-nantes.fr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oniris-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.oniris-nantes.fr/idp/profile/Shibboleth/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">ONIRIS</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">ONIRIS</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.oniris-nantes.fr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Didier ROY</md:SurName>
+ <md:EmailAddress>didier.roy@oniris-nantes.fr</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Gregory LEFRANC</md:SurName>
+ <md:EmailAddress>gregory.lefranc@oniris-nantes.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..29211fed
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.poliba.it/simplesaml/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-09-01T08:06:49Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poliba.it</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">studenti.poliba.it</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Politecnico di Bari</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">Politecnico di Bari</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for the users of Politecnico di Bari</mdui:Description>
+ <mdui:Description xml:lang="it">Identity Provider per gli utenti del Politecnico di Bari</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://www.poliba.it/ateneo/ideminfo</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="it">https://www.poliba.it/ateneo/ideminfo</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.poliba.it/ateneo/idemprivacy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="it">https://www.poliba.it/ateneo/idemprivacy</mdui:PrivacyStatementURL>
+ <mdui:Logo height="60" width="80" xml:lang="en">https://idp.poliba.it/logo80x60.png</mdui:Logo>
+ <mdui:Logo height="60" width="80" xml:lang="it">https://idp.poliba.it/logo80x60.png</mdui:Logo>
+ <mdui:Logo height="16" width="16" xml:lang="en">https://idp.poliba.it/logo16x16.png</mdui:Logo>
+ <mdui:Logo height="16" width="16" xml:lang="it">https://idp.poliba.it/logo16x16.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:GeolocationHint>geo:41.109481,16.878798</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIEEzCCAvugAwIBAgIJAKbucxOGsbx5MA0GCSqGSIb3DQEBCwUAMIGfMQswCQYD
+VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxHDAaBgNVBAoM
+E1BvbGl0ZWNuaWNvIGRpIEJhcmkxFDASBgNVBAsMC1NldHRvcmUgSUNUMRcwFQYD
+VQQDDA53d3c0LnBvbGliYS5pdDEkMCIGCSqGSIb3DQEJARYVbHVpZ2kuZ2F0dG9A
+cG9saWJhLml0MB4XDTE1MDgyMjE3Mjg0NloXDTQ1MDgxNDE3Mjg0NlowgZ8xCzAJ
+BgNVBAYTAklUMQ4wDAYDVQQIDAVJdGFseTENMAsGA1UEBwwEQmFyaTEcMBoGA1UE
+CgwTUG9saXRlY25pY28gZGkgQmFyaTEUMBIGA1UECwwLU2V0dG9yZSBJQ1QxFzAV
+BgNVBAMMDnd3dzQucG9saWJhLml0MSQwIgYJKoZIhvcNAQkBFhVsdWlnaS5nYXR0
+b0Bwb2xpYmEuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrlko9
+49/dYS4bU1T718ZCj6LYl/NFy/7kSfqRFeqal0E8OaD02r/+z8LbZPinSOgrw2DP
+eFXTZv04ZkkOu4dyQKqkOndOVo09VNjRsJS7YK/xHkpCUC260vIV0q1XrNzYaMJ/
+Uu5g2xox2j3nkfyc8wdpQlUQ6j15mxDCAYUfCsMUmvdJ0850TaO2RLCH5gduuJiA
+D1c3YN/G94j9KY7jM8grYyf5A3SGp5n8281ZuKPGKY4TGrxUC46qkeQr4mK7HhJn
+lzDfABYRNjbuWe495XnMCnyJNS/7EylsJ+Cc+B3qEXg/ewdJKLrR3w+X4wgnW78S
+O69S3xYiT2VRde7VAgMBAAGjUDBOMB0GA1UdDgQWBBTdX5So6SB4K2IX59likNO8
+2/usIjAfBgNVHSMEGDAWgBTdX5So6SB4K2IX59likNO82/usIjAMBgNVHRMEBTAD
+AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBZs5MMUimtJQKXrNDbOYsXg6yTUhvRQPLj
+kv2M3cH/8lhqnYpU9C3X4FrVPbxx5SxqBBTw8SOUAZfEAlvN+OJC1efq03VQmH3A
+M/GqgwM4ztNUIz1kWgDdIEkUZBEJ2BBN4VP0xH1s0f1gKFMxqOE4BwPNmU7ZFD4O
+QM7qOcq58voRCohpfUeVG6V3BkpKyx/VHFaJpkucI1U/Gw4S/6Slp4qLJ6eHIbQB
+bBEuc7suv0QEIC2VgbkdQ1muEZJfGPaxTYn00BZCPgUG2ka7hgRmKzNDdGjRe8YT
+ICP6wM+pztMtIPWic53DejjEukR860nQx4/53saWj3RRjkuTouv2
+</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>
+MIIEEzCCAvugAwIBAgIJAKbucxOGsbx5MA0GCSqGSIb3DQEBCwUAMIGfMQswCQYD
+VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxHDAaBgNVBAoM
+E1BvbGl0ZWNuaWNvIGRpIEJhcmkxFDASBgNVBAsMC1NldHRvcmUgSUNUMRcwFQYD
+VQQDDA53d3c0LnBvbGliYS5pdDEkMCIGCSqGSIb3DQEJARYVbHVpZ2kuZ2F0dG9A
+cG9saWJhLml0MB4XDTE1MDgyMjE3Mjg0NloXDTQ1MDgxNDE3Mjg0NlowgZ8xCzAJ
+BgNVBAYTAklUMQ4wDAYDVQQIDAVJdGFseTENMAsGA1UEBwwEQmFyaTEcMBoGA1UE
+CgwTUG9saXRlY25pY28gZGkgQmFyaTEUMBIGA1UECwwLU2V0dG9yZSBJQ1QxFzAV
+BgNVBAMMDnd3dzQucG9saWJhLml0MSQwIgYJKoZIhvcNAQkBFhVsdWlnaS5nYXR0
+b0Bwb2xpYmEuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrlko9
+49/dYS4bU1T718ZCj6LYl/NFy/7kSfqRFeqal0E8OaD02r/+z8LbZPinSOgrw2DP
+eFXTZv04ZkkOu4dyQKqkOndOVo09VNjRsJS7YK/xHkpCUC260vIV0q1XrNzYaMJ/
+Uu5g2xox2j3nkfyc8wdpQlUQ6j15mxDCAYUfCsMUmvdJ0850TaO2RLCH5gduuJiA
+D1c3YN/G94j9KY7jM8grYyf5A3SGp5n8281ZuKPGKY4TGrxUC46qkeQr4mK7HhJn
+lzDfABYRNjbuWe495XnMCnyJNS/7EylsJ+Cc+B3qEXg/ewdJKLrR3w+X4wgnW78S
+O69S3xYiT2VRde7VAgMBAAGjUDBOMB0GA1UdDgQWBBTdX5So6SB4K2IX59likNO8
+2/usIjAfBgNVHSMEGDAWgBTdX5So6SB4K2IX59likNO82/usIjAMBgNVHRMEBTAD
+AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBZs5MMUimtJQKXrNDbOYsXg6yTUhvRQPLj
+kv2M3cH/8lhqnYpU9C3X4FrVPbxx5SxqBBTw8SOUAZfEAlvN+OJC1efq03VQmH3A
+M/GqgwM4ztNUIz1kWgDdIEkUZBEJ2BBN4VP0xH1s0f1gKFMxqOE4BwPNmU7ZFD4O
+QM7qOcq58voRCohpfUeVG6V3BkpKyx/VHFaJpkucI1U/Gw4S/6Slp4qLJ6eHIbQB
+bBEuc7suv0QEIC2VgbkdQ1muEZJfGPaxTYn00BZCPgUG2ka7hgRmKzNDdGjRe8YT
+ICP6wM+pztMtIPWic53DejjEukR860nQx4/53saWj3RRjkuTouv2
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.poliba.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.poliba.it/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="it">Politecnico di Bari</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Politecnico di Bari</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="it">Politecnico di Bari</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Politecnico di Bari</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="it">http://www.poliba.it</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.poliba.it</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>mailto:idem-support@poliba.it</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:EmailAddress>mailto:luigi.gatto@poliba.it</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:EmailAddress>mailto:giuseppe.lucatorto@poliba.it</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml
index 9e2011bf..49f997f0 100644
--- a/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml
@@ -11,10 +11,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:DisplayName>
- <mdui:Description xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:Description>
- <mdui:Description xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:Description>
+ <mdui:DisplayName xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</mdui:DisplayName>
+ <mdui:Description xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</mdui:Description>
+ <mdui:Description xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.puc-campinas.edu.br/</mdui:InformationURL>
<mdui:InformationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</mdui:InformationURL>
</mdui:UIInfo>
@@ -100,10 +100,10 @@ myTHlotGeDZJUn6x2TGCGQiNVu09lXCJBGqp4ffJGRACkMxOMqtwYw==
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.puc-campinas.edu.br/</md:OrganizationURL>
<md:OrganizationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..7dee0674
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.reigate.ac.uk/idp/shibboleth">
+ <!--
+ This is a Shibboleth IdP for Reigate College.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-29T13:32:19Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reigate.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMDCCAhigAwIBAgIVAPBD4Ch8c1eFKJwVl1SVemY1lNWFMA0GCSqGSIb3DQEB
+ BQUAMBwxGjAYBgNVBAMMEWlkcC5yZWlnYXRlLmFjLnVrMB4XDTE1MDkwMzEyNDQz
+ NFoXDTM1MDkwMzEyNDQzNFowHDEaMBgGA1UEAwwRaWRwLnJlaWdhdGUuYWMudWsw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMM/KcdoK3m7gK8nwGwsfX
+ JaysjFdGnrj/SMrQJu8VTZ8Xw+SOegbBfi8TBuMSujixsjzHMYCUx4o3wmbGf9Oh
+ 8Cl9e0cwKiyjx/qOvG2iGJ3jVitx0UCkaBUhn7U7FXo9HfpO4WB3ag4Slnc1DazW
+ ckINoM0bWEKETOCIyEx6his4La5yaPHk0AknVj3xZUjkRF5N81pCy0O4T1Nb1ULS
+ U23rl1j+qczQXGXOp1nZuR9BBpG2K6NUF0A6AorvwSJPhTWLeK7YTbBvoT3DR+l0
+ QyXR4WoZ2jCtepZLXFyY7zJ3V+tAxnMx+rhJKJfRVKCFPvhOqNovDNUevC8JgiY3
+ AgMBAAGjaTBnMB0GA1UdDgQWBBSbm+055qnFRYimNDAt+YhvstqF1TBGBgNVHREE
+ PzA9ghFpZHAucmVpZ2F0ZS5hYy51a4YoaHR0cHM6Ly9pZHAucmVpZ2F0ZS5hYy51
+ ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAFF6DG0eNff8fase4
+ YF+Dub2nrJ717scQpdMPKaYZC0Y4EMKNTJnTaWsJ3aIBo1DxzydKlQi2RkZBqGZn
+ Qp1wqL6uHanv9VuquxdOj3hFItEssRi0uvISrSVDsu+9zaDA4W5FYKY+cOs+qAo1
+ gpqHPqswkE7RCXdWZ0NLKQrxEubAACrGDX9E5kbrlxTZAgHTzDd2UWR2E7kD9Bxt
+ 3KGq84XhTKd5VOEWf2NfewGDKssWEko673Kgt70inVCuEb9t1BMcv1PV2HNws8bR
+ zUyyzg1bGcmlKawqZ+Yoegt2JNa9yhAsUfvv909vTYw6Uw0LzzEmjZFMc40W3R9c
+ YrbmYw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reigate.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reigate.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMDCCAhigAwIBAgIVAPBD4Ch8c1eFKJwVl1SVemY1lNWFMA0GCSqGSIb3DQEB
+ BQUAMBwxGjAYBgNVBAMMEWlkcC5yZWlnYXRlLmFjLnVrMB4XDTE1MDkwMzEyNDQz
+ NFoXDTM1MDkwMzEyNDQzNFowHDEaMBgGA1UEAwwRaWRwLnJlaWdhdGUuYWMudWsw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMM/KcdoK3m7gK8nwGwsfX
+ JaysjFdGnrj/SMrQJu8VTZ8Xw+SOegbBfi8TBuMSujixsjzHMYCUx4o3wmbGf9Oh
+ 8Cl9e0cwKiyjx/qOvG2iGJ3jVitx0UCkaBUhn7U7FXo9HfpO4WB3ag4Slnc1DazW
+ ckINoM0bWEKETOCIyEx6his4La5yaPHk0AknVj3xZUjkRF5N81pCy0O4T1Nb1ULS
+ U23rl1j+qczQXGXOp1nZuR9BBpG2K6NUF0A6AorvwSJPhTWLeK7YTbBvoT3DR+l0
+ QyXR4WoZ2jCtepZLXFyY7zJ3V+tAxnMx+rhJKJfRVKCFPvhOqNovDNUevC8JgiY3
+ AgMBAAGjaTBnMB0GA1UdDgQWBBSbm+055qnFRYimNDAt+YhvstqF1TBGBgNVHREE
+ PzA9ghFpZHAucmVpZ2F0ZS5hYy51a4YoaHR0cHM6Ly9pZHAucmVpZ2F0ZS5hYy51
+ ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAFF6DG0eNff8fase4
+ YF+Dub2nrJ717scQpdMPKaYZC0Y4EMKNTJnTaWsJ3aIBo1DxzydKlQi2RkZBqGZn
+ Qp1wqL6uHanv9VuquxdOj3hFItEssRi0uvISrSVDsu+9zaDA4W5FYKY+cOs+qAo1
+ gpqHPqswkE7RCXdWZ0NLKQrxEubAACrGDX9E5kbrlxTZAgHTzDd2UWR2E7kD9Bxt
+ 3KGq84XhTKd5VOEWf2NfewGDKssWEko673Kgt70inVCuEb9t1BMcv1PV2HNws8bR
+ zUyyzg1bGcmlKawqZ+Yoegt2JNa9yhAsUfvv909vTYw6Uw0LzzEmjZFMc40W3R9c
+ YrbmYw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Reigate College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Reigate College</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.reigate.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Ash</GivenName>
+ <SurName>Farbrother</SurName>
+ <EmailAddress>mailto:ash.farbrother@reigate.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Michael</GivenName>
+ <SurName>Freeman</SurName>
+ <EmailAddress>mailto:Michael.Freeman@reigate.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml b/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
index da9bf60c..a0b79ae4 100644
--- a/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
+++ b/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
@@ -4,11 +4,6 @@
This is an OpenAthens LA IdP for Royal Holloway and Bedford New College.
-->
<Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-04T11:59:06Z"/>
</Extensions>
<IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
@@ -74,8 +69,8 @@
</IDPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Royal Holloway and Bedford New College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Royal Holloway OALA</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.rhul.ac.uk</OrganizationURL>
+ <OrganizationDisplayName xml:lang="en">Royal Holloway, University of London</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.rhul.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
<GivenName>Library Systems Team</GivenName>
diff --git a/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
index 4d232902..ae4f4604 100644
--- a/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
@@ -96,18 +96,18 @@ MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
<md:ContactPerson contactType="administrative">
<md:Company>Swedish Red Cross University College</md:Company>
<md:SurName>IT-support</md:SurName>
- <md:EmailAddress>servicedesk@rkh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
<md:TelephoneNumber>+46858751607/+46858751603</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Swedish Red Cross University College</md:Company>
<md:SurName>IT-support</md:SurName>
- <md:EmailAddress>servicedesk@rkh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
<md:TelephoneNumber>+46858751607</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Swedish Red Cross University College</md:Company>
<md:SurName>IT-Support Röda Korsets Högskola</md:SurName>
- <md:EmailAddress>servicedesk@rkh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml
new file mode 100644
index 00000000..125f4631
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rrz.uni-koeln.de/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-01-14T13:33:15Z">
+ <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>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Universität zu Köln</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Universität zu Köln</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity Provider der Universität zu Köln</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider der Universität zu Köln</mdui:Description>
+ <mdui:InformationURL xml:lang="de">http://www.uni-koeln.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.uni-koeln.de</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIF4zCCBMugAwIBAgIHGKTbqpe4RTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQG
+EwJERTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBL
+b2VsbjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFz
+dGVyQHVuaS1rb2Vsbi5kZTAeFw0xNDEyMDgwODE1MjJaFw0xOTA3MDkyMzU5MDBa
+MIGdMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEO
+MAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2VsbjEh
+MB8GA1UECxMYUmVnaW9uYWxlcyBSZWNoZW56ZW50cnVtMR0wGwYDVQQDExRpZHAu
+cnJ6LnVuaS1rb2Vsbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AM4GP8tW8SQQPobzRRLMaRvKlyhZJmRwur5W400GV3bRvwJ9RHSsw56ZWX+aV1LS
+tIl0MFmRWI1XtPL9s78mhu9GJGjzY9MDn0zTudD+p70bPuHF6T2dW8l/IgCvi0uJ
+7PlywN3vLAggJe+32tBJuHKhP2CihLRmwKXUdp+YSjHjKMoISMte8LLby4MURlkn
+cm3BP93/IJIvrO44vQ9UBwd2EppoSnzX2yWoqUxgttjXpSTSKii7bgiQohbng6bH
+pamdVckjMn3SHA6BV4qRJAnkKWPU9MsHiHCLamd+ZH/teZHdcoJaJCrhejsd3ySN
+OMOKdVsRdu9DpohKTwk4knECAwEAAaOCAkkwggJFME8GA1UdIARIMEYwEQYPKwYB
+BAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEE
+MA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUFDEeYjgdNwAgmGE/uXTa
+bsDZMOswHwYDVR0jBBgwFoAUKuqJ6w6y0CnF/vlMpXbct29PCbowHwYDVR0RBBgw
+FoIUaWRwLnJyei51bmkta29lbG4uZGUwgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1rb2Vsbi1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCB0wYIKwYBBQUHAQEEgcYwgcMwMwYIKwYBBQUHMAGGJ2h0
+dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBFBggrBgEFBQcw
+AoY5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29lbG4tY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0MEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L3VuaS1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
+BQADggEBAIJSLabefTcLzZXepN4KaX3bDpKOPtA2DPZxuntYuLdynZ0GVmZSx3QT
+p/xihO66ZtX2JVVAXvkutqVB1nZQea33zQ+lkIWdJskVQTV/gXFbSBrAHMptTWjJ
+zvadECdJ0MTveZ5ZENGQpEAPvAyk6nJcQICmYskrOQ5Ur9D8dRmtwhSiyMQ6G5Yi
+pHG5aE5lGbCixxFuLT0oor49sDQoVEGX2RSFk+2qpS3JaqhviVie2m0v+1BB7x4D
+NPX6heGTUiNU+OLZAssrrb9s21PeVetFPlc0p+MzE8s8IWTdsKMWkkqSHPkonE7+
+8FOfm4jYwW4p+TqXvGRe+NI3Z3INTLM=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rrz.uni-koeln.de/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIF4zCCBMugAwIBAgIHGKTbqpe4RTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQG
+EwJERTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBL
+b2VsbjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFz
+dGVyQHVuaS1rb2Vsbi5kZTAeFw0xNDEyMDgwODE1MjJaFw0xOTA3MDkyMzU5MDBa
+MIGdMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEO
+MAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2VsbjEh
+MB8GA1UECxMYUmVnaW9uYWxlcyBSZWNoZW56ZW50cnVtMR0wGwYDVQQDExRpZHAu
+cnJ6LnVuaS1rb2Vsbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AM4GP8tW8SQQPobzRRLMaRvKlyhZJmRwur5W400GV3bRvwJ9RHSsw56ZWX+aV1LS
+tIl0MFmRWI1XtPL9s78mhu9GJGjzY9MDn0zTudD+p70bPuHF6T2dW8l/IgCvi0uJ
+7PlywN3vLAggJe+32tBJuHKhP2CihLRmwKXUdp+YSjHjKMoISMte8LLby4MURlkn
+cm3BP93/IJIvrO44vQ9UBwd2EppoSnzX2yWoqUxgttjXpSTSKii7bgiQohbng6bH
+pamdVckjMn3SHA6BV4qRJAnkKWPU9MsHiHCLamd+ZH/teZHdcoJaJCrhejsd3ySN
+OMOKdVsRdu9DpohKTwk4knECAwEAAaOCAkkwggJFME8GA1UdIARIMEYwEQYPKwYB
+BAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEE
+MA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUFDEeYjgdNwAgmGE/uXTa
+bsDZMOswHwYDVR0jBBgwFoAUKuqJ6w6y0CnF/vlMpXbct29PCbowHwYDVR0RBBgw
+FoIUaWRwLnJyei51bmkta29lbG4uZGUwgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1rb2Vsbi1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCB0wYIKwYBBQUHAQEEgcYwgcMwMwYIKwYBBQUHMAGGJ2h0
+dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBFBggrBgEFBQcw
+AoY5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29lbG4tY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0MEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L3VuaS1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
+BQADggEBAIJSLabefTcLzZXepN4KaX3bDpKOPtA2DPZxuntYuLdynZ0GVmZSx3QT
+p/xihO66ZtX2JVVAXvkutqVB1nZQea33zQ+lkIWdJskVQTV/gXFbSBrAHMptTWjJ
+zvadECdJ0MTveZ5ZENGQpEAPvAyk6nJcQICmYskrOQ5Ur9D8dRmtwhSiyMQ6G5Yi
+pHG5aE5lGbCixxFuLT0oor49sDQoVEGX2RSFk+2qpS3JaqhviVie2m0v+1BB7x4D
+NPX6heGTUiNU+OLZAssrrb9s21PeVetFPlc0p+MzE8s8IWTdsKMWkkqSHPkonE7+
+8FOfm4jYwW4p+TqXvGRe+NI3Z3INTLM=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e36</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e36</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Universität zu Köln</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Cologne</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.uni-koeln.de</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.uni-koeln.de</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Beate</md:GivenName>
+ <md:SurName>Schlesiona</md:SurName>
+ <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Beate</md:GivenName>
+ <md:SurName>Schlesiona</md:SurName>
+ <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Beate</md:GivenName>
+ <md:SurName>Schlesiona</md:SurName>
+ <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..135e542d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sciencelib.ge/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://mtd.gif.grena.ge" registrationInstant="2015-09-28T10:04:42Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://gif.grena.ge/admin/editor/uploads/files/GIF%20Identity%20Federation%20Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">National Scientific Library - Georgia</mdui:DisplayName>
+ <mdui:Description xml:lang="en">National Scientific Library - Georgia</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://sciencelib.ge</mdui:InformationURL>
+ <mdui:Logo width="24" height="23" xml:lang="en">http://www.sciencelib.ge/themes/pushbutton/icon-block.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>217.147.239.76/32</mdui:IPHint>
+ <mdui:DomainHint>idp.sciencelib.ge</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:41.704855,44.787059</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDzTCCArWgAwIBAgIJAOZZxvcv0ZIWMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV
+BAYTAkdFMRAwDgYDVQQIDAdHZW9yZ2lhMRAwDgYDVQQHDAdUYmlsaXNpMS4wLAYD
+VQQKDCVOYXRpb25hbCBTY2llbnRpZmljIExpYnJhcnkgLSBHZW9yZ2lhMRowGAYD
+VQQDDBFpZGYuc2NpZW5jZWxpYi5nZTAeFw0xNTA0MDIxMDM4MTdaFw0yNTA0MDEx
+MDM4MTdaMH0xCzAJBgNVBAYTAkdFMRAwDgYDVQQIDAdHZW9yZ2lhMRAwDgYDVQQH
+DAdUYmlsaXNpMS4wLAYDVQQKDCVOYXRpb25hbCBTY2llbnRpZmljIExpYnJhcnkg
+LSBHZW9yZ2lhMRowGAYDVQQDDBFpZGYuc2NpZW5jZWxpYi5nZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMWUJDOKSpsekasjeobbgvmo/92fLZpLX7q1
+DV2A24ZDhz7hPZU3PgYpnOlS5vpkaaQPcj5L9cSBYgYt+5RMfdbvPRysPxLTiAOO
+AXDdXPLiS+IuV1cBjTzbi0nvt3Fr4JZOqA7GUxkPsupUSd0GAiRzpzORiAS1h7/4
+FN/K2rqSIoUye7/0yLCK8RK9j8N6mvoZ89A1R/KAz1f5NfVCI0y5PfRtlS+g08Go
+C3B07Ho88xeDcydzUBCCKSvsVHVdkongMVxwHXiW+R2v/C7lVs2kJ8Xd2Yq+i0Zb
+qH1gfsWL2frgRhGBK/MQKhj5gsiBQCT+fu1KcMaiUnF7frWHERECAwEAAaNQME4w
+HQYDVR0OBBYEFMiIYakxQtDaRaaspEYY3JZMRMKVMB8GA1UdIwQYMBaAFMiIYakx
+QtDaRaaspEYY3JZMRMKVMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
+AKyA+1FhcUjWH9hwN6Jpn9RvE2dnrcwLdQelrmnRXLkFv7z3LYxWiFo3LHePmKKl
+yDnief9e48CDh48Lq6hssK+/Ipw1BLCMGwvDJL4aeswK2uGRdyf4fZEZrE7Jc+Gg
+cHKt7iwCC5aboQTaPX/owxHaCs19p+qsN5zuuW8xq/U2hICWRaMbyEH+G9KhqD47
+ea8/gyK/sFRzez2C8GECAN9DKX9//TJZyVFXKW0NdfvVx69mk4BYE6eycI3fAtIx
+3odqTMpbrMsVQkrJlVSj2dBrvkbnZ+ih1X/QV3T1f8/kiqOQuuGAFuvcl51JsyEH
+W/y6xadzVAo5iK7XtTnwSy0=
+</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>
+MIIDzTCCArWgAwIBAgIJAOZZxvcv0ZIWMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV
+BAYTAkdFMRAwDgYDVQQIDAdHZW9yZ2lhMRAwDgYDVQQHDAdUYmlsaXNpMS4wLAYD
+VQQKDCVOYXRpb25hbCBTY2llbnRpZmljIExpYnJhcnkgLSBHZW9yZ2lhMRowGAYD
+VQQDDBFpZGYuc2NpZW5jZWxpYi5nZTAeFw0xNTA0MDIxMDM4MTdaFw0yNTA0MDEx
+MDM4MTdaMH0xCzAJBgNVBAYTAkdFMRAwDgYDVQQIDAdHZW9yZ2lhMRAwDgYDVQQH
+DAdUYmlsaXNpMS4wLAYDVQQKDCVOYXRpb25hbCBTY2llbnRpZmljIExpYnJhcnkg
+LSBHZW9yZ2lhMRowGAYDVQQDDBFpZGYuc2NpZW5jZWxpYi5nZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMWUJDOKSpsekasjeobbgvmo/92fLZpLX7q1
+DV2A24ZDhz7hPZU3PgYpnOlS5vpkaaQPcj5L9cSBYgYt+5RMfdbvPRysPxLTiAOO
+AXDdXPLiS+IuV1cBjTzbi0nvt3Fr4JZOqA7GUxkPsupUSd0GAiRzpzORiAS1h7/4
+FN/K2rqSIoUye7/0yLCK8RK9j8N6mvoZ89A1R/KAz1f5NfVCI0y5PfRtlS+g08Go
+C3B07Ho88xeDcydzUBCCKSvsVHVdkongMVxwHXiW+R2v/C7lVs2kJ8Xd2Yq+i0Zb
+qH1gfsWL2frgRhGBK/MQKhj5gsiBQCT+fu1KcMaiUnF7frWHERECAwEAAaNQME4w
+HQYDVR0OBBYEFMiIYakxQtDaRaaspEYY3JZMRMKVMB8GA1UdIwQYMBaAFMiIYakx
+QtDaRaaspEYY3JZMRMKVMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
+AKyA+1FhcUjWH9hwN6Jpn9RvE2dnrcwLdQelrmnRXLkFv7z3LYxWiFo3LHePmKKl
+yDnief9e48CDh48Lq6hssK+/Ipw1BLCMGwvDJL4aeswK2uGRdyf4fZEZrE7Jc+Gg
+cHKt7iwCC5aboQTaPX/owxHaCs19p+qsN5zuuW8xq/U2hICWRaMbyEH+G9KhqD47
+ea8/gyK/sFRzez2C8GECAN9DKX9//TJZyVFXKW0NdfvVx69mk4BYE6eycI3fAtIx
+3odqTMpbrMsVQkrJlVSj2dBrvkbnZ+ih1X/QV3T1f8/kiqOQuuGAFuvcl51JsyEH
+W/y6xadzVAo5iK7XtTnwSy0=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencelib.ge/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencelib.ge/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">National Scientific Library - Georgia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">National Scientific Library - Georgia</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://sciencelib.ge/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Temur</md:GivenName>
+ <md:SurName>Maisuradze</md:SurName>
+ <md:EmailAddress>mailto:sysadmin@grena.ge</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml
index bcc8c1a3..e02aaf61 100644
--- a/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml
@@ -125,6 +125,6 @@ SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
<md:ContactPerson contactType="technical">
<md:Company>SICS</md:Company>
<md:SurName>CRIT</md:SurName>
- <md:EmailAddress>crit@sics.se</md:EmailAddress>
+ <md:EmailAddress>mailto:crit@sics.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml
index 74b51875..5b50dd41 100644
--- a/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sissa.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sissa.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-03T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">
diff --git a/swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..764aab2e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.southdowns.ac.uk/idp/shibboleth">
+ <!--
+ This is a Shibboleth IdP for South Downs College.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-13T13:31:27Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southdowns.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDOzCCAiOgAwIBAgIUYHmDs/az55KjV5rkUaoUYXIIy5owDQYJKoZIhvcNAQEL
+ BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
+ MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
+ Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJD2qQHKuCscG5oq
+ aOy3Fk3iOe6VlPoPYZfYzhIAZmNR5ZBkU4Ivn7nmV8GcrD1Swh8Y5vdC/IeUPefA
+ eexh0zp0sjEmK36ozU8z7dcvflkr9P4tCBzD8zDyYq26W0FCM7iDl7RTwWGga+k3
+ YVPuDV7c7hL7yA3d+MR1SFtFK1MH6/0tvadbek+m/Qk+GkD8mPjH+jK1O9tUNXz2
+ cf46+FyorWljKa1zy4jQI+J2adR2lPbNf0msKOQIlXEtpodYfCFEs2O5xFZWKuHS
+ t2z9yrYU8APNFD+hjH1sfup8aIXcDVWlvJ928/y5KFi3M6uk/0jVmTwuATeSst4l
+ KWNTS00CAwEAAaNvMG0wHQYDVR0OBBYEFPh/uaK4fAtwKtAOrt+RDl7ZghQgMEwG
+ A1UdEQRFMEOCFGlkcC5zb3V0aGRvd25zLmFjLnVrhitodHRwczovL2lkcC5zb3V0
+ aGRvd25zLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCA
+ dpBM3g3j7BgrhWzrMN22MStrlD4k19CS0axy4gIhdkfnyM3KJ0gofW8OxVVDYrnJ
+ K7723AtHhcuyXxCOFqfO151phc+6p9YLC2GkxUmatndDCsTnEXkF3/CDQZs/PzcS
+ NGwhfIh7t3Htdj6kAHsWirJKjBST+TJ458UrAIPr3QvbnUZqoUH/J245LuzmAPpj
+ Cf/SgnqzGpDvH+LlNRYGtz6gg3iCy3+CL0NONVGPoNAbmqFs6/f1zKiJ+spWNFqF
+ HqIoomwHimq/YI3YLG1lctf7bmH/fyvG/pZkVBA8FVr3Ex8HKiiRep67LUeei/uw
+ sgqZQgD6qpDN/0gCtjl6
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPDCCAiSgAwIBAgIVAMFezK1HZGgJj+eQYT5V8m5r7asnMA0GCSqGSIb3DQEB
+ CwUAMB8xHTAbBgNVBAMMFGlkcC5zb3V0aGRvd25zLmFjLnVrMB4XDTE1MDkwMjEz
+ MTEyMloXDTM1MDkwMjEzMTEyMlowHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMu
+ YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCP9UwG634cR5mg
+ xsLoemlVj6EEBrJLaUhvp0nn/HgiuqMwptBFaFk1qMHsVspY3Prbd+pv40af5r8+
+ pkzQWedbqwI96/J39qqk7/k37z+YflUM/t9iRhQR7NuxDnLr9JyWb5/qLY39SJ8G
+ gEvf5Seu4A15Yqn12CAOcFY/OW58p5tzPg5uUhcGV3TyvOAMgubWmdilCTz27ktR
+ PchfZJ2CAfOCSGom3j15K65dzDtj7yARIhSW1SGGkXtaPmBuM22Xlh7IIYHTYRVS
+ 5YT1heEV6kKvbMpE6Yrn5LXid5enO1lwQkfD6C4juvIZkoNipWhcI22KpLfC3MRM
+ A6bB1O2dAgMBAAGjbzBtMB0GA1UdDgQWBBTlWgwMVgaFSkCJJ8Bgs25O7/1uljBM
+ BgNVHREERTBDghRpZHAuc291dGhkb3ducy5hYy51a4YraHR0cHM6Ly9pZHAuc291
+ dGhkb3ducy5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+ QB0ChtEoGxbnbeuyALNd6XoTaATMDUq87IXWiX0vJhu+ZNB23AEMFrH3kNQJw++l
+ xwiYi3xzq4Dc6W/0s0d2S20TFoMXrkewqMmj1fqODX92iN/KbwMWdl9zFxar8Qvv
+ DRRV6e+Hvc3ZHlIWekv5RRE0R798yg37kQPFEc40NaiQadOx0twWDZIiY9mRhlXz
+ oNtXMYVjozF3Eg6QvJxuhrji5m7CnbT+j7yVxaOnJveRb2BShp7luHy8RbFW3Noj
+ sbbLV0dPkIADL7SSkQIOD1fBgIVeYQf60AF1FQwWi0rXxZNvZevsji8k+gjZ7YCK
+ wibNrb/diFicd5nzUvOpQQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDOzCCAiOgAwIBAgIUfNUZc3yh6hhcTZJFXiiWY/Nf9IMwDQYJKoZIhvcNAQEL
+ BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
+ MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
+ Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK19/5+rAkwXqY+x
+ MIrlRAzMtFYBMc9Xm6VZ683oVtzxh79oBrzordKVo05mvVk3aTci7wcypyZE5f14
+ xGK9dVEtFU+h0VgnmjuuSNxlX0SNi+bTc1UV2yEcMg+PpeAjzrr30Z4cao8+eCo7
+ gjBEqMxNN4bM5hugVl45BmsVAL/0EggVde6cei6ReJ+rn1DzAQhuQWpY3ifXhl+y
+ IL+t0qBmfV35bt1rYSSENR5uXYQsfwFv5euXD4h2OXXUp4ZLWh8/xHfdsLsA4+LP
+ wCpL/xEwOWBGmf/fId6D3rFQAVjZZT8N1GbsN8ttJQ/QRu1+UaZt0CAUEZkvO1FX
+ Xeehx/ECAwEAAaNvMG0wHQYDVR0OBBYEFORpT+vDj6KPgxh99vtPQ6pzPbwqMEwG
+ A1UdEQRFMEOCFGlkcC5zb3V0aGRvd25zLmFjLnVrhitodHRwczovL2lkcC5zb3V0
+ aGRvd25zLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAZ
+ JvxI37cM9qB7mOZ4wO8EHCOpkH23rAjaWT9SpswvOT4KlYzbiQ8l1Y9Fo/qozxjl
+ q23B+tT1S5awryrUJlFs0nWrXcbYLFsBv6v9jNEWCHjByoXkpxR08NrqSNAsRrDT
+ xFwcXNb85gHPgyCYysXm3lEAn3pUCNZv9mReE5fiIJE1OBswzpoR5DsehwLMcwX0
+ v+ptmvLy2QxF10v791+/GnHAzXThcvDLGCVkqcQdhDzF8+bcqSxyvWWKUoL91R1O
+ HyQKxKQl7wh7guZ9VrDhYt+LZvhNMy2yXVeyBDEJ/EbVTDGC9oCqS/g2JDDTaIVm
+ 1U1lZKF34YlBgsYQnovH
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdowns.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southdowns.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.southdowns.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southdowns.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDOzCCAiOgAwIBAgIUYHmDs/az55KjV5rkUaoUYXIIy5owDQYJKoZIhvcNAQEL
+ BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
+ MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
+ Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJD2qQHKuCscG5oq
+ aOy3Fk3iOe6VlPoPYZfYzhIAZmNR5ZBkU4Ivn7nmV8GcrD1Swh8Y5vdC/IeUPefA
+ eexh0zp0sjEmK36ozU8z7dcvflkr9P4tCBzD8zDyYq26W0FCM7iDl7RTwWGga+k3
+ YVPuDV7c7hL7yA3d+MR1SFtFK1MH6/0tvadbek+m/Qk+GkD8mPjH+jK1O9tUNXz2
+ cf46+FyorWljKa1zy4jQI+J2adR2lPbNf0msKOQIlXEtpodYfCFEs2O5xFZWKuHS
+ t2z9yrYU8APNFD+hjH1sfup8aIXcDVWlvJ928/y5KFi3M6uk/0jVmTwuATeSst4l
+ KWNTS00CAwEAAaNvMG0wHQYDVR0OBBYEFPh/uaK4fAtwKtAOrt+RDl7ZghQgMEwG
+ A1UdEQRFMEOCFGlkcC5zb3V0aGRvd25zLmFjLnVrhitodHRwczovL2lkcC5zb3V0
+ aGRvd25zLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCA
+ dpBM3g3j7BgrhWzrMN22MStrlD4k19CS0axy4gIhdkfnyM3KJ0gofW8OxVVDYrnJ
+ K7723AtHhcuyXxCOFqfO151phc+6p9YLC2GkxUmatndDCsTnEXkF3/CDQZs/PzcS
+ NGwhfIh7t3Htdj6kAHsWirJKjBST+TJ458UrAIPr3QvbnUZqoUH/J245LuzmAPpj
+ Cf/SgnqzGpDvH+LlNRYGtz6gg3iCy3+CL0NONVGPoNAbmqFs6/f1zKiJ+spWNFqF
+ HqIoomwHimq/YI3YLG1lctf7bmH/fyvG/pZkVBA8FVr3Ex8HKiiRep67LUeei/uw
+ sgqZQgD6qpDN/0gCtjl6
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPDCCAiSgAwIBAgIVAMFezK1HZGgJj+eQYT5V8m5r7asnMA0GCSqGSIb3DQEB
+ CwUAMB8xHTAbBgNVBAMMFGlkcC5zb3V0aGRvd25zLmFjLnVrMB4XDTE1MDkwMjEz
+ MTEyMloXDTM1MDkwMjEzMTEyMlowHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMu
+ YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCP9UwG634cR5mg
+ xsLoemlVj6EEBrJLaUhvp0nn/HgiuqMwptBFaFk1qMHsVspY3Prbd+pv40af5r8+
+ pkzQWedbqwI96/J39qqk7/k37z+YflUM/t9iRhQR7NuxDnLr9JyWb5/qLY39SJ8G
+ gEvf5Seu4A15Yqn12CAOcFY/OW58p5tzPg5uUhcGV3TyvOAMgubWmdilCTz27ktR
+ PchfZJ2CAfOCSGom3j15K65dzDtj7yARIhSW1SGGkXtaPmBuM22Xlh7IIYHTYRVS
+ 5YT1heEV6kKvbMpE6Yrn5LXid5enO1lwQkfD6C4juvIZkoNipWhcI22KpLfC3MRM
+ A6bB1O2dAgMBAAGjbzBtMB0GA1UdDgQWBBTlWgwMVgaFSkCJJ8Bgs25O7/1uljBM
+ BgNVHREERTBDghRpZHAuc291dGhkb3ducy5hYy51a4YraHR0cHM6Ly9pZHAuc291
+ dGhkb3ducy5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+ QB0ChtEoGxbnbeuyALNd6XoTaATMDUq87IXWiX0vJhu+ZNB23AEMFrH3kNQJw++l
+ xwiYi3xzq4Dc6W/0s0d2S20TFoMXrkewqMmj1fqODX92iN/KbwMWdl9zFxar8Qvv
+ DRRV6e+Hvc3ZHlIWekv5RRE0R798yg37kQPFEc40NaiQadOx0twWDZIiY9mRhlXz
+ oNtXMYVjozF3Eg6QvJxuhrji5m7CnbT+j7yVxaOnJveRb2BShp7luHy8RbFW3Noj
+ sbbLV0dPkIADL7SSkQIOD1fBgIVeYQf60AF1FQwWi0rXxZNvZevsji8k+gjZ7YCK
+ wibNrb/diFicd5nzUvOpQQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDOzCCAiOgAwIBAgIUfNUZc3yh6hhcTZJFXiiWY/Nf9IMwDQYJKoZIhvcNAQEL
+ BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
+ MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
+ Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK19/5+rAkwXqY+x
+ MIrlRAzMtFYBMc9Xm6VZ683oVtzxh79oBrzordKVo05mvVk3aTci7wcypyZE5f14
+ xGK9dVEtFU+h0VgnmjuuSNxlX0SNi+bTc1UV2yEcMg+PpeAjzrr30Z4cao8+eCo7
+ gjBEqMxNN4bM5hugVl45BmsVAL/0EggVde6cei6ReJ+rn1DzAQhuQWpY3ifXhl+y
+ IL+t0qBmfV35bt1rYSSENR5uXYQsfwFv5euXD4h2OXXUp4ZLWh8/xHfdsLsA4+LP
+ wCpL/xEwOWBGmf/fId6D3rFQAVjZZT8N1GbsN8ttJQ/QRu1+UaZt0CAUEZkvO1FX
+ Xeehx/ECAwEAAaNvMG0wHQYDVR0OBBYEFORpT+vDj6KPgxh99vtPQ6pzPbwqMEwG
+ A1UdEQRFMEOCFGlkcC5zb3V0aGRvd25zLmFjLnVrhitodHRwczovL2lkcC5zb3V0
+ aGRvd25zLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAZ
+ JvxI37cM9qB7mOZ4wO8EHCOpkH23rAjaWT9SpswvOT4KlYzbiQ8l1Y9Fo/qozxjl
+ q23B+tT1S5awryrUJlFs0nWrXcbYLFsBv6v9jNEWCHjByoXkpxR08NrqSNAsRrDT
+ xFwcXNb85gHPgyCYysXm3lEAn3pUCNZv9mReE5fiIJE1OBswzpoR5DsehwLMcwX0
+ v+ptmvLy2QxF10v791+/GnHAzXThcvDLGCVkqcQdhDzF8+bcqSxyvWWKUoL91R1O
+ HyQKxKQl7wh7guZ9VrDhYt+LZvhNMy2yXVeyBDEJ/EbVTDGC9oCqS/g2JDDTaIVm
+ 1U1lZKF34YlBgsYQnovH
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdowns.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">South Downs College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">South Downs College</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.southdowns.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Adam</GivenName>
+ <SurName>Ward</SurName>
+ <EmailAddress>mailto:adam.ward@migliori.co.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Simon</GivenName>
+ <SurName>Allison</SurName>
+ <EmailAddress>mailto:spallison@southdowns.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Simon</GivenName>
+ <SurName>Allison</SurName>
+ <EmailAddress>mailto:spallison@southdowns.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Neil</GivenName>
+ <SurName>Mcqueen</SurName>
+ <EmailAddress>mailto:nmcqueen@southdowns.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml
index 34edc89b..8ebfcf86 100644
--- a/swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml
@@ -10,36 +10,32 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southstaffs.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEwDCCA6igAwIBAgIRALJKliPNbteUqAijkUFzQTQwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjEwMDgwMDAwMDBaFw0xNTEwMDgyMzU5NTlaMIGUMQswCQYD
- VQQGEwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTERMA8GA1UEBxMIVGFtd29y
- dGgxJDAiBgNVBAoTG1NvdXRoIFN0YWZmb3Jkc2hpcmUgQ29sbGVnZTEUMBIGA1UE
- CxMLSVQgU2VydmljZXMxHjAcBgNVBAMTFWlkcC5zb3V0aHN0YWZmcy5hYy51azCC
- ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJP+IBzBZb3TiiORL3lHNl/
- 6JRlz/xlVvu6ueE4lE7xdyDs4SxwNduQCiET8iWd9RqOVYD08A++Rv4X75X+K6Tn
- IM7oobGiqkVQ2S7PbpvJJlrt/2DSgucSW3JjSbbquZEZcLbogVfPrSU3BAJ2LPeG
- kf4OvbEulR/+FefEXkBFjL/AfSqd/5aoQ/3Pq3q+WXbL0LdBMIuls46XfP5wXEBB
- mP88DdMU8pXXAkmhLCrq9ozjBI+R/CjNi8GY4ToqM5RW8LkeUCKzCwTqtK059q1T
- Rh+VLZ0K6SV3D+gNNNicUscHlkUE1bMqtq83u7g+GHqBc+Ji3CqTGB87BFZ6Px0C
- AwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
- A1UdDgQWBBSH1TMwXDntlWfyEgPjDvnMkM6p4zAOBgNVHQ8BAf8EBAMCBaAwDAYD
- VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
- BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
- LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
- NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
- Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAg
- BgNVHREEGTAXghVpZHAuc291dGhzdGFmZnMuYWMudWswDQYJKoZIhvcNAQEFBQAD
- ggEBAAjrXuZkhZQMctshF4uSoyIrMzGTEdaemSFJV4Gf/vpRcLY55yEH/tE/hHA0
- gbBB6qV8rBiDH2bLgEroYsN4VhDtqTkD7Wn1aX1HPSoYTyCH/oOVl4xmQu6Bf0i8
- RjUlIru/8feG7i1VNp8/Icd4GMx+Pcxeavsufsey6QJclcNS+PPhp+xEazwCTfEf
- QajKK2Jn2Jrj3KuZfxM0+gukA3GdHGuMYEl0KG3pVjUEHcpXSyQgtJD52Zazoytb
- 7Y52LTWOx3dAaWBu+k6bSZxN7hTo69YVYPWQxNJsQKVZhEKrbDD3Awm/0R8QgawB
- 8N28sIuGTGSYwFgY/vA7ccsef3A=
+ MIIEADCCAugCCQDq7fzogZjavTANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UEBhMC
+ R0IxFjAUBgNVBAgTDVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcTCFRhbXdvcnRoMSQw
+ IgYDVQQKExtTb3V0aCBTdGFmZm9yZHNoaXJlIENvbGxlZ2UxFDASBgNVBAsTC0lU
+ IFNlcnZpY2VzMR4wHAYDVQQDExVpZHAuc291dGhzdGFmZnMuYWMudWsxKzApBgkq
+ hkiG9w0BCQEWHGdhcnkuYm9vdGhAc291dGhzdGFmZnMuYWMudWswHhcNMTUxMDAx
+ MDgzMzQwWhcNMjUwOTI4MDgzMzQwWjCBwTELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
+ DVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcTCFRhbXdvcnRoMSQwIgYDVQQKExtTb3V0
+ aCBTdGFmZm9yZHNoaXJlIENvbGxlZ2UxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR4w
+ HAYDVQQDExVpZHAuc291dGhzdGFmZnMuYWMudWsxKzApBgkqhkiG9w0BCQEWHGdh
+ cnkuYm9vdGhAc291dGhzdGFmZnMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+ DwAwggEKAoIBAQDpAtyHcloEmBjnBzQxRdtiwfRNrvh+ByEyU/ztDHg4dLD8IbqX
+ AInffLFXEZu7WPLaHwzxx/qcbQY0CvTXSt5+ggzfgJAxw2GjzgC9GQ3ExCBFcA+n
+ gfQ7hmpizd21ik6NLAlG84fqGWgJuL/tRbfuIVQxTdImd/h4ryi0B1GjmF6/VFQI
+ SXNWPGVgiAgjLZTozAHkO/WjDXXhLQZYcqlKNHm89SJlfi+VF4TgYW2a98B89fET
+ dfWLkidV4KUUwDkv6FMHnqv7mfjJ9MoRU8mpfX8JDK0/lUozn0QLFQ3AO8OxrZoA
+ 6sewDKvIMhl56nqegL/l+kLSbYkaJ/bKGS4LAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ ggEBAAbies8SwJ46Nnck7OY9OAWV1WQqrVzgHFBjahn7Izt2keXy+VEW86mBA4Kg
+ a6QevrGHRbGgcKpZAXrnDj2z0UCQXqIUQbLEUubPYEVbbhf3QSHOWaJnYCwGnAhD
+ +XkBqp0BnwFsF51vO8SegX8S9YCsfA681W0fy7z3zkIwCQCfZHzpw7n1c4Q6KV4o
+ BRNn2y+oMFH3d+zhShhQAa+wS+byfkw7/7D+FpZqg/PViTgmhYSkJH0S+xZWqn/R
+ HGMSdGf19+/k58X3xxk+amHzW1QWkXJzWmjds5vuG/ni8EQyAnkV3Jx0+XblP4f6
+ fwNx1H4ChYP4eEBqGjsRQKkDWr0=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -57,36 +53,32 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southstaffs.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEwDCCA6igAwIBAgIRALJKliPNbteUqAijkUFzQTQwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjEwMDgwMDAwMDBaFw0xNTEwMDgyMzU5NTlaMIGUMQswCQYD
- VQQGEwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTERMA8GA1UEBxMIVGFtd29y
- dGgxJDAiBgNVBAoTG1NvdXRoIFN0YWZmb3Jkc2hpcmUgQ29sbGVnZTEUMBIGA1UE
- CxMLSVQgU2VydmljZXMxHjAcBgNVBAMTFWlkcC5zb3V0aHN0YWZmcy5hYy51azCC
- ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJP+IBzBZb3TiiORL3lHNl/
- 6JRlz/xlVvu6ueE4lE7xdyDs4SxwNduQCiET8iWd9RqOVYD08A++Rv4X75X+K6Tn
- IM7oobGiqkVQ2S7PbpvJJlrt/2DSgucSW3JjSbbquZEZcLbogVfPrSU3BAJ2LPeG
- kf4OvbEulR/+FefEXkBFjL/AfSqd/5aoQ/3Pq3q+WXbL0LdBMIuls46XfP5wXEBB
- mP88DdMU8pXXAkmhLCrq9ozjBI+R/CjNi8GY4ToqM5RW8LkeUCKzCwTqtK059q1T
- Rh+VLZ0K6SV3D+gNNNicUscHlkUE1bMqtq83u7g+GHqBc+Ji3CqTGB87BFZ6Px0C
- AwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
- A1UdDgQWBBSH1TMwXDntlWfyEgPjDvnMkM6p4zAOBgNVHQ8BAf8EBAMCBaAwDAYD
- VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
- BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
- LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
- NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
- Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAg
- BgNVHREEGTAXghVpZHAuc291dGhzdGFmZnMuYWMudWswDQYJKoZIhvcNAQEFBQAD
- ggEBAAjrXuZkhZQMctshF4uSoyIrMzGTEdaemSFJV4Gf/vpRcLY55yEH/tE/hHA0
- gbBB6qV8rBiDH2bLgEroYsN4VhDtqTkD7Wn1aX1HPSoYTyCH/oOVl4xmQu6Bf0i8
- RjUlIru/8feG7i1VNp8/Icd4GMx+Pcxeavsufsey6QJclcNS+PPhp+xEazwCTfEf
- QajKK2Jn2Jrj3KuZfxM0+gukA3GdHGuMYEl0KG3pVjUEHcpXSyQgtJD52Zazoytb
- 7Y52LTWOx3dAaWBu+k6bSZxN7hTo69YVYPWQxNJsQKVZhEKrbDD3Awm/0R8QgawB
- 8N28sIuGTGSYwFgY/vA7ccsef3A=
+ MIIEADCCAugCCQDq7fzogZjavTANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UEBhMC
+ R0IxFjAUBgNVBAgTDVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcTCFRhbXdvcnRoMSQw
+ IgYDVQQKExtTb3V0aCBTdGFmZm9yZHNoaXJlIENvbGxlZ2UxFDASBgNVBAsTC0lU
+ IFNlcnZpY2VzMR4wHAYDVQQDExVpZHAuc291dGhzdGFmZnMuYWMudWsxKzApBgkq
+ hkiG9w0BCQEWHGdhcnkuYm9vdGhAc291dGhzdGFmZnMuYWMudWswHhcNMTUxMDAx
+ MDgzMzQwWhcNMjUwOTI4MDgzMzQwWjCBwTELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
+ DVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcTCFRhbXdvcnRoMSQwIgYDVQQKExtTb3V0
+ aCBTdGFmZm9yZHNoaXJlIENvbGxlZ2UxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR4w
+ HAYDVQQDExVpZHAuc291dGhzdGFmZnMuYWMudWsxKzApBgkqhkiG9w0BCQEWHGdh
+ cnkuYm9vdGhAc291dGhzdGFmZnMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+ DwAwggEKAoIBAQDpAtyHcloEmBjnBzQxRdtiwfRNrvh+ByEyU/ztDHg4dLD8IbqX
+ AInffLFXEZu7WPLaHwzxx/qcbQY0CvTXSt5+ggzfgJAxw2GjzgC9GQ3ExCBFcA+n
+ gfQ7hmpizd21ik6NLAlG84fqGWgJuL/tRbfuIVQxTdImd/h4ryi0B1GjmF6/VFQI
+ SXNWPGVgiAgjLZTozAHkO/WjDXXhLQZYcqlKNHm89SJlfi+VF4TgYW2a98B89fET
+ dfWLkidV4KUUwDkv6FMHnqv7mfjJ9MoRU8mpfX8JDK0/lUozn0QLFQ3AO8OxrZoA
+ 6sewDKvIMhl56nqegL/l+kLSbYkaJ/bKGS4LAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ ggEBAAbies8SwJ46Nnck7OY9OAWV1WQqrVzgHFBjahn7Izt2keXy+VEW86mBA4Kg
+ a6QevrGHRbGgcKpZAXrnDj2z0UCQXqIUQbLEUubPYEVbbhf3QSHOWaJnYCwGnAhD
+ +XkBqp0BnwFsF51vO8SegX8S9YCsfA681W0fy7z3zkIwCQCfZHzpw7n1c4Q6KV4o
+ BRNn2y+oMFH3d+zhShhQAa+wS+byfkw7/7D+FpZqg/PViTgmhYSkJH0S+xZWqn/R
+ HGMSdGf19+/k58X3xxk+amHzW1QWkXJzWmjds5vuG/ni8EQyAnkV3Jx0+XblP4f6
+ fwNx1H4ChYP4eEBqGjsRQKkDWr0=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
index 12add602..0b3cf47b 100644
--- a/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sssup.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sssup.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-08T10:30:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml
index ee4a487a..845db5aa 100644
--- a/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml
@@ -88,13 +88,13 @@
<OrganizationURL xml:lang="en">http://www.st-davids-coll.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Mark</GivenName>
- <SurName>Puttick</SurName>
- <EmailAddress>mailto:mputtick@st-davids-coll.ac.uk</EmailAddress>
+ <GivenName>John</GivenName>
+ <SurName>Vinall</SurName>
+ <EmailAddress>mailto:jvinall@st-davids-coll.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Mark</GivenName>
- <SurName>Puttick</SurName>
- <EmailAddress>mailto:mputtick@st-davids-coll.ac.uk</EmailAddress>
+ <GivenName>John</GivenName>
+ <SurName>Vinall</SurName>
+ <EmailAddress>mailto:jvinall@st-davids-coll.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..b42eb795
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sthelens.ac.uk/idp/shibboleth">
+ <!--
+ This is a Shibboleth IdP for St Helens College.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-23T09:19:50Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sthelens.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMzCCAhugAwIBAgIUefeWPtobMsRj91ZcJr632XXNAJQwDQYJKoZIhvcNAQEL
+ BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc1
+ MloXDTM1MDcxMzA5MTc1MlowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs6UhCjiogNIMFgyXluRJ
+ LKskxjAUDlx7sUCweHPsYPxlz64zGSM8S7nRAG1yQzW0JA+RTyg//BOIASoX0T51
+ XT7slINVEGGJPFZVrs8ovl8czb1BSZn+vEbL4UkOQIs3VAszc6sjufq9dVbFJs/Q
+ zoESK85IN3k/IsCMnkwEe/q2pSU/UFcLxB+q0Ltjx0Eo2DyLb8gktYya8ITt4U6i
+ QD1ZCBr9AFUBIrM1AgZwWEsWr5u69h391Jz6AsT7hyjkwoDsXVdEXx/kCJ7gMmT8
+ Y478h8teBSXHzjifPClzoRok7jaoqIykU7IooAl0Lgs+MlYeIJyGu+8a4Vj9Q3Ww
+ FQIDAQABo2swaTAdBgNVHQ4EFgQU3tu/fpLFu35DC6bbe+H742hS/rQwSAYDVR0R
+ BEEwP4ISaWRwLnN0aGVsZW5zLmFjLnVrhilodHRwczovL2lkcC5zdGhlbGVucy5h
+ Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAfzGPK9GKQA75
+ cYh1YziFi6MZ1FhB7YGVpkKfKXQuvFnIZqHMXvrdYrWmIIARmolte2WCWGSCWh56
+ 2QXQONMn0AUATCeCoEZJ0JdxGv6OkEzjztQJYAuXqX2h6rpc8TQtb+kRXR6dMI6Z
+ 70cZXzTy6HEzg+ILvissEpqK3doTjFTaoYyTkF2gVsJL1uaQvSKfzJMzsmVbxc3l
+ SZF3c6J+ZVrldkCCLB33LtcpjeQ6wa7pwab7+B8Anp811A9ph7cZJf+CPh7nguem
+ Z6++KzCFtBpmip6fxXOxq+T9DCtObKuu/Zwj7ALaV2Anx3+1eV9xUXvPyKKowtio
+ xGWZquR2PA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMzCCAhugAwIBAgIUSnhx1xX6LnWWTI0VWAtszPKeSlQwDQYJKoZIhvcNAQEL
+ BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc0
+ OVoXDTM1MDcxMzA5MTc0OVowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVjoha+zFXc2AXRgz7AA
+ sm0b/jLeMcR0wIDjQJmYsa4sAtZHw++Kv5vnvFhsEMm5STxez54J66X9he0ahy/n
+ 4HUun4xOziqD32zxbE4FuJxU36zlxvsL/UTRLtNbI6iRy/+8zYBEVRP4Vxk8Vh4o
+ gGMJ+05Z7GtKZ+qaG8UCs8kBgl+Z9VrmvnXrS9ne+SpY4o6k6cevG4/QzjWgDV8L
+ F4g2Hh8WBeLRYwe5l5XGMKW2wGDkuYV0Wx8dAwxEm8koWkaxHPfk2aFLaLu40e0K
+ c0IfWaiRnZ0YGdHLA3MkhUZf/fH2i1AZM4eXrXZEpN3lWC0Pptgc/MyLm6mV+/gm
+ iQIDAQABo2swaTAdBgNVHQ4EFgQUy6N7cUuaZkXCHZUw5uNI8XFCrVkwSAYDVR0R
+ BEEwP4ISaWRwLnN0aGVsZW5zLmFjLnVrhilodHRwczovL2lkcC5zdGhlbGVucy5h
+ Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAmLvRi3/9nXFJ
+ rxiU7R4oZSEeCaWGAwmhvSkwJnXXcOnapmHA8NVwYxagpaAAUDkXclyVeWgXMEW7
+ 7fuLAhhvEH4M3fpzvkQpju9sumcFha9x+lGe88EP9DEC6qmjgrs+bnM25/WLisy4
+ 5GR1oUfqpoadlq3nhKZqwpDgI0xqGQPYvqIdeg4tBUC90zWMtbnB2RAebDq8G2jr
+ uyAVx30gTcaiBFmYnoijzUSR7erf4+EQrPh2Dv59Rm1MvuSMUwB/YSew/B4KTXBr
+ EKZxmfNDR/osPrE+Imy1pWidTkSoe23dKlk+nqKWedsYEr+HKMS5NSTUY9X4+ul1
+ XEMB4j98UA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDNDCCAhygAwIBAgIVANqZjdgjQDinPjHK15o/evwkJ47nMA0GCSqGSIb3DQEB
+ CwUAMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51azAeFw0xNTA3MTMwOTE3
+ NTBaFw0zNTA3MTMwOTE3NTBaMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51
+ azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIY0GyGm5/AZrki7cc+i
+ qDdg48NDv/ofknRve/WD177ZyQMl5ROYQT/jxtidivl2LyQ4cUf4/eDr/VXq7ln2
+ cEssI+idPbdY8oySivcwNyx/+HbOOUM9y1Z4Y1qzUXPVIw0ekksXcRW+zWR2hltg
+ wWfuflEZPMNeuI3hcLUsS8QxqTtgYxyiIYzZJj4hPz8eS/D0NA4UEyWGf4YbknJv
+ n2UwchnNOY09vvzo2+nM4qIGTcGeqazwH4tHRdBYhBWCCIsT5jjuqESSUgnX/Wws
+ L5xoGMNJ30g+hjd2zZOs4uBPPCpPvd+YT3o5CZO4usj8gZYXg5RY13ooN6ri6VEi
+ SV8CAwEAAaNrMGkwHQYDVR0OBBYEFOgfhUabmVfWGgzFcIxIqNM4dYBdMEgGA1Ud
+ EQRBMD+CEmlkcC5zdGhlbGVucy5hYy51a4YpaHR0cHM6Ly9pZHAuc3RoZWxlbnMu
+ YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAE+zg+HRMTto
+ oT4fq9cU7M+3evZeVlIdY3YMFhB9ltXmN6qjbjSucL+sZBssmTorx2RK+wjEyRmM
+ mXiOCXb3KezzLUyLxTSIjzOtDkF6epvzq1ObsIKcpLf+wx6+yWA/RyjyIvbDcDcZ
+ upZ9JDCBvv0U9Ml1JBCfEyIjW/7ssIaVh2PzxQs0uIAuCKL4IdwDwVd/2+/j1rgH
+ 4GESmz925rqMM5ZippAileHB6LMvDaX939Cx89mOpBy1GCE8Sf7RbQgdH46S3DID
+ gQv8K/szMt60cSeU+yWCjRT3tGsEOe+Upn041k4KHZUvg4pXtNe0ssienaJjd2bv
+ PIGItBCgWGc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sthelens.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sthelens.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sthelens.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sthelens.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMzCCAhugAwIBAgIUefeWPtobMsRj91ZcJr632XXNAJQwDQYJKoZIhvcNAQEL
+ BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc1
+ MloXDTM1MDcxMzA5MTc1MlowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs6UhCjiogNIMFgyXluRJ
+ LKskxjAUDlx7sUCweHPsYPxlz64zGSM8S7nRAG1yQzW0JA+RTyg//BOIASoX0T51
+ XT7slINVEGGJPFZVrs8ovl8czb1BSZn+vEbL4UkOQIs3VAszc6sjufq9dVbFJs/Q
+ zoESK85IN3k/IsCMnkwEe/q2pSU/UFcLxB+q0Ltjx0Eo2DyLb8gktYya8ITt4U6i
+ QD1ZCBr9AFUBIrM1AgZwWEsWr5u69h391Jz6AsT7hyjkwoDsXVdEXx/kCJ7gMmT8
+ Y478h8teBSXHzjifPClzoRok7jaoqIykU7IooAl0Lgs+MlYeIJyGu+8a4Vj9Q3Ww
+ FQIDAQABo2swaTAdBgNVHQ4EFgQU3tu/fpLFu35DC6bbe+H742hS/rQwSAYDVR0R
+ BEEwP4ISaWRwLnN0aGVsZW5zLmFjLnVrhilodHRwczovL2lkcC5zdGhlbGVucy5h
+ Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAfzGPK9GKQA75
+ cYh1YziFi6MZ1FhB7YGVpkKfKXQuvFnIZqHMXvrdYrWmIIARmolte2WCWGSCWh56
+ 2QXQONMn0AUATCeCoEZJ0JdxGv6OkEzjztQJYAuXqX2h6rpc8TQtb+kRXR6dMI6Z
+ 70cZXzTy6HEzg+ILvissEpqK3doTjFTaoYyTkF2gVsJL1uaQvSKfzJMzsmVbxc3l
+ SZF3c6J+ZVrldkCCLB33LtcpjeQ6wa7pwab7+B8Anp811A9ph7cZJf+CPh7nguem
+ Z6++KzCFtBpmip6fxXOxq+T9DCtObKuu/Zwj7ALaV2Anx3+1eV9xUXvPyKKowtio
+ xGWZquR2PA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMzCCAhugAwIBAgIUSnhx1xX6LnWWTI0VWAtszPKeSlQwDQYJKoZIhvcNAQEL
+ BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc0
+ OVoXDTM1MDcxMzA5MTc0OVowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVjoha+zFXc2AXRgz7AA
+ sm0b/jLeMcR0wIDjQJmYsa4sAtZHw++Kv5vnvFhsEMm5STxez54J66X9he0ahy/n
+ 4HUun4xOziqD32zxbE4FuJxU36zlxvsL/UTRLtNbI6iRy/+8zYBEVRP4Vxk8Vh4o
+ gGMJ+05Z7GtKZ+qaG8UCs8kBgl+Z9VrmvnXrS9ne+SpY4o6k6cevG4/QzjWgDV8L
+ F4g2Hh8WBeLRYwe5l5XGMKW2wGDkuYV0Wx8dAwxEm8koWkaxHPfk2aFLaLu40e0K
+ c0IfWaiRnZ0YGdHLA3MkhUZf/fH2i1AZM4eXrXZEpN3lWC0Pptgc/MyLm6mV+/gm
+ iQIDAQABo2swaTAdBgNVHQ4EFgQUy6N7cUuaZkXCHZUw5uNI8XFCrVkwSAYDVR0R
+ BEEwP4ISaWRwLnN0aGVsZW5zLmFjLnVrhilodHRwczovL2lkcC5zdGhlbGVucy5h
+ Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAmLvRi3/9nXFJ
+ rxiU7R4oZSEeCaWGAwmhvSkwJnXXcOnapmHA8NVwYxagpaAAUDkXclyVeWgXMEW7
+ 7fuLAhhvEH4M3fpzvkQpju9sumcFha9x+lGe88EP9DEC6qmjgrs+bnM25/WLisy4
+ 5GR1oUfqpoadlq3nhKZqwpDgI0xqGQPYvqIdeg4tBUC90zWMtbnB2RAebDq8G2jr
+ uyAVx30gTcaiBFmYnoijzUSR7erf4+EQrPh2Dv59Rm1MvuSMUwB/YSew/B4KTXBr
+ EKZxmfNDR/osPrE+Imy1pWidTkSoe23dKlk+nqKWedsYEr+HKMS5NSTUY9X4+ul1
+ XEMB4j98UA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDNDCCAhygAwIBAgIVANqZjdgjQDinPjHK15o/evwkJ47nMA0GCSqGSIb3DQEB
+ CwUAMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51azAeFw0xNTA3MTMwOTE3
+ NTBaFw0zNTA3MTMwOTE3NTBaMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51
+ azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIY0GyGm5/AZrki7cc+i
+ qDdg48NDv/ofknRve/WD177ZyQMl5ROYQT/jxtidivl2LyQ4cUf4/eDr/VXq7ln2
+ cEssI+idPbdY8oySivcwNyx/+HbOOUM9y1Z4Y1qzUXPVIw0ekksXcRW+zWR2hltg
+ wWfuflEZPMNeuI3hcLUsS8QxqTtgYxyiIYzZJj4hPz8eS/D0NA4UEyWGf4YbknJv
+ n2UwchnNOY09vvzo2+nM4qIGTcGeqazwH4tHRdBYhBWCCIsT5jjuqESSUgnX/Wws
+ L5xoGMNJ30g+hjd2zZOs4uBPPCpPvd+YT3o5CZO4usj8gZYXg5RY13ooN6ri6VEi
+ SV8CAwEAAaNrMGkwHQYDVR0OBBYEFOgfhUabmVfWGgzFcIxIqNM4dYBdMEgGA1Ud
+ EQRBMD+CEmlkcC5zdGhlbGVucy5hYy51a4YpaHR0cHM6Ly9pZHAuc3RoZWxlbnMu
+ YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAE+zg+HRMTto
+ oT4fq9cU7M+3evZeVlIdY3YMFhB9ltXmN6qjbjSucL+sZBssmTorx2RK+wjEyRmM
+ mXiOCXb3KezzLUyLxTSIjzOtDkF6epvzq1ObsIKcpLf+wx6+yWA/RyjyIvbDcDcZ
+ upZ9JDCBvv0U9Ml1JBCfEyIjW/7ssIaVh2PzxQs0uIAuCKL4IdwDwVd/2+/j1rgH
+ 4GESmz925rqMM5ZippAileHB6LMvDaX939Cx89mOpBy1GCE8Sf7RbQgdH46S3DID
+ gQv8K/szMt60cSeU+yWCjRT3tGsEOe+Upn041k4KHZUvg4pXtNe0ssienaJjd2bv
+ PIGItBCgWGc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sthelens.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">St Helens College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">St Helens College</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.sthelens.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Karl</GivenName>
+ <SurName>Brooker</SurName>
+ <EmailAddress>mailto:kbrooker@sthelens.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Karl</GivenName>
+ <SurName>Brooker</SurName>
+ <EmailAddress>mailto:kbrooker@sthelens.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml
index f6eecd2c..12f7a3c8 100644
--- a/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml
@@ -14,32 +14,24 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEvzCCA6egAwIBAgIRANDh4NBaUlUPQG3Mnm19TagwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMjAwMDAwMDBaFw0xNTExMjAyMzU5NTlaMIGLMQswCQYD
- VQQGEwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTEXMBUGA1UEBxMOU3Rva2Ug
- b24gVHJlbnQxHzAdBgNVBAoTFlN0b2tlLW9uLVRyZW50IENvbGxlZ2UxDDAKBgNV
- BAsTA0NTVDEcMBoGA1UEAxMTaWRwLnN0b2tlY29sbC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAMRaECmQMak69ZpErEdzkrg2IxPpFsupXASw
- f2/3v/SevSYTWKjnzAq6SkNnfCxgVlm5TbsFZAAYKoednwqQ2L+u/S12bFPO+mc1
- WLkoAHUkU6WAgksHsyHZbq/Lq/fEqJSqb4xBt1pN2wflz/dowPx9HquAFMfDczWm
- ilrnaEV8V45ZGpSWFRWr5NGIhrnuap9wntVXRWsgLm0SPvRwvYXRkS3w0N14yttE
- 8TBJQUmmq7E9s3APdrQq11LKLy5SdK9I5S/BwMwBAhV66YLWqlFt4LESJ3KTlQVe
- 2SW0N0sPim7V+hM81NpIV73lksTZi+Ne7MT50V47YMnwk0i55l0CAwEAAaOCAXAw
- ggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQj
- 0wSwI/Ftj8R+DjpdsbDwo+EgmzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
- ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsr
- BgEEAbIxAQICHTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2Ny
- bC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBf
- MDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
- TENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcw
- HgYDVR0RBBcwFYITaWRwLnN0b2tlY29sbC5hYy51azANBgkqhkiG9w0BAQUFAAOC
- AQEAMEsG+tjHyVtpdIvfCU9YBCLlFskPWGkyvL07Q+fwQ+viN+y2zL/UiCBvy0aU
- d3/EYoj3MLuzl9PdmqeihueHT6ym7Tq4fTrAKEFsntGtChEZQm00xcDBJZWSAwAP
- hNeQYbFKODh6kcRMMu0TTARl8AVHFzLzFT4EHKEIlN8VnVJChOre1P9EzGQ20HH5
- PvulQd2vLzbkFAyQefgLxSc9jUefuK9pW1z68iw9kgXZkzaHLHWFjIDSqNnYmQt3
- p0GPZCsdTp9XV9YdKrEVg70EZgNxXMy9sSiwEPVqiEoyyjIMX0F9b/cPB3wlf9pz
- sy93q4qkiKSfLJkJzcs0CXy01w==
+ MIIDODCCAiCgAwIBAgIVAOCqTm8BSRjHD01zcVqQKEU41GmFMA0GCSqGSIb3DQEB
+ BQUAMB4xHDAaBgNVBAMME2lkcC5zdG9rZWNvbGwuYWMudWswHhcNMTUxMTAyMTQz
+ MzQxWhcNMzUxMTAyMTQzMzQxWjAeMRwwGgYDVQQDDBNpZHAuc3Rva2Vjb2xsLmFj
+ LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoDVAaU0SopZtZfOk
+ ezqhgxVvoNXc8/sHwoXudaFpMuqDks8JwmeUIdYmEJMTDVe5dblO4bAl0w5XeIOB
+ 9mMpBeFBNuSICGQIzODFjl0iFua0tZ/Tj5rqhcnhixHze1imu6QR1msdqobnq9e5
+ m43/nGDrjTZ0XXt9LHo8AJKlgZwbzWC08UNTFoqezdKwo1LqD0hW8RP7V3FoZ7XU
+ y2bToftaFPlPiwYK0B91WidS1lLvo1ll21bMqqJOvkU78oCoachHt0U6colmje2t
+ 81Coi5E/1mVEKCHFYWwlD029Dx2PCGzXaDvD1lpY/yrny4VkACZIEz9ZnJdWRdzW
+ BibIYQIDAQABo20wazAdBgNVHQ4EFgQUcIQ4XgCf+qz/ulow1O31zDs9Mv4wSgYD
+ VR0RBEMwQYITaWRwLnN0b2tlY29sbC5hYy51a4YqaHR0cHM6Ly9pZHAuc3Rva2Vj
+ b2xsLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQAyAEw9
+ ukmynMc4xXxu44hcVBF6qgNxC14XKLBbou9Tn64ll47OJh+uKyluSgLfR7Q1WD1J
+ o1A6GltLT2FJoCZMKUhKogJ2m+Lntc5WH0hkTwAfNRxzCEtXuNR1q0DjH90MIn7G
+ X40/IaxIoqB9ykjRkzK0HAIuO1+Fwx5xDorY6OsHPWQHevIFNN7LMLwkFaQDGecE
+ JXPWN2dGcIHx9en8OVPkDYdx99gt1+6n+s7ghk8qSlazZCCFYoJryMAApnPj3FbY
+ KJyA0eEShvBL36YxCvQD5YPmoDI7hlQ4Erj+Ge8AR1ImHFCHh8h4hif1E7dXG0rS
+ codng9Xuyk8xt0/m
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -61,32 +53,24 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEvzCCA6egAwIBAgIRANDh4NBaUlUPQG3Mnm19TagwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMjAwMDAwMDBaFw0xNTExMjAyMzU5NTlaMIGLMQswCQYD
- VQQGEwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTEXMBUGA1UEBxMOU3Rva2Ug
- b24gVHJlbnQxHzAdBgNVBAoTFlN0b2tlLW9uLVRyZW50IENvbGxlZ2UxDDAKBgNV
- BAsTA0NTVDEcMBoGA1UEAxMTaWRwLnN0b2tlY29sbC5hYy51azCCASIwDQYJKoZI
- hvcNAQEBBQADggEPADCCAQoCggEBAMRaECmQMak69ZpErEdzkrg2IxPpFsupXASw
- f2/3v/SevSYTWKjnzAq6SkNnfCxgVlm5TbsFZAAYKoednwqQ2L+u/S12bFPO+mc1
- WLkoAHUkU6WAgksHsyHZbq/Lq/fEqJSqb4xBt1pN2wflz/dowPx9HquAFMfDczWm
- ilrnaEV8V45ZGpSWFRWr5NGIhrnuap9wntVXRWsgLm0SPvRwvYXRkS3w0N14yttE
- 8TBJQUmmq7E9s3APdrQq11LKLy5SdK9I5S/BwMwBAhV66YLWqlFt4LESJ3KTlQVe
- 2SW0N0sPim7V+hM81NpIV73lksTZi+Ne7MT50V47YMnwk0i55l0CAwEAAaOCAXAw
- ggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQj
- 0wSwI/Ftj8R+DjpdsbDwo+EgmzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
- ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsr
- BgEEAbIxAQICHTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2Ny
- bC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBf
- MDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
- TENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcw
- HgYDVR0RBBcwFYITaWRwLnN0b2tlY29sbC5hYy51azANBgkqhkiG9w0BAQUFAAOC
- AQEAMEsG+tjHyVtpdIvfCU9YBCLlFskPWGkyvL07Q+fwQ+viN+y2zL/UiCBvy0aU
- d3/EYoj3MLuzl9PdmqeihueHT6ym7Tq4fTrAKEFsntGtChEZQm00xcDBJZWSAwAP
- hNeQYbFKODh6kcRMMu0TTARl8AVHFzLzFT4EHKEIlN8VnVJChOre1P9EzGQ20HH5
- PvulQd2vLzbkFAyQefgLxSc9jUefuK9pW1z68iw9kgXZkzaHLHWFjIDSqNnYmQt3
- p0GPZCsdTp9XV9YdKrEVg70EZgNxXMy9sSiwEPVqiEoyyjIMX0F9b/cPB3wlf9pz
- sy93q4qkiKSfLJkJzcs0CXy01w==
+ MIIDODCCAiCgAwIBAgIVAOCqTm8BSRjHD01zcVqQKEU41GmFMA0GCSqGSIb3DQEB
+ BQUAMB4xHDAaBgNVBAMME2lkcC5zdG9rZWNvbGwuYWMudWswHhcNMTUxMTAyMTQz
+ MzQxWhcNMzUxMTAyMTQzMzQxWjAeMRwwGgYDVQQDDBNpZHAuc3Rva2Vjb2xsLmFj
+ LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoDVAaU0SopZtZfOk
+ ezqhgxVvoNXc8/sHwoXudaFpMuqDks8JwmeUIdYmEJMTDVe5dblO4bAl0w5XeIOB
+ 9mMpBeFBNuSICGQIzODFjl0iFua0tZ/Tj5rqhcnhixHze1imu6QR1msdqobnq9e5
+ m43/nGDrjTZ0XXt9LHo8AJKlgZwbzWC08UNTFoqezdKwo1LqD0hW8RP7V3FoZ7XU
+ y2bToftaFPlPiwYK0B91WidS1lLvo1ll21bMqqJOvkU78oCoachHt0U6colmje2t
+ 81Coi5E/1mVEKCHFYWwlD029Dx2PCGzXaDvD1lpY/yrny4VkACZIEz9ZnJdWRdzW
+ BibIYQIDAQABo20wazAdBgNVHQ4EFgQUcIQ4XgCf+qz/ulow1O31zDs9Mv4wSgYD
+ VR0RBEMwQYITaWRwLnN0b2tlY29sbC5hYy51a4YqaHR0cHM6Ly9pZHAuc3Rva2Vj
+ b2xsLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQAyAEw9
+ ukmynMc4xXxu44hcVBF6qgNxC14XKLBbou9Tn64ll47OJh+uKyluSgLfR7Q1WD1J
+ o1A6GltLT2FJoCZMKUhKogJ2m+Lntc5WH0hkTwAfNRxzCEtXuNR1q0DjH90MIn7G
+ X40/IaxIoqB9ykjRkzK0HAIuO1+Fwx5xDorY6OsHPWQHevIFNN7LMLwkFaQDGecE
+ JXPWN2dGcIHx9en8OVPkDYdx99gt1+6n+s7ghk8qSlazZCCFYoJryMAApnPj3FbY
+ KJyA0eEShvBL36YxCvQD5YPmoDI7hlQ4Erj+Ge8AR1ImHFCHh8h4hif1E7dXG0rS
+ codng9Xuyk8xt0/m
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml
index 46af488d..c5b263c2 100644
--- a/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml
@@ -97,19 +97,19 @@ nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
<md:ContactPerson contactType="administrative">
<md:Company>Blekinge Institute of Technology - Students</md:Company>
<md:SurName>IT Help Desk</md:SurName>
- <md:EmailAddress>ithelpdesk@bth.se</md:EmailAddress>
+ <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
<md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Blekinge Institute of Technology - Students</md:Company>
<md:SurName>IT Help Desk</md:SurName>
- <md:EmailAddress>ithelpdesk@bth.se</md:EmailAddress>
+ <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
<md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Blekinge Institute of Technology - Students</md:Company>
<md:SurName>IT Help Desk</md:SurName>
- <md:EmailAddress>ithelpdesk@bth.se</md:EmailAddress>
+ <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
<md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml b/swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml
index 373e5c47..b39a35af 100644
--- a/swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml
@@ -70,7 +70,7 @@
<md:ContactPerson contactType="support">
<md:GivenName>Tomas</md:GivenName>
<md:SurName>Legat</md:SurName>
- <md:EmailAddress>server@sh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
<md:TelephoneNumber>+46(0)86084000</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.surfnet.nl.xml b/swamid-interfederations-2.0/idp.surfnet.nl.xml
index f56d173f..0a65f8b2 100644
--- a/swamid-interfederations-2.0/idp.surfnet.nl.xml
+++ b/swamid-interfederations-2.0/idp.surfnet.nl.xml
@@ -13,9 +13,9 @@
<mdui:DisplayName xml:lang="en">SURFnet bv</mdui:DisplayName>
<mdui:Description xml:lang="nl">SURFnet bv</mdui:Description>
<mdui:Description xml:lang="en">SURFnet bv</mdui:Description>
- <mdui:Logo height="44" width="108">https://static.surfconext.nl/media/idp/surfnet.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">SURFnet bv SURF konijn surf surfnet powered by</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">SURFnet bv SURF konijn powered by</mdui:Keywords>
+ <mdui:Logo height="44" width="108">https://static.surfconext.nl/logos/idp/surfnet.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">HAAS SURFnet bv SURF konijn surf surfnet powered by</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">HAAS SURFnet bv SURF konijn powered by</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..4c565f6c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teikav.edu.gr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teikav.edu.gr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Technological Educational Institute of Eastern Macedonia and Thrace</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.teiemt.gr/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="el">http://www.teiemt.gr/</mdui:InformationURL>
+ <mdui:Logo width="83" height="83">https://idp.teikav.edu.gr/logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>195.130.92.0/23</mdui:IPHint>
+ <mdui:IPHint>195.130.94.0/24</mdui:IPHint>
+ <mdui:IPHint>83.212.92.0/23</mdui:IPHint>
+ <mdui:IPHint>83.212.94.0/24</mdui:IPHint>
+ <mdui:DomainHint>noc.teiemt.gr</mdui:DomainHint>
+ <mdui:DomainHint>teiemt.gr</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:40.9286958,24.3794714,137</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEbzCCA1egAwIBAgIQFNuyHJki9S+B7LCfm+TiGDANBgkqhkiG9w0BAQUFADA2
+ MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+ U1NMIENBMB4XDTEzMDYyNjAwMDAwMFoXDTE2MDYyNTIzNTk1OVowPzEhMB8GA1UE
+ CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAudGVpa2F2
+ LmVkdS5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+MrpJsmJnM
+ T063+RAOnzCcXQ9r5wHym1ZtKoB3FKp2tod++p7YTPk9MoySyffsV0ongHfluMVA
+ GD2V+TbsbO177yM4t1WIpiuxKT5WlEN+kDkkM5qkYSN+FxD8GH1V2mA/oDf//bDv
+ EEhRM1Qz3OjMe+Tjt023IETpHQieB3uSiE4vRRro2togvwglTahkNg7Bl4ND7kwu
+ BXkSsEkshJhZ7hu9zYOX1/fmVA3HCY5MQVm/A8hPoi0vPPU0M75Nrr/gcjayUHCI
+ bXG2Ihx2dNt6bHIH24JQJQ8NXHJ753oGSX/3/R/umw1fC82cU09ZyXCUh7qU58aQ
+ AEtoy3zTmUMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+ R+qQ47ntMB0GA1UdDgQWBBTdMGbpA6aMekTpX31WvVX+SYiogzAOBgNVHQ8BAf8E
+ BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+ AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+ MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+ cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+ c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLnRlaWthdi5lZHUuZ3Iw
+ DQYJKoZIhvcNAQEFBQADggEBADMm0AmxzrM7mkGHavjT+huoHYy+y+eyOb9/WZ+M
+ vVoolVQZsbh0AhYBAtDXUg+jJzTIQDZeNg63HqmXJ8uK8If9pjsb6iFUsRYvSGAF
+ IzcnI11OfTlsEuFGpO1MxBAIlGq2/CtJPy/1Zi2LnK3Ci2kdjCyv5dTbICxa7iuW
+ XVFBPXrWGtod3YGSwe0qBRCGxAhFX0ea6zM/r6rA4yPFlQkC9UUaN1ITZJyTbXAB
+ 9Gd9S8+S7i0jUNHK6iGX9EvV5VmjpzMY6/vdhoGpc+xuC0bX1Gjsml4HmcIrq25p
+ VkLGD8nhv01wEmNMTmDawlDlIxUq3l/cK/GuJL/8lVGLOjk=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teikav.edu.gr/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teikav.edu.gr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teikav.edu.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teikav.edu.gr/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teikav.edu.gr</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEbzCCA1egAwIBAgIQFNuyHJki9S+B7LCfm+TiGDANBgkqhkiG9w0BAQUFADA2
+ MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+ U1NMIENBMB4XDTEzMDYyNjAwMDAwMFoXDTE2MDYyNTIzNTk1OVowPzEhMB8GA1UE
+ CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAudGVpa2F2
+ LmVkdS5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+MrpJsmJnM
+ T063+RAOnzCcXQ9r5wHym1ZtKoB3FKp2tod++p7YTPk9MoySyffsV0ongHfluMVA
+ GD2V+TbsbO177yM4t1WIpiuxKT5WlEN+kDkkM5qkYSN+FxD8GH1V2mA/oDf//bDv
+ EEhRM1Qz3OjMe+Tjt023IETpHQieB3uSiE4vRRro2togvwglTahkNg7Bl4ND7kwu
+ BXkSsEkshJhZ7hu9zYOX1/fmVA3HCY5MQVm/A8hPoi0vPPU0M75Nrr/gcjayUHCI
+ bXG2Ihx2dNt6bHIH24JQJQ8NXHJ753oGSX/3/R/umw1fC82cU09ZyXCUh7qU58aQ
+ AEtoy3zTmUMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+ R+qQ47ntMB0GA1UdDgQWBBTdMGbpA6aMekTpX31WvVX+SYiogzAOBgNVHQ8BAf8E
+ BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+ AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+ MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+ cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+ c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLnRlaWthdi5lZHUuZ3Iw
+ DQYJKoZIhvcNAQEFBQADggEBADMm0AmxzrM7mkGHavjT+huoHYy+y+eyOb9/WZ+M
+ vVoolVQZsbh0AhYBAtDXUg+jJzTIQDZeNg63HqmXJ8uK8If9pjsb6iFUsRYvSGAF
+ IzcnI11OfTlsEuFGpO1MxBAIlGq2/CtJPy/1Zi2LnK3Ci2kdjCyv5dTbICxa7iuW
+ XVFBPXrWGtod3YGSwe0qBRCGxAhFX0ea6zM/r6rA4yPFlQkC9UUaN1ITZJyTbXAB
+ 9Gd9S8+S7i0jUNHK6iGX9EvV5VmjpzMY6/vdhoGpc+xuC0bX1Gjsml4HmcIrq25p
+ VkLGD8nhv01wEmNMTmDawlDlIxUq3l/cK/GuJL/8lVGLOjk=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Eastern Macedonia and Thrace Institute of Technology</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Eastern Macedonia and Thrace Institute of Technology</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.teikav.edu.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.teikav.edu.gr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Kalliopi</md:GivenName>
+ <md:SurName>Sotiropoulou</md:SurName>
+ <md:EmailAddress>lsotir@teikav.edu.gr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..13ee7cf7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teilam.gr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teilam.gr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Technological Educational Institute of Sterea Ellada</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.teiste.gr/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="el">http://www.teiste.gr/</mdui:InformationURL>
+ <mdui:Logo width="83" height="81">https://idp.teilam.gr/logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>195.130.78.0/23</mdui:IPHint>
+ <mdui:IPHint>195.251.56.0/23</mdui:IPHint>
+ <mdui:IPHint>2001:648:2570::/48</mdui:IPHint>
+ <mdui:DomainHint>teiste.gr</mdui:DomainHint>
+ <mdui:DomainHint>teilam.gr</mdui:DomainHint>
+ <mdui:GeolocationHint>38.875331,22.437969</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEaDCCA1CgAwIBAgIRAM3kgGW3woyn1JTbV2Kj1uAwDQYJKoZIhvcNAQEFBQAw
+ NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+ IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
+ BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwLnRlaWxh
+ bS5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZFyBpYTsWDkUUQ
+ Kuqp9ESv5FZYQ+aXXwddYURdyUARFbtXz8U8BZ1Bxcu+q1Vkn/A8lmawcf0hcnZ1
+ nG2asfAqPxz43aupumdRbSZk+uRqX4/em8CYYv8bXFptyh1DFAjREMKqMIa5e0Kn
+ yWVN3i1NUkKb8Q4BBAIbxHsSn80Sdx34FWoIH7OA3CvXYFHASwj1F1/5Bi+Ecsuy
+ bww1azBHhyw6NvKp8YuD4WRuVBv7BUOTFpCknxSqGZSl7onl5oAayaTKtH+d53fH
+ 7tOen/+46nIdqOIfzCRDOVrL+th6pzzYj0vVXwfaQOzSEB77HipXxFTl1zDPL81a
+ pVbXHTsCAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+ 47ntMB0GA1UdDgQWBBSBsjPtVPWhSZDYuX2kInyu0VMwJzAOBgNVHQ8BAf8EBAMC
+ BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+ IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+ oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+ bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+ bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+ dGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwLnRlaWxhbS5ncjANBgkqhkiG
+ 9w0BAQUFAAOCAQEAEPn8HHF3R/o0k+FjUYwCrOf50iJEydvl9yYI/zgF6eSJiBmy
+ J0sEhm7ke1c8fbDSJrF4lQgAyIKFbl06LfzNy3vuJmbnx2xdXgApjQGRwVqKLi0E
+ /Z1Dvpk4ALukbqb1b9VopNUOSObyKYxfxuMWBhNman0gYYMvAr5D9Xt/FoWQDLho
+ QreibK7c9mYgSjC7LS1yTbk/6z1XNk3KE37NlxxZWLHUTUI3Ta2GXLWKnhSCXTcf
+ h2BHO2FTwpCucZsAUoUqGjDZ68PnCCaBghHeF5BfI/gAZI9lXpv7Ge0C8JZc8HSV
+ TviBthB5PYt5hjK8thpyYqZSKFUJF8iCqZqO2g==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teilam.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teilam.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teilam.gr/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teilam.gr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teilam.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teilam.gr/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teilam.gr</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEaDCCA1CgAwIBAgIRAM3kgGW3woyn1JTbV2Kj1uAwDQYJKoZIhvcNAQEFBQAw
+ NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+ IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
+ BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwLnRlaWxh
+ bS5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZFyBpYTsWDkUUQ
+ Kuqp9ESv5FZYQ+aXXwddYURdyUARFbtXz8U8BZ1Bxcu+q1Vkn/A8lmawcf0hcnZ1
+ nG2asfAqPxz43aupumdRbSZk+uRqX4/em8CYYv8bXFptyh1DFAjREMKqMIa5e0Kn
+ yWVN3i1NUkKb8Q4BBAIbxHsSn80Sdx34FWoIH7OA3CvXYFHASwj1F1/5Bi+Ecsuy
+ bww1azBHhyw6NvKp8YuD4WRuVBv7BUOTFpCknxSqGZSl7onl5oAayaTKtH+d53fH
+ 7tOen/+46nIdqOIfzCRDOVrL+th6pzzYj0vVXwfaQOzSEB77HipXxFTl1zDPL81a
+ pVbXHTsCAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+ 47ntMB0GA1UdDgQWBBSBsjPtVPWhSZDYuX2kInyu0VMwJzAOBgNVHQ8BAf8EBAMC
+ BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+ IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+ oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+ bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+ bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+ dGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwLnRlaWxhbS5ncjANBgkqhkiG
+ 9w0BAQUFAAOCAQEAEPn8HHF3R/o0k+FjUYwCrOf50iJEydvl9yYI/zgF6eSJiBmy
+ J0sEhm7ke1c8fbDSJrF4lQgAyIKFbl06LfzNy3vuJmbnx2xdXgApjQGRwVqKLi0E
+ /Z1Dvpk4ALukbqb1b9VopNUOSObyKYxfxuMWBhNman0gYYMvAr5D9Xt/FoWQDLho
+ QreibK7c9mYgSjC7LS1yTbk/6z1XNk3KE37NlxxZWLHUTUI3Ta2GXLWKnhSCXTcf
+ h2BHO2FTwpCucZsAUoUqGjDZ68PnCCaBghHeF5BfI/gAZI9lXpv7Ge0C8JZc8HSV
+ TviBthB5PYt5hjK8thpyYqZSKFUJF8iCqZqO2g==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teilam.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teilam.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Technological Educational Institute of Sterea Ellada</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Sterea Ellada</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.teilam.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.teilam.gr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Achilleas</md:GivenName>
+ <md:SurName>Likotseas</md:SurName>
+ <md:EmailAddress>aliko@teilam.gr</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>Technological Educational Insitute of Lamia</md:Company>
+ <md:GivenName>Achilleas</md:GivenName>
+ <md:SurName>Likotseas</md:SurName>
+ <md:EmailAddress>aliko@teilam.gr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ths.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ths.se-idp-shibboleth.xml
new file mode 100644
index 00000000..e1a2b05e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ths.se-idp-shibboleth.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ths.se/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ths.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Teologiska högskolan Stockholm</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Stockholm School of Theology</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för Teologiska högskolan Stockholm</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Theology</mdui:Description>
+ <mdui:Logo height="100" width="100">https://idp.ths.se/idp/images/ths.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
+MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
+IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
+QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
+VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
+zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
+iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
+HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
+S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
+GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
+wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
+r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
+GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
+MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAs+wFy6Bii4RxuP5xBGLV2ODTADmnAYjWdQ/SAaSF
+GkM1tHf/dH5+9nyIpz23PXSeO4X59arZC4eK71duqU7ajm2+LLKiLBguofbwlaK7
+Ia46ReI9WkIQBSyRnCLC8dDEC/1G1gsh9up4jvSgJO/BwtchvO23iFnoWGa5BwxT
+HrieHSBIqixP8/Zd4v3eVoPTmetyRQVstC7tc8AK6AB47zha1nxd+sRqmsVbsaef
+DW8v5rBm++Dn+m8Im2cF9AAytz8PM7vSQSx6sTixTTHBddD16vBMnaTKHpEdrYb4
+aK8sDS8ku2SXmsEGMmNSXo6CNFR8OZVpO4DHjZO94GwnFQIDAQABo1swWTAdBgNV
+HQ4EFgQUDd8LOI1MHYCc/x2uQ+F6edwmMJswOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQA5lFkOXXGkKwmKuAzA6ETKdvGfp8TloxdKrzQ9/2wwCZdLz/OVLhUe
+f00ILSO9SyDrkxTsnlUUkFqFR7zw/PwD/ZbRCH1zDPqz2fY8yg3uC9LM++r8ookt
+Yx2kwRAnwS6N1fRC3/oiCoWuY7HS+7MYTrTqOHoWlzoLJW/0MXdfN1tFJdMrluWq
+WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
+0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
+58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
+ </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>
+MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
+MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtUDQ13J3qxlTQ/bzLet+Y4xcjRkHeIWvQfUXIDDY
+Tl2PAFdvfTE63A77c/EGE/fE3x3Gqd/pLoOXF9xxrYt1CEUWSgLuMP6JYK2q3ByI
+ztL4AQRw6t313KRzsDH+qSnrA8m4o6w2ORx9Q8V6LSUfBXcqiUH8IdSJ2nkK4AEF
+/GDHtvYR0t3vxnARqa5bUtlBXc3lW8i4yet4lMnVVoDtvWQfVJ5i1AE3Uzys+RDK
+goRoKfHlayqiDYyuVmgP1wEB5b3yb5htTIvlrVAv3IBStRlmeDHPqc1ovrldOZFW
+mfhH9PB0qPVf6dsRRBBKO1yJJc7A4gRXjHJdQ8wMcvAYcwIDAQABo1swWTAdBgNV
+HQ4EFgQUeHLwS/y7FmX87CIT3IpanavrYW8wOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQCpSdEgMGI8XdHrUGfAAIqcYACudfOp80/rqpyOGPtO45qkBuYKrp3D
+yTts4EtDi3k5XCowH0TS9ODjgBCe/lOmDg05Ew/1dDc6pyxNUqMp1zRnmZ5DdzP8
+UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
+2SevIVPNCfKl9VGaxbkX9CGRLlB1YK3GBWUp4TvbsGC8+iM/+dXIQQy4Hh25vAzv
+SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
+xAdB19mh1plahNrAaEfu6Ldetyz9iulY
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ths.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ths.se/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ths.se/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ths.se/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ths.se</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
+MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
+IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
+QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
+VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
+zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
+iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
+HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
+S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
+GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
+wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
+r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
+GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
+MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAs+wFy6Bii4RxuP5xBGLV2ODTADmnAYjWdQ/SAaSF
+GkM1tHf/dH5+9nyIpz23PXSeO4X59arZC4eK71duqU7ajm2+LLKiLBguofbwlaK7
+Ia46ReI9WkIQBSyRnCLC8dDEC/1G1gsh9up4jvSgJO/BwtchvO23iFnoWGa5BwxT
+HrieHSBIqixP8/Zd4v3eVoPTmetyRQVstC7tc8AK6AB47zha1nxd+sRqmsVbsaef
+DW8v5rBm++Dn+m8Im2cF9AAytz8PM7vSQSx6sTixTTHBddD16vBMnaTKHpEdrYb4
+aK8sDS8ku2SXmsEGMmNSXo6CNFR8OZVpO4DHjZO94GwnFQIDAQABo1swWTAdBgNV
+HQ4EFgQUDd8LOI1MHYCc/x2uQ+F6edwmMJswOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQA5lFkOXXGkKwmKuAzA6ETKdvGfp8TloxdKrzQ9/2wwCZdLz/OVLhUe
+f00ILSO9SyDrkxTsnlUUkFqFR7zw/PwD/ZbRCH1zDPqz2fY8yg3uC9LM++r8ookt
+Yx2kwRAnwS6N1fRC3/oiCoWuY7HS+7MYTrTqOHoWlzoLJW/0MXdfN1tFJdMrluWq
+WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
+0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
+58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
+ </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>
+MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
+MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtUDQ13J3qxlTQ/bzLet+Y4xcjRkHeIWvQfUXIDDY
+Tl2PAFdvfTE63A77c/EGE/fE3x3Gqd/pLoOXF9xxrYt1CEUWSgLuMP6JYK2q3ByI
+ztL4AQRw6t313KRzsDH+qSnrA8m4o6w2ORx9Q8V6LSUfBXcqiUH8IdSJ2nkK4AEF
+/GDHtvYR0t3vxnARqa5bUtlBXc3lW8i4yet4lMnVVoDtvWQfVJ5i1AE3Uzys+RDK
+goRoKfHlayqiDYyuVmgP1wEB5b3yb5htTIvlrVAv3IBStRlmeDHPqc1ovrldOZFW
+mfhH9PB0qPVf6dsRRBBKO1yJJc7A4gRXjHJdQ8wMcvAYcwIDAQABo1swWTAdBgNV
+HQ4EFgQUeHLwS/y7FmX87CIT3IpanavrYW8wOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQCpSdEgMGI8XdHrUGfAAIqcYACudfOp80/rqpyOGPtO45qkBuYKrp3D
+yTts4EtDi3k5XCowH0TS9ODjgBCe/lOmDg05Ew/1dDc6pyxNUqMp1zRnmZ5DdzP8
+UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
+2SevIVPNCfKl9VGaxbkX9CGRLlB1YK3GBWUp4TvbsGC8+iM/+dXIQQy4Hh25vAzv
+SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
+xAdB19mh1plahNrAaEfu6Ldetyz9iulY
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>operations@swamid.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml
index f806726e..fa952ba2 100644
--- a/swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml
@@ -9,9 +9,12 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclouvain.be</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="fr">Universite Catholique de Louvain</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Catholic University of Louvain</mdui:DisplayName>
- <mdui:Description xml:lang="en">The Catholic University of Louvain is Belgium's largest French-speaking university</mdui:Description>
+ <mdui:Description xml:lang="fr">L'Universite Catholique de Louvain est une universite pluridisciplinaire au coeur de l'Europe (Belgique).</mdui:Description>
+ <mdui:Description xml:lang="en">The Catholic University of Louvain is an pluridisciplinary university at the heart of Europe (Belgium)</mdui:Description>
<mdui:InformationURL xml:lang="fr">https://www.uclouvain.be/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.uclouvain.be/en-index.html</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="fr">https://www.uclouvain.be/10547.html</mdui:PrivacyStatementURL>
<mdui:Logo height="16" width="16">https://idp.uclouvain.be/favicon.ico</mdui:Logo>
<mdui:Logo height="100" width="540">https://idp.uclouvain.be/idp/images/UCL-bandeau.png</mdui:Logo>
@@ -107,7 +110,7 @@ RQ04bxgiI77gAJH7GDHsFbX71Gmfurj7pJ3R5F25y6KUWELAmhAPm4Kb0WyV0Us=
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uclouvain.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uclouvain.be/idp/profile/SAML2/Redirect/SSO"/>
</md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclouvain.be</shibmd:Scope>
</md:Extensions>
@@ -187,6 +190,7 @@ RQ04bxgiI77gAJH7GDHsFbX71Gmfurj7pJ3R5F25y6KUWELAmhAPm4Kb0WyV0Us=
</ds:KeyInfo>
</md:KeyDescriptor>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uclouvain.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uclouvain.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
</md:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">Universite Catholique de Louvain</md:OrganizationName>
diff --git a/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
index c74736c2..82cfa21f 100644
--- a/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
@@ -9,13 +9,13 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uef.fi</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fi">Itä-Suomen yliopisto</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">Östra Finlands universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">University of Eastern Finland</mdui:DisplayName>
- <mdui:Description xml:lang="fi">Itä-Suomen yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
+ <mdui:DisplayName xml:lang="sv">Östra Finlands universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Itä-Suomen yliopisto</mdui:DisplayName>
<mdui:Description xml:lang="en">University of Eastern Finland students, faculty and employees.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.uef.fi/en/etusivu</mdui:InformationURL>
+ <mdui:Description xml:lang="fi">Itä-Suomen yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
<mdui:InformationURL xml:lang="fi">http://www.uef.fi/fi/etusivu</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.uef.fi/en/etusivu</mdui:InformationURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
index c3154650..0076912d 100644
--- a/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
@@ -23,27 +23,22 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLDAqBgNVBAoTI1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIFNhbnRhIE1hcmlhMQwwCgYDVQQLEwNDUEQxGjAYBgkq
-hkiG9w0BCQEWC2NwZEB1ZnNtLmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgG
-A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
-ZHAudWZzbS5icjAeFw0xMjEwMDUxNDA1MzVaFw0xNTEwMDUxNDA1MzVaMIGtMSww
-KgYDVQQKEyNVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTYW50YSBNYXJpYTEMMAoG
-A1UECxMDQ1BEMRowGAYJKoZIhvcNAQkBFgtjcGRAdWZzbS5icjEUMBIGA1UEBxML
-U2FudGEgTWFyaWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
-EwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDWBJ1zOYMt8oRHINxfgHCz/YAWxSb2vSxeOu50Jdr+EzKQYMj4
-5eeXhCNYGlWtqPI+rMZj4i3p8P+xbaK+RzXJavEF0gyv3qcamJWBd5GseyO/Q5gd
-u4DpJ5lpA5P1zm2Q646p1swNAlENjS756Ux5MfWFPfRYc3u04Y9W8EDfKMPMYSs2
-H+bFi0Ucn4DaEkUiDc2noJuJMM08m3Nl5GTUEwZSRJAlV9OT2tUbXAfeqdXyteS4
-VaFzc4vt0KqUwATvxhIygOqX+9I7nitBg3wfXbHsmYBo14AUsPxJvVFUV2bLUd4l
-d/xr71cxlkFHk4mzRe5C2kDLYcvYaIqv/jyjAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAKiirihev0E7qiHKcDQjWPxP1RTalsGly1pAWYUp1ikY7R2n+VzsSTVu6xh4
-ITgI1YIsHOdQ9eepAQCiEcuPim7CnzcKb1Ru6vgiXxgO9hJg0iNmcycPFQR8t5rk
-2fFUgF2GjL+lpOEnCgKn7WPEsAAHnLHsJjCbNcbX7B12awaVu6Q2nuiBcX2EC/PD
-Vvgi6N7sh/ViG8whuT4y7vN0Zdnc8FdbRFVkgl6FInPQa27MNQL7ZukyxmU+A9AF
-+jDBH/uGNUgpWLHqS/d+TMq0SPcrLoedtMjcadIQIpMgyIk14QvJGo/YB9sgtvHM
-dwJYMximHcBNMJ0UieklpL0lmx0=
+ MIIC1jCCAb4CAQAwDQYJKoZIhvcNAQEFBQAwMTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwHhcNMTUwOTMwMTc1MzQyWhcN
+MjAwOTI4MTc1MzQyWjAxMQwwCgYDVQQLEwNDUEQxCzAJBgNVBAYTAkJSMRQwEgYD
+VQQDEwtpZHAudWZzbS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANYEnXM5gy3yhEcg3F+AcLP9gBbFJva9LF467nQl2v4TMpBgyPjl55eEI1gaVa2o
+8j6sxmPiLenw/7Ftor5HNclq8QXSDK/epxqYlYF3kax7I79DmB27gOknmWkDk/XO
+bZDrjqnWzA0CUQ2NLvnpTHkx9YU99Fhze7Thj1bwQN8ow8xhKzYf5sWLRRyfgNoS
+RSINzaegm4kwzTybc2XkZNQTBlJEkCVX05Pa1RtcB96p1fK15LhVoXNzi+3QqpTA
+BO/GEjKA6pf70jueK0GDfB9dseyZgGjXgBSw/Em9UVRXZstR3iV3/GvvVzGWQUeT
+ibNF7kLaQMthy9hoiq/+PKMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAntsWbq6g
+AWldIQe1L0kTYEjVZ+q8oSkqmAEVTJIy7imd5smU6+UBOQyu82F0xXTl6H3iFZmL
+vw24ytxvPIz2FLUrpLlgfiEF2XQjVNcZLbA191R6UCWaVM5N76MmUS89xHyxs4Ck
+UtGRgGG+qKRuvzlKseuAnalIXiWvWYOGnZuGM1cdurhd+ppIw/bBufdfhi+uztgU
+LMfKRDHJeh/Um4kwOImAoLLNBVtvnixKcCrXFMTgpTPRtU0sFCEjWpsKOf2C4I2t
+0L2l2kUdC2yEXOjyPeVCCqWJSNfEmDQ/mYH5s1A4aRpfWWop3PTGssj1BEMSAEy8
+9YfkoyeLdgTKHg==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -66,27 +61,22 @@ dwJYMximHcBNMJ0UieklpL0lmx0=
<ds:X509Data>
<ds:X509Certificate>
-MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLDAqBgNVBAoTI1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIFNhbnRhIE1hcmlhMQwwCgYDVQQLEwNDUEQxGjAYBgkq
-hkiG9w0BCQEWC2NwZEB1ZnNtLmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgG
-A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
-ZHAudWZzbS5icjAeFw0xMjEwMDUxNDA1MzVaFw0xNTEwMDUxNDA1MzVaMIGtMSww
-KgYDVQQKEyNVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTYW50YSBNYXJpYTEMMAoG
-A1UECxMDQ1BEMRowGAYJKoZIhvcNAQkBFgtjcGRAdWZzbS5icjEUMBIGA1UEBxML
-U2FudGEgTWFyaWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
-EwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDWBJ1zOYMt8oRHINxfgHCz/YAWxSb2vSxeOu50Jdr+EzKQYMj4
-5eeXhCNYGlWtqPI+rMZj4i3p8P+xbaK+RzXJavEF0gyv3qcamJWBd5GseyO/Q5gd
-u4DpJ5lpA5P1zm2Q646p1swNAlENjS756Ux5MfWFPfRYc3u04Y9W8EDfKMPMYSs2
-H+bFi0Ucn4DaEkUiDc2noJuJMM08m3Nl5GTUEwZSRJAlV9OT2tUbXAfeqdXyteS4
-VaFzc4vt0KqUwATvxhIygOqX+9I7nitBg3wfXbHsmYBo14AUsPxJvVFUV2bLUd4l
-d/xr71cxlkFHk4mzRe5C2kDLYcvYaIqv/jyjAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAKiirihev0E7qiHKcDQjWPxP1RTalsGly1pAWYUp1ikY7R2n+VzsSTVu6xh4
-ITgI1YIsHOdQ9eepAQCiEcuPim7CnzcKb1Ru6vgiXxgO9hJg0iNmcycPFQR8t5rk
-2fFUgF2GjL+lpOEnCgKn7WPEsAAHnLHsJjCbNcbX7B12awaVu6Q2nuiBcX2EC/PD
-Vvgi6N7sh/ViG8whuT4y7vN0Zdnc8FdbRFVkgl6FInPQa27MNQL7ZukyxmU+A9AF
-+jDBH/uGNUgpWLHqS/d+TMq0SPcrLoedtMjcadIQIpMgyIk14QvJGo/YB9sgtvHM
-dwJYMximHcBNMJ0UieklpL0lmx0=
+MIIC1jCCAb4CAQAwDQYJKoZIhvcNAQEFBQAwMTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwHhcNMTUwOTMwMTc1MzQyWhcN
+MjAwOTI4MTc1MzQyWjAxMQwwCgYDVQQLEwNDUEQxCzAJBgNVBAYTAkJSMRQwEgYD
+VQQDEwtpZHAudWZzbS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANYEnXM5gy3yhEcg3F+AcLP9gBbFJva9LF467nQl2v4TMpBgyPjl55eEI1gaVa2o
+8j6sxmPiLenw/7Ftor5HNclq8QXSDK/epxqYlYF3kax7I79DmB27gOknmWkDk/XO
+bZDrjqnWzA0CUQ2NLvnpTHkx9YU99Fhze7Thj1bwQN8ow8xhKzYf5sWLRRyfgNoS
+RSINzaegm4kwzTybc2XkZNQTBlJEkCVX05Pa1RtcB96p1fK15LhVoXNzi+3QqpTA
+BO/GEjKA6pf70jueK0GDfB9dseyZgGjXgBSw/Em9UVRXZstR3iV3/GvvVzGWQUeT
+ibNF7kLaQMthy9hoiq/+PKMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAntsWbq6g
+AWldIQe1L0kTYEjVZ+q8oSkqmAEVTJIy7imd5smU6+UBOQyu82F0xXTl6H3iFZmL
+vw24ytxvPIz2FLUrpLlgfiEF2XQjVNcZLbA191R6UCWaVM5N76MmUS89xHyxs4Ck
+UtGRgGG+qKRuvzlKseuAnalIXiWvWYOGnZuGM1cdurhd+ppIw/bBufdfhi+uztgU
+LMfKRDHJeh/Um4kwOImAoLLNBVtvnixKcCrXFMTgpTPRtU0sFCEjWpsKOf2C4I2t
+0L2l2kUdC2yEXOjyPeVCCqWJSNfEmDQ/mYH5s1A4aRpfWWop3PTGssj1BEMSAEy8
+9YfkoyeLdgTKHg==
</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
index f26ae2ce..9a06c4f7 100644
--- a/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
@@ -56,19 +56,19 @@
<md:ContactPerson contactType="administrative">
<md:Company>Umeå University</md:Company>
<md:SurName>ITS datordrift</md:SurName>
- <md:EmailAddress>datordrift@its.umu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Umeå University</md:Company>
<md:SurName>ITS datordrift</md:SurName>
- <md:EmailAddress>datordrift@its.umu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Umeå University</md:Company>
<md:SurName>Servicedesk Umeå universitet</md:SurName>
- <md:EmailAddress>support@its.umu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:support@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml b/swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml
new file mode 100644
index 00000000..f564017d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ung.si/idp/20111102">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-10-22T11:10:11Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ung.si</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of Nova Gorica</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sl">Univerza v Novi Gorici</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity provider for organization University of Nova Gorica</mdui:Description>
+ <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Novi Gorici</mdui:Description>
+ <mdui:Keywords xml:lang="en">Identity provider for organization University of Nova Gorica</mdui:Keywords>
+ <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Novi Gorici</mdui:Keywords>
+ <mdui:Logo height="261" width="258">data:image/png;base64,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</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://www.ung.si</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sl">http://www.ung.si</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEAzCCAesCCQCtysqpxJq6zjANBgkqhkiG9w0BAQUFADAsMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMQ8wDQYDVQQDEwZVTkcgQ0EwHhcNMTExMTA0MDc1MDEzWhcNMTYxMTA0MDc1MDEzWjBbMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMT4wPAYDVQQDEzVVbml2ZXJ6YSB2IE5vdmkgR29yaWNpLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK1b/loWRHNHNP50OwxJc+M9cAprnU6R1/ewOdTmR+GbBTWKrfNrQEkDeb7YZjCPtuiziFm0oijk6wkZfoKg5tCHGCIG6dQydXKl0Y+CkGlAOFxag1NFjG4Oliu0sM5kh+7mYkQtCNb2G98GMJe+DDJYZ5LYLpp6X+7IYY188OwDqfgfDSTDMX6Zf+NofXb4bndjcQp3Eh0jHakxwCPmPDO99Xbek/rtq4kdVh7vh45Ffd78PNtIqZ4428AExcRHftGyDCHQu494R69s3CJ4QDudPgoBW12PTZTyJCPgdLHZOqvrtCwfEXbe3/XU7G4GI3tmrqt3gti1Rln2rF9lWTkCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAiiqcb/g6zHTY8Chb27AToSoarKz7I6CHp2T8izqcQAg5cvaCyT3PrJqxPnjPeoZFtzhdrECgMGlxjvRx5VkHMQWH+xamnG+K+8epF9KBozNURzDMt+fM2/ocXNFDV3paAHamIXB6XQl/trcXb22RTn1AqbSr9bPMk/rnOmHG8x9tajDiipUklYNxFBkJ5ya+Iy0aEx2edHB3xBjir3ftdi4x7exxJ4V721Qq6lr5l/ez6Wd5ve7id/VJGLaFhK92UQeKc3gCvLwmDfNKnpkpzOc+CWk3dzK6/6yqgxpgh6d/NAJbXWDjsIWXYx6BlKaKUKEBV5qpy2SZuhDm7GzSXbCOPeEXcLV5S+BfFB4rAObU9RSUavcY8SK/F+Jy3CgiLr4r7AV3ryjgL0r9VBW3ohD68HbPVevOdw00N+p11rWDGs4+JtHKUUhPvaMkKlIZ/9VoseAbCE5CMPyx5WJptK9RZXvukYQQ8c4F0aM/zW4Ask31PPmrbleY0FCU41NmWGMMTPuNIOisw4zF9fSYVRP2HuiRh1kcNWWruSceL/FE1c9SC5AsgrnTmpYEiF71BiJ+UhezVsyxFuOezLQn/HP/xRKhH6d2DAgd6k0EiCkKPhxbaqgeDWj4FMcSGeANdW+LFswewbiGg3eNMx9a7AXkhWjSqfVPUva1pIN34TQ=</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>MIIEAzCCAesCCQCtysqpxJq6zjANBgkqhkiG9w0BAQUFADAsMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMQ8wDQYDVQQDEwZVTkcgQ0EwHhcNMTExMTA0MDc1MDEzWhcNMTYxMTA0MDc1MDEzWjBbMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMT4wPAYDVQQDEzVVbml2ZXJ6YSB2IE5vdmkgR29yaWNpLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK1b/loWRHNHNP50OwxJc+M9cAprnU6R1/ewOdTmR+GbBTWKrfNrQEkDeb7YZjCPtuiziFm0oijk6wkZfoKg5tCHGCIG6dQydXKl0Y+CkGlAOFxag1NFjG4Oliu0sM5kh+7mYkQtCNb2G98GMJe+DDJYZ5LYLpp6X+7IYY188OwDqfgfDSTDMX6Zf+NofXb4bndjcQp3Eh0jHakxwCPmPDO99Xbek/rtq4kdVh7vh45Ffd78PNtIqZ4428AExcRHftGyDCHQu494R69s3CJ4QDudPgoBW12PTZTyJCPgdLHZOqvrtCwfEXbe3/XU7G4GI3tmrqt3gti1Rln2rF9lWTkCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAiiqcb/g6zHTY8Chb27AToSoarKz7I6CHp2T8izqcQAg5cvaCyT3PrJqxPnjPeoZFtzhdrECgMGlxjvRx5VkHMQWH+xamnG+K+8epF9KBozNURzDMt+fM2/ocXNFDV3paAHamIXB6XQl/trcXb22RTn1AqbSr9bPMk/rnOmHG8x9tajDiipUklYNxFBkJ5ya+Iy0aEx2edHB3xBjir3ftdi4x7exxJ4V721Qq6lr5l/ez6Wd5ve7id/VJGLaFhK92UQeKc3gCvLwmDfNKnpkpzOc+CWk3dzK6/6yqgxpgh6d/NAJbXWDjsIWXYx6BlKaKUKEBV5qpy2SZuhDm7GzSXbCOPeEXcLV5S+BfFB4rAObU9RSUavcY8SK/F+Jy3CgiLr4r7AV3ryjgL0r9VBW3ohD68HbPVevOdw00N+p11rWDGs4+JtHKUUhPvaMkKlIZ/9VoseAbCE5CMPyx5WJptK9RZXvukYQQ8c4F0aM/zW4Ask31PPmrbleY0FCU41NmWGMMTPuNIOisw4zF9fSYVRP2HuiRh1kcNWWruSceL/FE1c9SC5AsgrnTmpYEiF71BiJ+UhezVsyxFuOezLQn/HP/xRKhH6d2DAgd6k0EiCkKPhxbaqgeDWj4FMcSGeANdW+LFswewbiGg3eNMx9a7AXkhWjSqfVPUva1pIN34TQ=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ung.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ung.si/simplesaml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Univerza v Novi Gorici</md:OrganizationName>
+ <md:OrganizationName xml:lang="sl">Univerza v Novi Gorici</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Univerza v Novi Gorici</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sl">Univerza v Novi Gorici</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ung.si</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sl">http://www.ung.si</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Danilo</md:GivenName>
+ <md:SurName>Zavrtanik</md:SurName>
+ <md:EmailAddress>mailto:danilo.zavrtanik@ung.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Helpdesk</md:GivenName>
+ <md:SurName>Helpdesk</md:SurName>
+ <md:EmailAddress>mailto:bojan.korecic@ung.si</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Bojan</md:GivenName>
+ <md:SurName>Korečič</md:SurName>
+ <md:EmailAddress>mailto:bojan.korecic@ung.si</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml
new file mode 100644
index 00000000..eaabd1d0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-duisburg-essen.de/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:27Z">
+ <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>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duisburg-essen.de</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Universität Duisburg-Essen</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Universität Duisburg-Essen</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Identity Provider fuer Studenten und Mitarbeiter der Universität Duisburg-Essen</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider fuer Studenten und Mitarbeiter der Universität Duisburg-Essen</mdui:Description>
+ <mdui:InformationURL xml:lang="de">http://www.uni-duisburg-essen.de</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.uni-duisburg-essen.de</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
+BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
+A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
+dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
+MSwwKgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAe
+Fw0xNTA4MTMwOTQ4MjBaFw0xODExMDkwOTQ4MjBaMIGFMQswCQYDVQQGEwJERTEc
+MBoGA1UECAwTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBwwFRXNzZW4xJDAi
+BgNVBAoMG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjEiMCAGA1UEAwwZaWRw
+LnVuaS1kdWlzYnVyZy1lc3Nlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAPYxdTta36EMhfGe9g5snaPVXrg7VUXj0KohGzj2PQGcmreDwb3pqMwd
+YpCTD0jmKi2Il+df0uIW6lPYzKQvVy2GoJLnIJrLz+UuBWGlj7lZtxLDllKFvLUv
+ZB58fc7EZrvnHODaAY2/mXX1zFbwtTbAq91uErIooWPZEtCMXt0oHhjFRVz6gaqF
+VvcWlasEcnveHjPD5ZilWCMWUhalcuLURt+6gcMzpKpHM2poH6QymtQHjXQmUFLT
+6ikiUtk5C/MfNviX0e+nuZXiNAxAGscnO+kDznLr4iutD9IvMCZY68USNQ+yPZSf
+twW6PI5MAZDv8phHZcFkHpiBl5kdhyMCAwEAAaOCApQwggKQME8GA1UdIARIMEYw
+EQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGt
+IYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUC3achFOfoF8m
+qnA/AMvi9mTK0iUwHwYDVR0jBBgwFoAUZma8lptITejdvCKnplvVqEGfle4wRAYD
+VR0RBD0wO4IeaWRwLXRlc3QudW5pLWR1aXNidXJnLWVzc2VuLmRlghlpZHAudW5p
+LWR1aXNidXJnLWVzc2VuLmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMESgQqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVy
+Zy1lc3Nlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB5QYIKwYBBQUHAQEEgdgwgdUw
+MwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIv
+T0NTUDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZHVp
+c2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0ME4GCCsGAQUFBzAC
+hkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAGqv6YwBfi0t
+l+xU4j5lSytDXmBnAwvqjKLCaVaNKXOpkW97XcmDBBa+XB3cHVjvicgf8we9A8B4
+MnlA6o3+2mcoDtFk6j3E0z9EvTf9FaAa+M8u28JE/RE+VwT21veOF/b4aLE/XSwQ
+qIDyfPdvY+kYATFv/XuUoyGmtUvpINaJezXlHfDKsk+pRwDvlF2F33Be/jbh5mch
+kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
+gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
+BkqqyY3eD4M=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
+BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
+A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
+dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
+MSwwKgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAe
+Fw0xNTA4MTMwOTQ4MjBaFw0xODExMDkwOTQ4MjBaMIGFMQswCQYDVQQGEwJERTEc
+MBoGA1UECAwTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBwwFRXNzZW4xJDAi
+BgNVBAoMG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjEiMCAGA1UEAwwZaWRw
+LnVuaS1kdWlzYnVyZy1lc3Nlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAPYxdTta36EMhfGe9g5snaPVXrg7VUXj0KohGzj2PQGcmreDwb3pqMwd
+YpCTD0jmKi2Il+df0uIW6lPYzKQvVy2GoJLnIJrLz+UuBWGlj7lZtxLDllKFvLUv
+ZB58fc7EZrvnHODaAY2/mXX1zFbwtTbAq91uErIooWPZEtCMXt0oHhjFRVz6gaqF
+VvcWlasEcnveHjPD5ZilWCMWUhalcuLURt+6gcMzpKpHM2poH6QymtQHjXQmUFLT
+6ikiUtk5C/MfNviX0e+nuZXiNAxAGscnO+kDznLr4iutD9IvMCZY68USNQ+yPZSf
+twW6PI5MAZDv8phHZcFkHpiBl5kdhyMCAwEAAaOCApQwggKQME8GA1UdIARIMEYw
+EQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGt
+IYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUC3achFOfoF8m
+qnA/AMvi9mTK0iUwHwYDVR0jBBgwFoAUZma8lptITejdvCKnplvVqEGfle4wRAYD
+VR0RBD0wO4IeaWRwLXRlc3QudW5pLWR1aXNidXJnLWVzc2VuLmRlghlpZHAudW5p
+LWR1aXNidXJnLWVzc2VuLmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMESgQqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVy
+Zy1lc3Nlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB5QYIKwYBBQUHAQEEgdgwgdUw
+MwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIv
+T0NTUDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZHVp
+c2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0ME4GCCsGAQUFBzAC
+hkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAGqv6YwBfi0t
+l+xU4j5lSytDXmBnAwvqjKLCaVaNKXOpkW97XcmDBBa+XB3cHVjvicgf8we9A8B4
+MnlA6o3+2mcoDtFk6j3E0z9EvTf9FaAa+M8u28JE/RE+VwT21veOF/b4aLE/XSwQ
+qIDyfPdvY+kYATFv/XuUoyGmtUvpINaJezXlHfDKsk+pRwDvlF2F33Be/jbh5mch
+kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
+gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
+BkqqyY3eD4M=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-duisburg-essen.de/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duisburg-essen.de</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
+BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
+A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
+dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
+MSwwKgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAe
+Fw0xNTA4MTMwOTQ4MjBaFw0xODExMDkwOTQ4MjBaMIGFMQswCQYDVQQGEwJERTEc
+MBoGA1UECAwTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBwwFRXNzZW4xJDAi
+BgNVBAoMG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjEiMCAGA1UEAwwZaWRw
+LnVuaS1kdWlzYnVyZy1lc3Nlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAPYxdTta36EMhfGe9g5snaPVXrg7VUXj0KohGzj2PQGcmreDwb3pqMwd
+YpCTD0jmKi2Il+df0uIW6lPYzKQvVy2GoJLnIJrLz+UuBWGlj7lZtxLDllKFvLUv
+ZB58fc7EZrvnHODaAY2/mXX1zFbwtTbAq91uErIooWPZEtCMXt0oHhjFRVz6gaqF
+VvcWlasEcnveHjPD5ZilWCMWUhalcuLURt+6gcMzpKpHM2poH6QymtQHjXQmUFLT
+6ikiUtk5C/MfNviX0e+nuZXiNAxAGscnO+kDznLr4iutD9IvMCZY68USNQ+yPZSf
+twW6PI5MAZDv8phHZcFkHpiBl5kdhyMCAwEAAaOCApQwggKQME8GA1UdIARIMEYw
+EQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGt
+IYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUC3achFOfoF8m
+qnA/AMvi9mTK0iUwHwYDVR0jBBgwFoAUZma8lptITejdvCKnplvVqEGfle4wRAYD
+VR0RBD0wO4IeaWRwLXRlc3QudW5pLWR1aXNidXJnLWVzc2VuLmRlghlpZHAudW5p
+LWR1aXNidXJnLWVzc2VuLmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMESgQqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVy
+Zy1lc3Nlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB5QYIKwYBBQUHAQEEgdgwgdUw
+MwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIv
+T0NTUDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZHVp
+c2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0ME4GCCsGAQUFBzAC
+hkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAGqv6YwBfi0t
+l+xU4j5lSytDXmBnAwvqjKLCaVaNKXOpkW97XcmDBBa+XB3cHVjvicgf8we9A8B4
+MnlA6o3+2mcoDtFk6j3E0z9EvTf9FaAa+M8u28JE/RE+VwT21veOF/b4aLE/XSwQ
+qIDyfPdvY+kYATFv/XuUoyGmtUvpINaJezXlHfDKsk+pRwDvlF2F33Be/jbh5mch
+kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
+gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
+BkqqyY3eD4M=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
+BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
+A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
+dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
+MSwwKgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAe
+Fw0xNTA4MTMwOTQ4MjBaFw0xODExMDkwOTQ4MjBaMIGFMQswCQYDVQQGEwJERTEc
+MBoGA1UECAwTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBwwFRXNzZW4xJDAi
+BgNVBAoMG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjEiMCAGA1UEAwwZaWRw
+LnVuaS1kdWlzYnVyZy1lc3Nlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAPYxdTta36EMhfGe9g5snaPVXrg7VUXj0KohGzj2PQGcmreDwb3pqMwd
+YpCTD0jmKi2Il+df0uIW6lPYzKQvVy2GoJLnIJrLz+UuBWGlj7lZtxLDllKFvLUv
+ZB58fc7EZrvnHODaAY2/mXX1zFbwtTbAq91uErIooWPZEtCMXt0oHhjFRVz6gaqF
+VvcWlasEcnveHjPD5ZilWCMWUhalcuLURt+6gcMzpKpHM2poH6QymtQHjXQmUFLT
+6ikiUtk5C/MfNviX0e+nuZXiNAxAGscnO+kDznLr4iutD9IvMCZY68USNQ+yPZSf
+twW6PI5MAZDv8phHZcFkHpiBl5kdhyMCAwEAAaOCApQwggKQME8GA1UdIARIMEYw
+EQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGt
+IYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUC3achFOfoF8m
+qnA/AMvi9mTK0iUwHwYDVR0jBBgwFoAUZma8lptITejdvCKnplvVqEGfle4wRAYD
+VR0RBD0wO4IeaWRwLXRlc3QudW5pLWR1aXNidXJnLWVzc2VuLmRlghlpZHAudW5p
+LWR1aXNidXJnLWVzc2VuLmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMESgQqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVy
+Zy1lc3Nlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB5QYIKwYBBQUHAQEEgdgwgdUw
+MwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIv
+T0NTUDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZHVp
+c2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0ME4GCCsGAQUFBzAC
+hkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAGqv6YwBfi0t
+l+xU4j5lSytDXmBnAwvqjKLCaVaNKXOpkW97XcmDBBa+XB3cHVjvicgf8we9A8B4
+MnlA6o3+2mcoDtFk6j3E0z9EvTf9FaAa+M8u28JE/RE+VwT21veOF/b4aLE/XSwQ
+qIDyfPdvY+kYATFv/XuUoyGmtUvpINaJezXlHfDKsk+pRwDvlF2F33Be/jbh5mch
+kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
+gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
+BkqqyY3eD4M=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e105</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e105</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Universität Duisburg-Essen</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Universität Duisburg-Essen</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.uni-duisburg-essen.de</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Harald</md:GivenName>
+ <md:SurName>Schüler</md:SurName>
+ <md:EmailAddress>mailto:harald.schueler@uni-duisburg-essen.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Harald</md:GivenName>
+ <md:SurName>Schüler</md:SurName>
+ <md:EmailAddress>mailto:harald.schueler@uni-duisburg-essen.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Burkhard</md:GivenName>
+ <md:SurName>Wald</md:SurName>
+ <md:EmailAddress>mailto:burkhard.wald@uni-duisburg-essen.de</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Burkhard</md:GivenName>
+ <md:SurName>Wald</md:SurName>
+ <md:EmailAddress>mailto:burkhard.wald@uni-due.de</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml
index add6a0cc..a3d545fe 100644
--- a/swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-wuppertal.de/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-06-01T15:37:03Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-05T14:09:03Z">
<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>
@@ -16,11 +16,51 @@
<mdui:Description xml:lang="en">Members at University of Wuppertal</mdui:Description>
<mdui:Logo height="16" width="16">https://idp.uni-wuppertal.de/idp/images/buw-mini.png</mdui:Logo>
<mdui:Logo height="70" width="200">https://idp.uni-wuppertal.de/idp/images/buw_log.png</mdui:Logo>
- <mdui:InformationURL xml:lang="de">http://www.uni-wuppertal.de</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">http://www.uni-wuppertal.de/en/home.html</mdui:InformationURL>
</mdui:UIInfo>
</md:Extensions>
- <md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
+BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1
+cHBlcnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0
+YWwxDDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEG
+CSqGSIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTUwMzE4MTIyNjEz
+WhcNMTkwNzA5MjM1OTAwWjCBiTELMAkGA1UEBhMCREUxHDAaBgNVBAgME05vcmRy
+aGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcMCVd1cHBlcnRhbDEpMCcGA1UECgwgQmVy
+Z2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMMFGlkcC51bmkt
+d3VwcGVydGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKY
+nT23i7mXryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOq
+RzPzTvrRKmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuO
+j3hB3CV43WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQf
+EsNWMykBo3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA
++xj3TQ76uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht3
+5fM7Yd/AYs1g6BfAXQIDAQABo4ICWzCCAlcwTwYDVR0gBEgwRjARBg8rBgEEAYGt
+IYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYL
+KwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L83/B5MjuYAX6
+czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAfBgNVHREEGDAWghRp
+ZHAudW5pLXd1cHBlcnRhbC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5j
+cmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXd1cHBlcnRhbC1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYBBQUHAQEEgc4wgcswMwYIKwYBBQUH
+MAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBJBggr
+BgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQsFAAOCAQEAFUjGgPg4NuNIoi7FRNSrv1a6qy3k0wWUaJJH
+mWsoQI5OT42Z9l6ifkInmyMPtvD1ldedlVxuM858gDIo/0CLa0H5cfq72hKZ+sW2
+LOohAAXb1b7hHq2a9Wf+ENal79LcQvd3sVW3bdgIXt/HKBPOC0LwMKjkylwaqwzm
+Q5M214/3Pn24DCLPo1lsfBNX5ObHtSf1ganwEc7sml/pb1ja/W/JDhwrPOuyZUs2
+/m3eQbz+tfpT6b28oogqyQL0US+Mu/zSTJzIGD6DiK4cwmstjmlPGJ1LhK3ZaAKy
+kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
<ds:X509Data>
@@ -66,7 +106,6 @@ kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-wuppertal.de/idp/profile/Shibboleth/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -76,7 +115,49 @@ kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuppertal.de</shibmd:Scope>
</md:Extensions>
- <md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
+BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1
+cHBlcnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0
+YWwxDDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEG
+CSqGSIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTUwMzE4MTIyNjEz
+WhcNMTkwNzA5MjM1OTAwWjCBiTELMAkGA1UEBhMCREUxHDAaBgNVBAgME05vcmRy
+aGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcMCVd1cHBlcnRhbDEpMCcGA1UECgwgQmVy
+Z2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMMFGlkcC51bmkt
+d3VwcGVydGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKY
+nT23i7mXryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOq
+RzPzTvrRKmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuO
+j3hB3CV43WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQf
+EsNWMykBo3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA
++xj3TQ76uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht3
+5fM7Yd/AYs1g6BfAXQIDAQABo4ICWzCCAlcwTwYDVR0gBEgwRjARBg8rBgEEAYGt
+IYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYL
+KwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L83/B5MjuYAX6
+czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAfBgNVHREEGDAWghRp
+ZHAudW5pLXd1cHBlcnRhbC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5j
+cmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXd1cHBlcnRhbC1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYBBQUHAQEEgc4wgcswMwYIKwYBBQUH
+MAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBJBggr
+BgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQsFAAOCAQEAFUjGgPg4NuNIoi7FRNSrv1a6qy3k0wWUaJJH
+mWsoQI5OT42Z9l6ifkInmyMPtvD1ldedlVxuM858gDIo/0CLa0H5cfq72hKZ+sW2
+LOohAAXb1b7hHq2a9Wf+ENal79LcQvd3sVW3bdgIXt/HKBPOC0LwMKjkylwaqwzm
+Q5M214/3Pn24DCLPo1lsfBNX5ObHtSf1ganwEc7sml/pb1ja/W/JDhwrPOuyZUs2
+/m3eQbz+tfpT6b28oogqyQL0US+Mu/zSTJzIGD6DiK4cwmstjmlPGJ1LhK3ZaAKy
+kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
<ds:X509Data>
@@ -122,7 +203,6 @@ kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="de">e168</md:OrganizationName>
@@ -132,11 +212,6 @@ kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
<md:OrganizationURL xml:lang="de">http://www.uni-wuppertal.de</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">http://www.uni-wuppertal.de/en/home.html</md:OrganizationURL>
</md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Rene</md:GivenName>
- <md:SurName>Zeipelt</md:SurName>
- <md:EmailAddress>mailto:zeipelt@uni-wuppertal.de</md:EmailAddress>
- </md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Rene</md:GivenName>
<md:SurName>Zeipelt</md:SurName>
diff --git a/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml
index fe922922..59da3ac0 100644
--- a/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unibg.it/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unibg.it/simplesaml/saml2/idp/metadata.php">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-11-27T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml
index 8d9a2136..40ae6d95 100644
--- a/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unibocconi-prod.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unibocconi-prod.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-08-29T10:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml
index 5eccfaee..105051dc 100644
--- a/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unica.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unica.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
index 25838545..69b7be2e 100644
--- a/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
@@ -9,10 +9,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicaen.fr</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Université de Caen - Basse Normandie</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Caen Normandie</mdui:DisplayName>
<mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAV0lEQVQY03XPMQrAMAxD0d7/WOFPxkvAS8YsGUIW36BTS2WoxgcW8tVKrh9g7OwfsLPD4AX2RE7ioB1zlFKjwIwKq3R4ugCM7CBLI89ymY6H6XO0pvDkBhHbxZqnkacaAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
<mdui:InformationURL xml:lang="fr">http://www.unicaen.fr</mdui:InformationURL>
- <mdui:DisplayName xml:lang="fr">Université de Caen - Basse Normandie</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">Université de Caen Normandie</mdui:DisplayName>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
@@ -47,8 +47,8 @@ IsKc8ui7+rEvhoAKrdmvAPrxTSfN8KMFQ3tbQDz2E3YzAELQD+4zWg==
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unicaen.fr/idp/profile/Shibboleth/SSO"/>
</md:IDPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">Université de Caen - Basse Normandie</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Université de Caen - Basse Normandie</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">Université de Caen Normandie</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Université de Caen Normandie</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.unicaen.fr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml
index a4dd4cae..e55ef8ef 100644
--- a/swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unical.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unical.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-08-18T09:50:49Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
index 57849ac0..75356c9d 100644
--- a/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unige.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-16T16:59:51Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-10-27T18:08:47Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -82,7 +82,8 @@ mvLUHB+HLHvU53517kDxazwQx2g=
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unige.ch/idp/Artifact" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
@@ -156,6 +157,7 @@ M4BZ2IY2Ts91B58Noy+uhlISbxOaSeV1iuJu
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unige.ch/idp/AA"/>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
index f7ab400c..2dad989f 100644
--- a/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimc.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimc.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-04-22T12:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">
diff --git a/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml
index 2330af44..f821a300 100644
--- a/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimib.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimib.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml
index 2c5d1cfb..a462d70e 100644
--- a/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimore.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimore.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml
index 178a620d..4196746a 100644
--- a/swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipa.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipa.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-16T12:25:43Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
index f05cacbb..382c5338 100644
--- a/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniparthenope.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniparthenope.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-01-11T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
index 5c08b305..186a730e 100644
--- a/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipg.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipg.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-09T12:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
index 7679c96c..af4f3e6d 100644
--- a/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipi.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipi.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-01T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml
index dc942676..2eef538a 100644
--- a/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipv.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipv.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-04-28T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml
index 5d4a4bd0..9112effe 100644
--- a/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniroma3.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniroma3.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml
new file mode 100644
index 00000000..899bac9b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unitedid.org/idp/shibboleth">
+ <!--
+ This is a Shibboleth IdP for United ID.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T11:25:48Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitedid.org</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">United ID</mdui:DisplayName>
+ <mdui:Description xml:lang="en">United ID is a secure, public and privacy-respecting identity provider - sign up for free at https://unitedid.org!</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://unitedid.org/</mdui:InformationURL>
+ <mdui:Logo height="75" width="255">https://unitedid.org/wp-content/themes/unitedid/_inc/images/logo_net_globe_255.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIE9zCCAt+gAwIBAgIJAIRpedgPtmouMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+ BAMTEGlkcC51bml0ZWRpZC5vcmcwHhcNMTQwMzEzMTExNzUzWhcNMjQwMzEwMTEx
+ NzUzWjAbMRkwFwYDVQQDExBpZHAudW5pdGVkaWQub3JnMIICIjANBgkqhkiG9w0B
+ AQEFAAOCAg8AMIICCgKCAgEA06bntaEaQvlAYuAQB8YWyPVhCEpiBVWZ4xU3DlzW
+ ZEiqlBe4PxYJMPxWOgG4+jfBl5+BMTXfs8E7EuDimwllK6toZNJCxd4hStIqUwdO
+ 942YWlzePTlpvZRcsnZRCnGN02lgnQuILaiHdfFrzD8nrxS+TrHJpJT5HqaR//fG
+ s5ym/7swTvEdW2wmMcwcTNr+cyU1ojucYPvifQleGO0253fowddkVBTJ+xihCJ8B
+ QSJP+ReDQ2jL3UxxGV60i77flk4Xj8lLoEDlKZr7Rzv6+Dn1aKLg4wouEL359YhQ
+ iK90DuPiuN+TkXcNt8jzAZT6hDbojVem9Jd1GTMV6KQni/UnF+M3DzmlYFUdI3ey
+ 0qosQgy+lyaLrZXlqzqwrpzUsf8fQgVOoZUH3Tftrp08GmGEJWDjRsk73nNPwc5p
+ NyJwPrZstYxFVnOHSXGlz915FxF1z914JEVL6qiT3c2MCB1kGwyOl0INUaeTa/Jr
+ /KVKNB+DMXMmcHqGav3m25H+MAYhwvRCiaUIKCn4d66J9UNBwnOK3qpcNa0J7HIU
+ mmvbqpdmWrxIpUD9PJb6KPCikfYCN3mmriA+s495NmedXAK3v0vu3If39EesZWxJ
+ zOYTmF/F80lT9ekWWp/pLwDCj3JtrBIeAE4SQUnxP/V5Guun5l1vHsL7SjQLjjI1
+ 7/kCAwEAAaM+MDwwGwYDVR0RBBQwEoIQaWRwLnVuaXRlZGlkLm9yZzAdBgNVHQ4E
+ FgQUzGdk542+Ic0pLn8yjrGQEEhuU0kwDQYJKoZIhvcNAQEFBQADggIBAI3Ie5om
+ G5l7kkN0nZqzDbDfmNcfCDq0G4yj/gkGGWnFbVqEAzrUyc/mjQKGbWhpPAVXhW+6
+ B+F1KDgDLg+Y3k4oeoCXolcLBfD65tpw9v/SWnE+RBlt+WVV0Mh9+m+PoW4bg+hd
+ bygjWO62tHwb5aiLdc7xjboTgjFy2vnnThKBahTr3FwppLhNBtyW/kF6JublrAcI
+ HhZac2br9+jkoCsdBq/2eP2ucYF1Ntjw4SfeX6C8RsHLrA+j8io1F49CKymnCfG3
+ 7dvkJN1+rexjVwCaSzwKMgwkXYy6/FjE9tJ7uUOWqoSDAHzb5lkQBbOYvL0JGfSB
+ Pt6r3Et44VlQH/XUNRKVa8RHaOtzod0fKFVa4rqAnUc0HmMkbp/zbdfgW2TX5iEE
+ fcOeA9aP4laV75vjA2s8p0lHIhUsFYT4sAPInYvtxlQMRC7+You3cQiobjoiiyXE
+ Ph1Jkqsxvt8z/YXgEjKGdddUrx3OSk4Qwhvj929qLOEPEwNd1S25QENyBYjXgOYL
+ 31J9LwGMVlDhBUitW5UFluzpcTshxZJkPJ3k8lbng+9MdPwTY59bmM5dhzWVYNqS
+ wZHUAPn5y2BFPiIc2c1v00i5it6uNp6iIY6OMTXw2zFE0rhlMdzRr1MjJWffb15O
+ gxLJbnzfithSY6IfD2mJgSR6iNnUAIdCD0md
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitedid.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitedid.org/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitedid.org/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.org:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unitedid.org/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitedid.org/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unitedid.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitedid.org/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">unitedid.org</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIE9zCCAt+gAwIBAgIJAIRpedgPtmouMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+ BAMTEGlkcC51bml0ZWRpZC5vcmcwHhcNMTQwMzEzMTExNzUzWhcNMjQwMzEwMTEx
+ NzUzWjAbMRkwFwYDVQQDExBpZHAudW5pdGVkaWQub3JnMIICIjANBgkqhkiG9w0B
+ AQEFAAOCAg8AMIICCgKCAgEA06bntaEaQvlAYuAQB8YWyPVhCEpiBVWZ4xU3DlzW
+ ZEiqlBe4PxYJMPxWOgG4+jfBl5+BMTXfs8E7EuDimwllK6toZNJCxd4hStIqUwdO
+ 942YWlzePTlpvZRcsnZRCnGN02lgnQuILaiHdfFrzD8nrxS+TrHJpJT5HqaR//fG
+ s5ym/7swTvEdW2wmMcwcTNr+cyU1ojucYPvifQleGO0253fowddkVBTJ+xihCJ8B
+ QSJP+ReDQ2jL3UxxGV60i77flk4Xj8lLoEDlKZr7Rzv6+Dn1aKLg4wouEL359YhQ
+ iK90DuPiuN+TkXcNt8jzAZT6hDbojVem9Jd1GTMV6KQni/UnF+M3DzmlYFUdI3ey
+ 0qosQgy+lyaLrZXlqzqwrpzUsf8fQgVOoZUH3Tftrp08GmGEJWDjRsk73nNPwc5p
+ NyJwPrZstYxFVnOHSXGlz915FxF1z914JEVL6qiT3c2MCB1kGwyOl0INUaeTa/Jr
+ /KVKNB+DMXMmcHqGav3m25H+MAYhwvRCiaUIKCn4d66J9UNBwnOK3qpcNa0J7HIU
+ mmvbqpdmWrxIpUD9PJb6KPCikfYCN3mmriA+s495NmedXAK3v0vu3If39EesZWxJ
+ zOYTmF/F80lT9ekWWp/pLwDCj3JtrBIeAE4SQUnxP/V5Guun5l1vHsL7SjQLjjI1
+ 7/kCAwEAAaM+MDwwGwYDVR0RBBQwEoIQaWRwLnVuaXRlZGlkLm9yZzAdBgNVHQ4E
+ FgQUzGdk542+Ic0pLn8yjrGQEEhuU0kwDQYJKoZIhvcNAQEFBQADggIBAI3Ie5om
+ G5l7kkN0nZqzDbDfmNcfCDq0G4yj/gkGGWnFbVqEAzrUyc/mjQKGbWhpPAVXhW+6
+ B+F1KDgDLg+Y3k4oeoCXolcLBfD65tpw9v/SWnE+RBlt+WVV0Mh9+m+PoW4bg+hd
+ bygjWO62tHwb5aiLdc7xjboTgjFy2vnnThKBahTr3FwppLhNBtyW/kF6JublrAcI
+ HhZac2br9+jkoCsdBq/2eP2ucYF1Ntjw4SfeX6C8RsHLrA+j8io1F49CKymnCfG3
+ 7dvkJN1+rexjVwCaSzwKMgwkXYy6/FjE9tJ7uUOWqoSDAHzb5lkQBbOYvL0JGfSB
+ Pt6r3Et44VlQH/XUNRKVa8RHaOtzod0fKFVa4rqAnUc0HmMkbp/zbdfgW2TX5iEE
+ fcOeA9aP4laV75vjA2s8p0lHIhUsFYT4sAPInYvtxlQMRC7+You3cQiobjoiiyXE
+ Ph1Jkqsxvt8z/YXgEjKGdddUrx3OSk4Qwhvj929qLOEPEwNd1S25QENyBYjXgOYL
+ 31J9LwGMVlDhBUitW5UFluzpcTshxZJkPJ3k8lbng+9MdPwTY59bmM5dhzWVYNqS
+ wZHUAPn5y2BFPiIc2c1v00i5it6uNp6iIY6OMTXw2zFE0rhlMdzRr1MjJWffb15O
+ gxLJbnzfithSY6IfD2mJgSR6iNnUAIdCD0md
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitedid.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">United ID</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">United ID</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://unitedid.org/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Support</GivenName>
+ <EmailAddress>mailto:support@unitedid.org</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Leif</GivenName>
+ <SurName>Johansson</SurName>
+ <EmailAddress>mailto:leifj@unitedid.org</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml
index f464f840..3999db91 100644
--- a/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unitn.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unitn.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-30T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml
index 8bdba82e..8ddf1327 100644
--- a/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniurb.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniurb.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-02-23T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml
index 0dbc8750..cfd37311 100644
--- a/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unive.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unive.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml
new file mode 100644
index 00000000..6c99fa94
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univille.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univille.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.univille.edu.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.univille.edu.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxNjA0BgNVBAoULVVOSVZJTExF
+IC0gVW5pdmVyc2lkYWRlIGRhIFJlZ2nDo2RlIEpvaW52aWxsZTEUMBIGA1UECxML
+VEktVW5pdmlsbGUxIjAgBgkqhkiG9w0BCQEWE3Bzc2lsdmFAdW5pdmlsbGUuYnIx
+EjAQBgNVBAcTCUpvaW52aWxsZTEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJ
+BgNVBAYTAkJSMSQwIgYDVQQDExtpZHAudW5pdmlsbGUuYnIudW5pdmlsbGUuYnIw
+HhcNMTUxMDE5MTkwNzI3WhcNMTgxMDE4MTkwNzI3WjCB0jE2MDQGA1UEChQtVU5J
+VklMTEUgLSBVbml2ZXJzaWRhZGUgZGEgUmVnacOjZGUgSm9pbnZpbGxlMRQwEgYD
+VQQLEwtUSS1Vbml2aWxsZTEiMCAGCSqGSIb3DQEJARYTcHNzaWx2YUB1bml2aWxs
+ZS5icjESMBAGA1UEBxMJSm9pbnZpbGxlMRcwFQYDVQQIEw5TYW50YSBDYXRhcmlu
+YTELMAkGA1UEBhMCQlIxJDAiBgNVBAMTG2lkcC51bml2aWxsZS5ici51bml2aWxs
+ZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOBHDxFbBxBna9+g
+XPHHpa7vb+tJQKfisMcCdz0wFQEq0N8izKfYmns8fkrmL2qnDkMSqGsGCPe5pNar
+4+gCfeDMK+S57NvS/z6ccryjN6UpA3yUzm7mNf9K1z9EoBd+aA+wBNGNZKaiaSfo
+yL5w8k7Kny/LbYtybJWDSigS3lrMLmgItFhG1d/CYOiVkn49IrBfdfRI0QfhAZli
+3OE+SjQ5uUUw2HkjCYY1Ju/5euCCD0WaYLT5cZ+iA8I1Cg8ctE+vIRjf3W6zmk48
+8rCr56VX4ZaWWFitME7Y0Zv8N7DfI9znUR6LzWJt7O2AyRjE6i99RTE8bPo93Txk
+e1SiXK8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAhiiZnxvBvcBTS0R7QO1h5ilf
+32hCyZRPjvtqmQpRBG/7Gvex5ONBztABL0yrckkVtalZyntg4w5CdbrkRKC7k8tK
+7/HYVzo49ZQ6FzpAQdLEAhCLA0hY65anEFlifUmClYNtex8gL8dzF8o9yp/Hu0Wm
+K9avfqWDLuk4tC6BxBdgFlIMBv1B4maEGmac3NNGIk6OU1Iboq1TDPA8OkfRFYEf
+qp8r8NBaC+0BzpVtqUu3g8AFM6PJD46g35EzlP8K1hMAqrlsqEZ7IlD2n91XW5J7
+nP4wY1kEldpD1CfHvNSzk1HuF/Q2VHTjUN2sDaQr1y/qhqBEkNiEhDd78YmPVA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univille.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univille.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.univille.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univille.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univille.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univille.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univille.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxNjA0BgNVBAoULVVOSVZJTExF
+IC0gVW5pdmVyc2lkYWRlIGRhIFJlZ2nDo2RlIEpvaW52aWxsZTEUMBIGA1UECxML
+VEktVW5pdmlsbGUxIjAgBgkqhkiG9w0BCQEWE3Bzc2lsdmFAdW5pdmlsbGUuYnIx
+EjAQBgNVBAcTCUpvaW52aWxsZTEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJ
+BgNVBAYTAkJSMSQwIgYDVQQDExtpZHAudW5pdmlsbGUuYnIudW5pdmlsbGUuYnIw
+HhcNMTUxMDE5MTkwNzI3WhcNMTgxMDE4MTkwNzI3WjCB0jE2MDQGA1UEChQtVU5J
+VklMTEUgLSBVbml2ZXJzaWRhZGUgZGEgUmVnacOjZGUgSm9pbnZpbGxlMRQwEgYD
+VQQLEwtUSS1Vbml2aWxsZTEiMCAGCSqGSIb3DQEJARYTcHNzaWx2YUB1bml2aWxs
+ZS5icjESMBAGA1UEBxMJSm9pbnZpbGxlMRcwFQYDVQQIEw5TYW50YSBDYXRhcmlu
+YTELMAkGA1UEBhMCQlIxJDAiBgNVBAMTG2lkcC51bml2aWxsZS5ici51bml2aWxs
+ZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOBHDxFbBxBna9+g
+XPHHpa7vb+tJQKfisMcCdz0wFQEq0N8izKfYmns8fkrmL2qnDkMSqGsGCPe5pNar
+4+gCfeDMK+S57NvS/z6ccryjN6UpA3yUzm7mNf9K1z9EoBd+aA+wBNGNZKaiaSfo
+yL5w8k7Kny/LbYtybJWDSigS3lrMLmgItFhG1d/CYOiVkn49IrBfdfRI0QfhAZli
+3OE+SjQ5uUUw2HkjCYY1Ju/5euCCD0WaYLT5cZ+iA8I1Cg8ctE+vIRjf3W6zmk48
+8rCr56VX4ZaWWFitME7Y0Zv8N7DfI9znUR6LzWJt7O2AyRjE6i99RTE8bPo93Txk
+e1SiXK8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAhiiZnxvBvcBTS0R7QO1h5ilf
+32hCyZRPjvtqmQpRBG/7Gvex5ONBztABL0yrckkVtalZyntg4w5CdbrkRKC7k8tK
+7/HYVzo49ZQ6FzpAQdLEAhCLA0hY65anEFlifUmClYNtex8gL8dzF8o9yp/Hu0Wm
+K9avfqWDLuk4tC6BxBdgFlIMBv1B4maEGmac3NNGIk6OU1Iboq1TDPA8OkfRFYEf
+qp8r8NBaC+0BzpVtqUu3g8AFM6PJD46g35EzlP8K1hMAqrlsqEZ7IlD2n91XW5J7
+nP4wY1kEldpD1CfHvNSzk1HuF/Q2VHTjUN2sDaQr1y/qhqBEkNiEhDd78YmPVA==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univille.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univille.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.univille.edu.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.univille.edu.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Paulo Sergio da Silva</md:SurName>
+ <md:EmailAddress>pssilva@univille.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
index 91170d5b..7d913911 100644
--- a/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
@@ -23,24 +23,29 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDMDCCAhigAwIBAgIVAKF0Ji/vZztY4mCNEZ7pPefws602MA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bm9lc2MuZWR1LmJyMB4XDTEzMDgyMDE0MDU0
-NFoXDTMzMDgyMDE0MDU0NFowHDEaMBgGA1UEAxMRaWRwLnVub2VzYy5lZHUuYnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrzalfKRn2m+07ik20IeYC
-ZRH0VTEHLlWsJpPqWjhcUv6cztdeE5yfHzzmqKpPUj+VROgS8N0WO7ET8v66naDv
-D8XwcJpUsWNTjObGT4ZtsuRe223I/mN9GAlDFW9EyRudEJ9JPkAu94ZWzcv/kX4b
-3m5OQKYPI3nqVnsXObowJhjJeOOPNFAq/uVa2mSSVNcpWgdGbMPcISWoW8mIk+e7
-j6R350cHy+jVmEJLkYorIIgUFAq4v5BXk6tcDUw7Zw+BmoKkSCqTXL6Mne7siSzt
-e4kFRDbrtYgC7xYoqUrbj/LAQE29iHvcci1E6x1hpeX1YssgrkXHSa4sS6bJD+nt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bm9lc2MuZWR1LmJyhihodHRwczov
-L2lkcC51bm9lc2MuZWR1LmJyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSEKtwq
-Me8m63UoHRkKdnyxHXMbfjANBgkqhkiG9w0BAQUFAAOCAQEAQeayBPOHksOEXqL6
-9dMRRhsaJOsmEQV8FLQbED5fkIi+WmBvHZ+OUCzYgnYH391/1iL+/KqmIq2kRXFQ
-L5VjytIJrjGyE+PLuycinRAdWgfzCnV47vXZ5agYjsuPBRFH9EI2j7xcZm/Bao6Q
-EOJQJ1edlst14UuaTuPOFql+3mgcKNoTt7tXJggkehJqkCAV1fl1LC7q3Tnkj/rT
-tOPnCI2V0hFiMzPkuhtDDWd8r3/B/SCuBf/gDkQKTjIMemKKBIsrqGg13A9Br23f
-veKi8jp2UG9e1Ws1DXaGXlkGklegRePCGIKEBaggZ6Y59ZJBOoHGBnq8nodIcqo4
-gjfpFw==
+ MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxOTA3BgNVBAoTMFVOT0VTQyAt
+IFVuaXZlcnNpZGFkZSBkbyBPZXN0ZSBkZSBTYW50YSBDYXRhcmluYTENMAsGA1UE
+CxMEQ1RJQzEtMCsGCSqGSIb3DQEJARYeZmVybmFuZG8uY2VjY2F0b0B1bm9lc2Mu
+ZWR1LmJyMREwDwYDVQQHFAhKb2HDp2FiYTEXMBUGA1UECBMOU2FudGEgQ2F0YXJp
+bmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhqYmEtYXBsLTE0LnVub2VzYy5lZHUu
+YnIwHhcNMTUwNzIyMjE0ODAzWhcNMTgwNzIxMjE0ODAzWjCB1TE5MDcGA1UEChMw
+VU5PRVNDIC0gVW5pdmVyc2lkYWRlIGRvIE9lc3RlIGRlIFNhbnRhIENhdGFyaW5h
+MQ0wCwYDVQQLEwRDVElDMS0wKwYJKoZIhvcNAQkBFh5mZXJuYW5kby5jZWNjYXRv
+QHVub2VzYy5lZHUuYnIxETAPBgNVBAcUCEpvYcOnYWJhMRcwFQYDVQQIEw5TYW50
+YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGGpiYS1hcGwtMTQudW5v
+ZXNjLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOET6cQJ
+E1Z3RWIovqllyeg+dtN5R8IzBOxaiBqiHpcGGnUK1ae6tHtFWcsFkWE+bX4tWhwu
+QNebt+JNA1kUFyWrq6UrVLXV+7rH8yguLkhmj564cQTunQf66ybzKKJ+fLAKq48q
+BXQ+YGHsynPqyru/LTw9LLweuMX9Cdd56i8oybdK64lUaUOMJMuqwC1XgqCeuW5B
+70UBO4Y2PxSYENTfW6NKYUmut5R83oMTvEhZRYj2Gc/yMMfW41uQpx5yyw062v4X
+dyi4V2ltFIb0BAvDR0JuEjHuJ8C+yva+Gzsjt91lj7RWKI7FAl5DUnMZInyuaiDG
+O4jsyeYXAhYdmOECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZAkWFZcajV4djOJ5
+SLZrTh2uS0lXPyQvFB5SHlnPqM2PzsCQhy0zEeu9zKg8quZ8m9kKtuZstSx4T/YI
+I82zgITW+fyFcJMT9aRbPCo9XaODY3qNNK3F2TQv4E7wJnreSoMHIk7ExdrcjR9a
+sYL4uwYNKWcNkTmCrHo2Fmbguin5G8/eIz47LNz8rVPG69jdCIJ5Ia4GMwmc87Uj
+5MNzmJm7UI0NfT0qm/pJTpQXJVt3Nqk0Aq5jepAW17mTKcLUGGN3uamUB1VvuCYK
+9GnuDjQAiKaENGURN1wqr343nhVyd5RteY8piQqqZaXbp+pB2HgvgnUpwbKksuFM
+AKS7wA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -63,24 +68,29 @@ gjfpFw==
<ds:X509Data>
<ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAKF0Ji/vZztY4mCNEZ7pPefws602MA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bm9lc2MuZWR1LmJyMB4XDTEzMDgyMDE0MDU0
-NFoXDTMzMDgyMDE0MDU0NFowHDEaMBgGA1UEAxMRaWRwLnVub2VzYy5lZHUuYnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrzalfKRn2m+07ik20IeYC
-ZRH0VTEHLlWsJpPqWjhcUv6cztdeE5yfHzzmqKpPUj+VROgS8N0WO7ET8v66naDv
-D8XwcJpUsWNTjObGT4ZtsuRe223I/mN9GAlDFW9EyRudEJ9JPkAu94ZWzcv/kX4b
-3m5OQKYPI3nqVnsXObowJhjJeOOPNFAq/uVa2mSSVNcpWgdGbMPcISWoW8mIk+e7
-j6R350cHy+jVmEJLkYorIIgUFAq4v5BXk6tcDUw7Zw+BmoKkSCqTXL6Mne7siSzt
-e4kFRDbrtYgC7xYoqUrbj/LAQE29iHvcci1E6x1hpeX1YssgrkXHSa4sS6bJD+nt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bm9lc2MuZWR1LmJyhihodHRwczov
-L2lkcC51bm9lc2MuZWR1LmJyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSEKtwq
-Me8m63UoHRkKdnyxHXMbfjANBgkqhkiG9w0BAQUFAAOCAQEAQeayBPOHksOEXqL6
-9dMRRhsaJOsmEQV8FLQbED5fkIi+WmBvHZ+OUCzYgnYH391/1iL+/KqmIq2kRXFQ
-L5VjytIJrjGyE+PLuycinRAdWgfzCnV47vXZ5agYjsuPBRFH9EI2j7xcZm/Bao6Q
-EOJQJ1edlst14UuaTuPOFql+3mgcKNoTt7tXJggkehJqkCAV1fl1LC7q3Tnkj/rT
-tOPnCI2V0hFiMzPkuhtDDWd8r3/B/SCuBf/gDkQKTjIMemKKBIsrqGg13A9Br23f
-veKi8jp2UG9e1Ws1DXaGXlkGklegRePCGIKEBaggZ6Y59ZJBOoHGBnq8nodIcqo4
-gjfpFw==
+MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxOTA3BgNVBAoTMFVOT0VTQyAt
+IFVuaXZlcnNpZGFkZSBkbyBPZXN0ZSBkZSBTYW50YSBDYXRhcmluYTENMAsGA1UE
+CxMEQ1RJQzEtMCsGCSqGSIb3DQEJARYeZmVybmFuZG8uY2VjY2F0b0B1bm9lc2Mu
+ZWR1LmJyMREwDwYDVQQHFAhKb2HDp2FiYTEXMBUGA1UECBMOU2FudGEgQ2F0YXJp
+bmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhqYmEtYXBsLTE0LnVub2VzYy5lZHUu
+YnIwHhcNMTUwNzIyMjE0ODAzWhcNMTgwNzIxMjE0ODAzWjCB1TE5MDcGA1UEChMw
+VU5PRVNDIC0gVW5pdmVyc2lkYWRlIGRvIE9lc3RlIGRlIFNhbnRhIENhdGFyaW5h
+MQ0wCwYDVQQLEwRDVElDMS0wKwYJKoZIhvcNAQkBFh5mZXJuYW5kby5jZWNjYXRv
+QHVub2VzYy5lZHUuYnIxETAPBgNVBAcUCEpvYcOnYWJhMRcwFQYDVQQIEw5TYW50
+YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGGpiYS1hcGwtMTQudW5v
+ZXNjLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOET6cQJ
+E1Z3RWIovqllyeg+dtN5R8IzBOxaiBqiHpcGGnUK1ae6tHtFWcsFkWE+bX4tWhwu
+QNebt+JNA1kUFyWrq6UrVLXV+7rH8yguLkhmj564cQTunQf66ybzKKJ+fLAKq48q
+BXQ+YGHsynPqyru/LTw9LLweuMX9Cdd56i8oybdK64lUaUOMJMuqwC1XgqCeuW5B
+70UBO4Y2PxSYENTfW6NKYUmut5R83oMTvEhZRYj2Gc/yMMfW41uQpx5yyw062v4X
+dyi4V2ltFIb0BAvDR0JuEjHuJ8C+yva+Gzsjt91lj7RWKI7FAl5DUnMZInyuaiDG
+O4jsyeYXAhYdmOECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZAkWFZcajV4djOJ5
+SLZrTh2uS0lXPyQvFB5SHlnPqM2PzsCQhy0zEeu9zKg8quZ8m9kKtuZstSx4T/YI
+I82zgITW+fyFcJMT9aRbPCo9XaODY3qNNK3F2TQv4E7wJnreSoMHIk7ExdrcjR9a
+sYL4uwYNKWcNkTmCrHo2Fmbguin5G8/eIz47LNz8rVPG69jdCIJ5Ia4GMwmc87Uj
+5MNzmJm7UI0NfT0qm/pJTpQXJVt3Nqk0Aq5jepAW17mTKcLUGGN3uamUB1VvuCYK
+9GnuDjQAiKaENGURN1wqr343nhVyd5RteY8piQqqZaXbp+pB2HgvgnUpwbKksuFM
+AKS7wA==
</ds:X509Certificate>
</ds:X509Data>
diff --git a/swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..99a2f94f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uom.gr/idp/shibboleth">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uom.gr</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEYTCCA0mgAwIBAgIQC/tCFL3CTrbZoTlo1VwxfTANBgkqhkiG9w0BAQUFADA2
+ MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+ U1NMIENBMB4XDTEzMDYyNTAwMDAwMFoXDTE2MDYyNDIzNTk1OVowODEhMB8GA1UE
+ CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudW9tLmdy
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyH5v2JCiY11y+JirdXYz
+ dJZkF64CowAV/V4H/bOv8MMsUs+wMZ9pPyhkLy3N/ljwMKLnlv1LFRla7UiSD8ap
+ 5oho76dSb0lbF7vSbygHn+qu7VZ+jkdxJ7AuOROeV8rw1DF7HdR4DcRV3eTTSYh/
+ U2hrfSONOFg8gGp4BzZABbNRuyURHga5nBzewcwysGHZ51/bkMhjpbELRNct0aOP
+ uYDSRL/JBfVVdzy5+NvG2Kn0w+aNF0PPbEUfg0DST4penlBWjw1qovZkg3ngYCva
+ /BnhFiuPat9OkztTwJuJobRs4tVFsIaFVUCGKR0bn6TGjQK7dHo4bkpPepj5DBK4
+ HQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
+ HQYDVR0OBBYEFBjSV9NjXnP/58dSjdtwTtmSBMZoMA4GA1UdDwEB/wQEAwIFoDAM
+ BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
+ HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
+ hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+ BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+ cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+ dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudW9tLmdyMA0GCSqGSIb3DQEBBQUA
+ A4IBAQBOGyswia2sol7gb0lITR9Gzzl3xA7yO5cgDF8epjphTcrJnZeg1k9vINwQ
+ m2DJTS8rOgINEz5T9NJt5v00HylSmgWV6MuGJ0INdPrzZi5tEfJx4d+UenXTmYey
+ 20ISTUUbW4DDswkWUrV1i7v7fNb2lmdMgXfmeqYdm66OqtmICF+an4gvSxyAxJm/
+ eLBuMGQtAWZ9iFE/KgXrPuAjNqrF9rBoEEgF4nPiu+dyP3eA9NS54RqRBQsrKTBj
+ +u6JbdZYW2zUWzUzRyyK1eCgXYNIswNFuTQ7ANWxIf/q8kk8SLv7Vdq/P1i+3PVk
+ sEP9QjFH5i9IJ+q4yVNeiQgEPT2+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uom.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uom.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uom.gr/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uom.gr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uom.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uom.gr/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uom.gr</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEYTCCA0mgAwIBAgIQC/tCFL3CTrbZoTlo1VwxfTANBgkqhkiG9w0BAQUFADA2
+ MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+ U1NMIENBMB4XDTEzMDYyNTAwMDAwMFoXDTE2MDYyNDIzNTk1OVowODEhMB8GA1UE
+ CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudW9tLmdy
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyH5v2JCiY11y+JirdXYz
+ dJZkF64CowAV/V4H/bOv8MMsUs+wMZ9pPyhkLy3N/ljwMKLnlv1LFRla7UiSD8ap
+ 5oho76dSb0lbF7vSbygHn+qu7VZ+jkdxJ7AuOROeV8rw1DF7HdR4DcRV3eTTSYh/
+ U2hrfSONOFg8gGp4BzZABbNRuyURHga5nBzewcwysGHZ51/bkMhjpbELRNct0aOP
+ uYDSRL/JBfVVdzy5+NvG2Kn0w+aNF0PPbEUfg0DST4penlBWjw1qovZkg3ngYCva
+ /BnhFiuPat9OkztTwJuJobRs4tVFsIaFVUCGKR0bn6TGjQK7dHo4bkpPepj5DBK4
+ HQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
+ HQYDVR0OBBYEFBjSV9NjXnP/58dSjdtwTtmSBMZoMA4GA1UdDwEB/wQEAwIFoDAM
+ BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
+ HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
+ hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+ BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+ cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+ dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudW9tLmdyMA0GCSqGSIb3DQEBBQUA
+ A4IBAQBOGyswia2sol7gb0lITR9Gzzl3xA7yO5cgDF8epjphTcrJnZeg1k9vINwQ
+ m2DJTS8rOgINEz5T9NJt5v00HylSmgWV6MuGJ0INdPrzZi5tEfJx4d+UenXTmYey
+ 20ISTUUbW4DDswkWUrV1i7v7fNb2lmdMgXfmeqYdm66OqtmICF+an4gvSxyAxJm/
+ eLBuMGQtAWZ9iFE/KgXrPuAjNqrF9rBoEEgF4nPiu+dyP3eA9NS54RqRBQsrKTBj
+ +u6JbdZYW2zUWzUzRyyK1eCgXYNIswNFuTQ7ANWxIf/q8kk8SLv7Vdq/P1i+3PVk
+ sEP9QjFH5i9IJ+q4yVNeiQgEPT2+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uom.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uom.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University of Macedonia</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">Πανεπιστήμιο Μακεδονίας</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University of Macedonia</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Μακεδονίας</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uom.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.uom.gr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Aspa</md:GivenName>
+ <md:SurName>Tsakiridou</md:SurName>
+ <md:EmailAddress>aspa@uom.gr</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>University of Macedonia NOC</md:Company>
+ <md:EmailAddress>noc@noc.uom.gr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..34f59338
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vfu.cz/idp/shibboleth">
+ <md:Extensions>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-12-17T11:13:02Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfu.cz</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for employees and students of University of Veterinary and Pharmaceutical Sciences Brno.</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Veterinární a farmaceutické univerzity Brno.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.vfu.cz/index_en.html</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://www.vfu.cz/</mdui:InformationURL>
+ <mdui:Logo height="40" width="40">https://idp.vfu.cz/vfu_logo_40x40.jpg</mdui:Logo>
+ <mdui:Logo height="50" width="50">https://idp.vfu.cz/vfu_logo_50x50.jpg</mdui:Logo>
+ <mdui:Logo height="101" width="100">https://idp.vfu.cz/vfu_logo_100x101.jpg</mdui:Logo>
+ <mdui:Logo height="203" width="200">https://idp.vfu.cz/vfu_logo_200x203.jpg</mdui:Logo>
+ <mdui:Logo height="407" width="400">https://idp.vfu.cz/vfu_logo_400x407.jpg</mdui:Logo>
+ <mdui:Logo height="814" width="800">https://idp.vfu.cz/vfu_logo_800x814.jpg</mdui:Logo>
+ <mdui:Logo height="3238" width="3182">https://idp.vfu.cz/vfu_logo_3182x3238.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVANp/jeTWFQlkALd2zvuQM0NNal7QMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
+MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAj+iqNpJyp61VIUE+Uiuf70mpL3M+abjmqVPR8/XD
+OvsRiGwVCJTdYSjAKzEofzo7x8St/RB9yLqQJiPQ+ooTnJ661FjrCNrq714DYZh8
+pjEz0ybzWR0ATIUz4WYBEeFHgVX2KZjUrCsw5x51xTppIHSKtlH1aUt8Xy/TbMV/
+CVuouE5oSMJrjgwQOU+4AnGT3XV5EH1u9WlSbGtG/DRzGo61emww8GXu4srsPetx
+i8wEgeWbCxQ4Gwe7EZmpEPa1cCBSFFh6DJ6pH8HO0wcDs38YxhLBMtdDEkscilBK
+XEsIYkn/7lfLxgx7ixr+iCxc04DiZxHacWi+KaGThblWQQIDAQABo1swWTAdBgNV
+HQ4EFgQUZsHdPToEdg76yRcx9wzG0GW/nVYwOAYDVR0RBDEwL4IKaWRwLnZmdS5j
+eoYhaHR0cHM6Ly9pZHAudmZ1LmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQCNVAy1JdEkvnY9bJetr9ZXFxRaiuQoLrlkGAxGt3OibQJQ4zZvHibr
+YlUhbTEHXNjlThfwL90Rd65ikw3rPa3l/6zV5+Z9SqKykuKHfn+SjCW4XRF0Qhr9
+B6S7XyKMQK+QnZmN44IS+5ZtGpydEwduCv8uWuQI5vaq3NDJ0dUiBWPDh0SKIEH9
+SGRzwuLfThykPFAGd/HjzGGvkeYmhY0J3XmtvlXBgMNVgWO3eJun6lVDwFLLX/fT
+4zcd0uNIaHCPalZni/fJJZZ1OnpqGCcojEkbSZuSNj63zJpRIbX8+2Suwit2C8pR
+OCIUB28HPQitwXyHjHKbbja76a/IB8id
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUZ9X/+ig6ipqz5tuTFlWeaseDk1gwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLnZmdS5jejAeFw0xNTExMTExNDMxMzhaFw0zNTEx
+MTExNDMxMzhaMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCd944PWmJDHy0+mNrQ9kH/cd6dJCNzHDWngw4WPmPf
+gzpJJobllCpvfMi0aW7ZdwbVun4otm70w8WhXBITYDcagXPdZX32CTx+5uCBmzPL
+WWp/W/AA9jIYvpygPUB1torPYt+WGP2kt5MNFkN8yN+XWr520jiPaZ5Aqqomkezl
+SwFbHD4pCYKxN11A/JFkNRlZjFIe9mdMOEecvRCSdPewfYkEEyEzVgX2ID2j22KD
+OSIaEIdqoAjoqye9YNIPtS5+Q4Ut7pQBRdc6l8rPBOlb66okxotf8McbPW6NV0tX
+U/kESRZxlr1vtBAirs9aFP0S9YkRx5Gbf8h0SiiK88QVAgMBAAGjWzBZMB0GA1Ud
+DgQWBBSBB7uc02LKj3kiKpQj57O25TZOWTA4BgNVHREEMTAvggppZHAudmZ1LmN6
+hiFodHRwczovL2lkcC52ZnUuY3ovaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBABrhb7FN/oWizvVpDZRqTdW87x/I2A4AQhDDMT2Xh4VEBveP3H4agIs1
+PmPQW8cAgr+SyvXpgN4hpC9xm5dE1GE+dT/2EK4QnAGogldwn5m9BjXc3okEyg46
+Of1COpKLZexcbN4i2JC6sUq3w96yNX0/WZCRbiye5+zVquovphOqL0t7PkOPMMqK
+fDtx0zOl6SCJB7cSVQd9BqvzWfT+/hUZiLlvrE88tIWLQatUC+Frjw9c+z9EcZ+B
+4VMcjUyqivNpcfjuHHAgimF0xW5eazK4lB9f76dgJNvhm0r4VcmuluOhzDDc8HV7
+11vR6XmJ2seiNk9k1bKJnEqIqWW7y9Y=
+ </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>
+MIIDFDCCAfygAwIBAgIVALawx1psOeuNB/Q2nKO0A/D3JVB/MA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
+MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtwMyNgUHQbL2qrspcFBtqMyqYn9A2hGR5RB/vzX0
+i4TdZqE23R5IPgi8OCVrI/PDZBqF0pNA/Y7GY0YlLbw/0g/lnVYuUq1W+E8i1v9C
++/DsD8G3K1xMerC/q3JVt7ukPDN+SJJp6DP/lAoKWYATUDq8ERm1BKIw2PBhiDCg
+13AfaVymOdbfWMZqtQp53fVCRnNiD5zHdmzK4z65zj1e4EOLrJaGqe3O2XUzJxrv
+8NNGNF2dZdHZ5tS5lyY0n65wPIPOyE8CI+uryYy26LxE8HxX4blcyoQwR9SWxG1B
+eRroPi1gtqJwAfEjheI45uCHUEWDwq3Sh6z6VlYxukotDwIDAQABo1swWTAdBgNV
+HQ4EFgQUTqnt/OEAflr2PGNfD7bji3eG54EwOAYDVR0RBDEwL4IKaWRwLnZmdS5j
+eoYhaHR0cHM6Ly9pZHAudmZ1LmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQAIs7X2dSUVS8wc+UsDNYrXtiAouHGoqdaZDJgig9GVK4HPZLlIZbz4
+JJZ/82N9ySsUMv/yt6fG/NtamnaSBWw8wd+3ICdCALEgH05OoJyqIX9GJPqcxPKX
+0v2J4xtzNVACyxxy7fbu0fxxU9EqgMehL0tRaZAjZBYubZZoT/2CXSPIJ3PCk7RZ
+Ms37IJpACqCJ0i8oQ1KTYqoUZFOigzdFv3O3pa7EjcHUI4KBtSlUADvG7x9G+EQS
+QzbFdRvuJ9SzN5kZ8Cv2hZUdLhp8/GsBO7mWqv5AlYT92fk3aSxXI86nzbAYkPNX
+2VD3vAL+nYSRZTKDTCV0dFKXgixuQNQX
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vfu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vfu.cz/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vfu.cz/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vfu.cz/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vfu.cz/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vfu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vfu.cz/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfu.cz</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVANp/jeTWFQlkALd2zvuQM0NNal7QMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
+MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAj+iqNpJyp61VIUE+Uiuf70mpL3M+abjmqVPR8/XD
+OvsRiGwVCJTdYSjAKzEofzo7x8St/RB9yLqQJiPQ+ooTnJ661FjrCNrq714DYZh8
+pjEz0ybzWR0ATIUz4WYBEeFHgVX2KZjUrCsw5x51xTppIHSKtlH1aUt8Xy/TbMV/
+CVuouE5oSMJrjgwQOU+4AnGT3XV5EH1u9WlSbGtG/DRzGo61emww8GXu4srsPetx
+i8wEgeWbCxQ4Gwe7EZmpEPa1cCBSFFh6DJ6pH8HO0wcDs38YxhLBMtdDEkscilBK
+XEsIYkn/7lfLxgx7ixr+iCxc04DiZxHacWi+KaGThblWQQIDAQABo1swWTAdBgNV
+HQ4EFgQUZsHdPToEdg76yRcx9wzG0GW/nVYwOAYDVR0RBDEwL4IKaWRwLnZmdS5j
+eoYhaHR0cHM6Ly9pZHAudmZ1LmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQCNVAy1JdEkvnY9bJetr9ZXFxRaiuQoLrlkGAxGt3OibQJQ4zZvHibr
+YlUhbTEHXNjlThfwL90Rd65ikw3rPa3l/6zV5+Z9SqKykuKHfn+SjCW4XRF0Qhr9
+B6S7XyKMQK+QnZmN44IS+5ZtGpydEwduCv8uWuQI5vaq3NDJ0dUiBWPDh0SKIEH9
+SGRzwuLfThykPFAGd/HjzGGvkeYmhY0J3XmtvlXBgMNVgWO3eJun6lVDwFLLX/fT
+4zcd0uNIaHCPalZni/fJJZZ1OnpqGCcojEkbSZuSNj63zJpRIbX8+2Suwit2C8pR
+OCIUB28HPQitwXyHjHKbbja76a/IB8id
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUZ9X/+ig6ipqz5tuTFlWeaseDk1gwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaWRwLnZmdS5jejAeFw0xNTExMTExNDMxMzhaFw0zNTEx
+MTExNDMxMzhaMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCd944PWmJDHy0+mNrQ9kH/cd6dJCNzHDWngw4WPmPf
+gzpJJobllCpvfMi0aW7ZdwbVun4otm70w8WhXBITYDcagXPdZX32CTx+5uCBmzPL
+WWp/W/AA9jIYvpygPUB1torPYt+WGP2kt5MNFkN8yN+XWr520jiPaZ5Aqqomkezl
+SwFbHD4pCYKxN11A/JFkNRlZjFIe9mdMOEecvRCSdPewfYkEEyEzVgX2ID2j22KD
+OSIaEIdqoAjoqye9YNIPtS5+Q4Ut7pQBRdc6l8rPBOlb66okxotf8McbPW6NV0tX
+U/kESRZxlr1vtBAirs9aFP0S9YkRx5Gbf8h0SiiK88QVAgMBAAGjWzBZMB0GA1Ud
+DgQWBBSBB7uc02LKj3kiKpQj57O25TZOWTA4BgNVHREEMTAvggppZHAudmZ1LmN6
+hiFodHRwczovL2lkcC52ZnUuY3ovaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBABrhb7FN/oWizvVpDZRqTdW87x/I2A4AQhDDMT2Xh4VEBveP3H4agIs1
+PmPQW8cAgr+SyvXpgN4hpC9xm5dE1GE+dT/2EK4QnAGogldwn5m9BjXc3okEyg46
+Of1COpKLZexcbN4i2JC6sUq3w96yNX0/WZCRbiye5+zVquovphOqL0t7PkOPMMqK
+fDtx0zOl6SCJB7cSVQd9BqvzWfT+/hUZiLlvrE88tIWLQatUC+Frjw9c+z9EcZ+B
+4VMcjUyqivNpcfjuHHAgimF0xW5eazK4lB9f76dgJNvhm0r4VcmuluOhzDDc8HV7
+11vR6XmJ2seiNk9k1bKJnEqIqWW7y9Y=
+ </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>
+MIIDFDCCAfygAwIBAgIVALawx1psOeuNB/Q2nKO0A/D3JVB/MA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
+MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtwMyNgUHQbL2qrspcFBtqMyqYn9A2hGR5RB/vzX0
+i4TdZqE23R5IPgi8OCVrI/PDZBqF0pNA/Y7GY0YlLbw/0g/lnVYuUq1W+E8i1v9C
++/DsD8G3K1xMerC/q3JVt7ukPDN+SJJp6DP/lAoKWYATUDq8ERm1BKIw2PBhiDCg
+13AfaVymOdbfWMZqtQp53fVCRnNiD5zHdmzK4z65zj1e4EOLrJaGqe3O2XUzJxrv
+8NNGNF2dZdHZ5tS5lyY0n65wPIPOyE8CI+uryYy26LxE8HxX4blcyoQwR9SWxG1B
+eRroPi1gtqJwAfEjheI45uCHUEWDwq3Sh6z6VlYxukotDwIDAQABo1swWTAdBgNV
+HQ4EFgQUTqnt/OEAflr2PGNfD7bji3eG54EwOAYDVR0RBDEwL4IKaWRwLnZmdS5j
+eoYhaHR0cHM6Ly9pZHAudmZ1LmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQAIs7X2dSUVS8wc+UsDNYrXtiAouHGoqdaZDJgig9GVK4HPZLlIZbz4
+JJZ/82N9ySsUMv/yt6fG/NtamnaSBWw8wd+3ICdCALEgH05OoJyqIX9GJPqcxPKX
+0v2J4xtzNVACyxxy7fbu0fxxU9EqgMehL0tRaZAjZBYubZZoT/2CXSPIJ3PCk7RZ
+Ms37IJpACqCJ0i8oQ1KTYqoUZFOigzdFv3O3pa7EjcHUI4KBtSlUADvG7x9G+EQS
+QzbFdRvuJ9SzN5kZ8Cv2hZUdLhp8/GsBO7mWqv5AlYT92fk3aSxXI86nzbAYkPNX
+2VD3vAL+nYSRZTKDTCV0dFKXgixuQNQX
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vfu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.vfu.cz/index_en.html</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://www.vfu.cz/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Ladislav</md:GivenName>
+ <md:SurName>Žůrek</md:SurName>
+ <md:EmailAddress>zurekl@vfu.cz</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Petr</md:GivenName>
+ <md:SurName>Čejka</md:SurName>
+ <md:EmailAddress>cejkap@vfu.cz</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Ondřej</md:GivenName>
+ <md:SurName>Doležal</md:SurName>
+ <md:EmailAddress>dolezalo@vfu.cz</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..3257771d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vle.ase.md/saml/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-08-10T06:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://idp.vle.ase.md/index.php/Policy</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:Logo height="81" width="272">https://idp.vle.ase.md/resources/asem-sso-en.png</mdui:Logo>
+ <mdui:Logo height="81" width="272" xml:lang="ro">https://idp.vle.ase.md/resources/asem-sso-ro.png</mdui:Logo>
+ <mdui:Logo height="81" width="272" xml:lang="ru">https://idp.vle.ase.md/resources/asem-sso-ru.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:GeolocationHint>geo:47.030450,28.836156</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFZTCCA02gAwIBAgIDEVG6MA0GCSqGSIb3DQEBDQUAMHkxEDAOBgNVBAoTB1Jv
+b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
+Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
+dEBjYWNlcnQub3JnMB4XDTE1MTAyMzA4MTAwNloXDTE2MDQyMDA4MTAwNlowGTEX
+MBUGA1UEAxMOaWRwLnZsZS5hc2UubWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCWd2hT7YtAEVO5grRRC9k+j+xC74pLHqwZhcTnAUT+iWRzEsHnkomf
+zV4MZkOCo7nhe/bxmdSMqMCFHCCdzbV9POoI2HIaw1qxzQS092XkLnkDU7gx8va0
+r06qgV84K0tmXZmncahg/moO5hyFDv033cNnJbhA1TK0dDqmi0lqmJx5pwTlPiKQ
+QB1MU7CjCo7yNUGHigO7434CxCneSd5vCzs/AdflZOe2RtRMpCSStjvUbNPElFIp
+5uWJU5OB6R0WjSMxHSNIYNE3/Ip+XoroVKTGlUkCtbgUgvch8SL5wp6Aij73tV2S
+zs7GHlaXfTIwZGdeTs6oaAFgnGbhvA/BAgMBAAGjggFUMIIBUDAMBgNVHRMBAf8E
+AjAAMA4GA1UdDwEB/wQEAwIDqDA0BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUH
+AwEGCWCGSAGG+EIEAQYKKwYBBAGCNwoDAzAzBggrBgEFBQcBAQQnMCUwIwYIKwYB
+BQUHMAGGF2h0dHA6Ly9vY3NwLmNhY2VydC5vcmcvMDEGA1UdHwQqMCgwJqAkoCKG
+IGh0dHA6Ly9jcmwuY2FjZXJ0Lm9yZy9yZXZva2UuY3JsMIGRBgNVHREEgYkwgYaC
+DmlkcC52bGUuYXNlLm1koBwGCCsGAQUFBwgFoBAMDmlkcC52bGUuYXNlLm1kgg1k
+cy52bGUuYXNlLm1koBsGCCsGAQUFBwgFoA8MDWRzLnZsZS5hc2UubWSCDXNwLnZs
+ZS5hc2UubWSgGwYIKwYBBQUHCAWgDwwNc3AudmxlLmFzZS5tZDANBgkqhkiG9w0B
+AQ0FAAOCAgEAjEVbq97cWlXvWcXQ35scGZBokCJsC2wUWRfsNNNiMdaf0JRY4yy1
+K/0QeldTHpOxtuSKKXFsD3zxEIqcpunjy+S89447jhOiVVIiKCDAFgLZ4WDGC5J4
+MJRQ3x++1cTTQcanqQhvRiVK2+ArKLSQECRg36Yvj33WB4bW+kTGP3GhPhsNjV5k
+WfR6pSl76PizTSlV8NTUsbuwjYndr0l/IKiP6MhlEM1Yn2c5B/33uSb6z2biZnrj
+qn8yL/Xp9rHvE6EDDhDQqFunf851/PS+x09hYXBxLJs5v0UM1hOt0iMpSSnzRik/
+1HEsjqyaHDd0RB40HsymK/dpOPVcXDxN2hxZJ/uJH5oI8//vI3/w1I7JoZAWyzOw
+pZgXva0Th/zXH38FAiYVYDRg6zlo/2xTmR8WtVePSI0kc7KdwPSiVJsmHtfdwneX
+2FufXU/BZ3hSkZiz5REqzDOatIJAnGDheGtBm7Q9Pg7NvIVxY30M9Z05ipYH6K17
+QnPy+dhmQa7N0+cQxp11ZAWkXlQLiSmXw6Gl0D0EyPRqVNgMdczxGdh788HeEkZ8
+yFVIbkHIGG5XzYr+WWSruiL2nTBSUUxlJ1KcnNi9cXB+C8x035liGAHum4r/9mWX
+FgwNRRDAxUA5evPsUY0hEzSgPKTBuTJcIMnWBGFyok/4uNeG1seO/ks=
+</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>
+MIIFZTCCA02gAwIBAgIDEVG6MA0GCSqGSIb3DQEBDQUAMHkxEDAOBgNVBAoTB1Jv
+b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
+Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
+dEBjYWNlcnQub3JnMB4XDTE1MTAyMzA4MTAwNloXDTE2MDQyMDA4MTAwNlowGTEX
+MBUGA1UEAxMOaWRwLnZsZS5hc2UubWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCWd2hT7YtAEVO5grRRC9k+j+xC74pLHqwZhcTnAUT+iWRzEsHnkomf
+zV4MZkOCo7nhe/bxmdSMqMCFHCCdzbV9POoI2HIaw1qxzQS092XkLnkDU7gx8va0
+r06qgV84K0tmXZmncahg/moO5hyFDv033cNnJbhA1TK0dDqmi0lqmJx5pwTlPiKQ
+QB1MU7CjCo7yNUGHigO7434CxCneSd5vCzs/AdflZOe2RtRMpCSStjvUbNPElFIp
+5uWJU5OB6R0WjSMxHSNIYNE3/Ip+XoroVKTGlUkCtbgUgvch8SL5wp6Aij73tV2S
+zs7GHlaXfTIwZGdeTs6oaAFgnGbhvA/BAgMBAAGjggFUMIIBUDAMBgNVHRMBAf8E
+AjAAMA4GA1UdDwEB/wQEAwIDqDA0BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUH
+AwEGCWCGSAGG+EIEAQYKKwYBBAGCNwoDAzAzBggrBgEFBQcBAQQnMCUwIwYIKwYB
+BQUHMAGGF2h0dHA6Ly9vY3NwLmNhY2VydC5vcmcvMDEGA1UdHwQqMCgwJqAkoCKG
+IGh0dHA6Ly9jcmwuY2FjZXJ0Lm9yZy9yZXZva2UuY3JsMIGRBgNVHREEgYkwgYaC
+DmlkcC52bGUuYXNlLm1koBwGCCsGAQUFBwgFoBAMDmlkcC52bGUuYXNlLm1kgg1k
+cy52bGUuYXNlLm1koBsGCCsGAQUFBwgFoA8MDWRzLnZsZS5hc2UubWSCDXNwLnZs
+ZS5hc2UubWSgGwYIKwYBBQUHCAWgDwwNc3AudmxlLmFzZS5tZDANBgkqhkiG9w0B
+AQ0FAAOCAgEAjEVbq97cWlXvWcXQ35scGZBokCJsC2wUWRfsNNNiMdaf0JRY4yy1
+K/0QeldTHpOxtuSKKXFsD3zxEIqcpunjy+S89447jhOiVVIiKCDAFgLZ4WDGC5J4
+MJRQ3x++1cTTQcanqQhvRiVK2+ArKLSQECRg36Yvj33WB4bW+kTGP3GhPhsNjV5k
+WfR6pSl76PizTSlV8NTUsbuwjYndr0l/IKiP6MhlEM1Yn2c5B/33uSb6z2biZnrj
+qn8yL/Xp9rHvE6EDDhDQqFunf851/PS+x09hYXBxLJs5v0UM1hOt0iMpSSnzRik/
+1HEsjqyaHDd0RB40HsymK/dpOPVcXDxN2hxZJ/uJH5oI8//vI3/w1I7JoZAWyzOw
+pZgXva0Th/zXH38FAiYVYDRg6zlo/2xTmR8WtVePSI0kc7KdwPSiVJsmHtfdwneX
+2FufXU/BZ3hSkZiz5REqzDOatIJAnGDheGtBm7Q9Pg7NvIVxY30M9Z05ipYH6K17
+QnPy+dhmQa7N0+cQxp11ZAWkXlQLiSmXw6Gl0D0EyPRqVNgMdczxGdh788HeEkZ8
+yFVIbkHIGG5XzYr+WWSruiL2nTBSUUxlJ1KcnNi9cXB+C8x035liGAHum4r/9mWX
+FgwNRRDAxUA5evPsUY0hEzSgPKTBuTJcIMnWBGFyok/4uNeG1seO/ks=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vle.ase.md/saml/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vle.ase.md/saml/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="ro">Academia de Studii Economice din Moldova</md:OrganizationName>
+ <md:OrganizationName xml:lang="ru">Молдавская Экономическая Академия</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Academy of Economic Studies of Moldova</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="ro">ASEM</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="ru">МЭА</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">AESM</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="ro">http://ase.md</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://ase.md</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Constantin</md:GivenName>
+ <md:SurName>Sclifos</md:SurName>
+ <md:EmailAddress>mailto:sclifcon@vle.ase.md</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml
index 96fdf52e..3625e334 100644
--- a/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml
@@ -102,8 +102,8 @@ IfN31Zc1iB2M7lKMIc7i9VqM+5TXp4mrJwTyl0u20ITLhxu1SNgyZyeQXMHLD8Bl
<md:OrganizationName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="de">Veterinärmedizinische Universität Wien</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="de">http://www.vu-wien.ac.at/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.vu-wien.ac.at/en/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="de">http://www.vetmeduni.ac.at/de/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.vetmeduni.ac.at/en/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
<md:GivenName>Wolfgang</md:GivenName>
diff --git a/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml
index 0568acce..96ac26c0 100644
--- a/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp01.ogs.trieste.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp01.ogs.trieste.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-11-19T18:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">
diff --git a/swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..e00c33af
--- /dev/null
+++ b/swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp02.ifc.edu.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">IFC - Instituto Federal Catarinense</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IFC - Instituto Federal Catarinense</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ifc.edu.br</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ifc.edu.br</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxLDAqBgNVBAoTI0lGQyAtIElu
+c3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQwwCgYDVQQLEwNEVEkxHjAcBgkq
+hkiG9w0BCQEWD2NpcnRAaWZjLmVkdS5icjERMA8GA1UEBxMIQmx1bWVuYXUxFzAV
+BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRw
+MDIuaWZjLmVkdS5icjAeFw0xNTA5MDQxMjQyNTdaFw0xODA5MDMxMjQyNTdaMIGw
+MSwwKgYDVQQKEyNJRkMgLSBJbnN0aXR1dG8gRmVkZXJhbCBDYXRhcmluZW5zZTEM
+MAoGA1UECxMDRFRJMR4wHAYJKoZIhvcNAQkBFg9jaXJ0QGlmYy5lZHUuYnIxETAP
+BgNVBAcTCEJsdW1lbmF1MRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UE
+BhMCQlIxGTAXBgNVBAMTEGlkcDAyLmlmYy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC8FP6O2mSRACAJf66lHBAuk29vYyrwlFR4ixQLS8tn
+bSm+f2U1156R9wwUEV3gpSGvECuWpHAKoGxW18FgtkOYVducNXVipT29kKHXngj3
+Zuij8MJ6byNSQsrM9noxQVVKHaLHzE9OlS/GfHCa0ZUz0L1mVZtpKEWn1v6Krq4M
+jxoyY9Yb8ftHCWNx1Ahya8hrt/WexX9/dfK2wRkqPTUsGdU8Ey0lD6/3aXVDFYjQ
+wMATh5VeHKMdICj7z3+2qR11Syz4xEuIB5tvEdweVUzWrfl36WGGOu/hZGAS3pbg
+QRjdbl7aFc3ZoKJj8yA9hzVIg66OsCUC6Nw8CA5btSjXAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAAJ9GCV4KUP+lD25i/aqkqCPZ1fax3+KxExMGW/OVgl+50CVu80w
+sp2+PpQm9IBTO0gGq2kmqPMsYn9DSGRVYcjmAwBLR9mgN3l5pJ5Jq0dQnzQiAEeJ
+7ZLlejVj/jRVzinyAyrZPivzA8lJ4liPdkID6qtgVuaBW9Xr4YR7z2Jr9d1ppt+1
+zguX/6l7wtLQBVd/WJghECX7cLt1JzhmiKDLn/ib4/44BRf5TfVGHNmdikee7xYZ
+yywikHxhzaAW7q+tPCGAMCJWIjPX3fGDSGQIsGXSF87WTdg5S8+Eudlsh1Q/NQN3
+MbzxH0b+Clvd+lg7zzt4d6FadoYsR3FYh0A=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp02.ifc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp02.ifc.edu.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp02.ifc.edu.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp02.ifc.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxLDAqBgNVBAoTI0lGQyAtIElu
+c3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQwwCgYDVQQLEwNEVEkxHjAcBgkq
+hkiG9w0BCQEWD2NpcnRAaWZjLmVkdS5icjERMA8GA1UEBxMIQmx1bWVuYXUxFzAV
+BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRw
+MDIuaWZjLmVkdS5icjAeFw0xNTA5MDQxMjQyNTdaFw0xODA5MDMxMjQyNTdaMIGw
+MSwwKgYDVQQKEyNJRkMgLSBJbnN0aXR1dG8gRmVkZXJhbCBDYXRhcmluZW5zZTEM
+MAoGA1UECxMDRFRJMR4wHAYJKoZIhvcNAQkBFg9jaXJ0QGlmYy5lZHUuYnIxETAP
+BgNVBAcTCEJsdW1lbmF1MRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UE
+BhMCQlIxGTAXBgNVBAMTEGlkcDAyLmlmYy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC8FP6O2mSRACAJf66lHBAuk29vYyrwlFR4ixQLS8tn
+bSm+f2U1156R9wwUEV3gpSGvECuWpHAKoGxW18FgtkOYVducNXVipT29kKHXngj3
+Zuij8MJ6byNSQsrM9noxQVVKHaLHzE9OlS/GfHCa0ZUz0L1mVZtpKEWn1v6Krq4M
+jxoyY9Yb8ftHCWNx1Ahya8hrt/WexX9/dfK2wRkqPTUsGdU8Ey0lD6/3aXVDFYjQ
+wMATh5VeHKMdICj7z3+2qR11Syz4xEuIB5tvEdweVUzWrfl36WGGOu/hZGAS3pbg
+QRjdbl7aFc3ZoKJj8yA9hzVIg66OsCUC6Nw8CA5btSjXAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAAJ9GCV4KUP+lD25i/aqkqCPZ1fax3+KxExMGW/OVgl+50CVu80w
+sp2+PpQm9IBTO0gGq2kmqPMsYn9DSGRVYcjmAwBLR9mgN3l5pJ5Jq0dQnzQiAEeJ
+7ZLlejVj/jRVzinyAyrZPivzA8lJ4liPdkID6qtgVuaBW9Xr4YR7z2Jr9d1ppt+1
+zguX/6l7wtLQBVd/WJghECX7cLt1JzhmiKDLn/ib4/44BRf5TfVGHNmdikee7xYZ
+yywikHxhzaAW7q+tPCGAMCJWIjPX3fGDSGQIsGXSF87WTdg5S8+Eudlsh1Q/NQN3
+MbzxH0b+Clvd+lg7zzt4d6FadoYsR3FYh0A=
+
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">IFC - Instituto Federal Catarinense</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">IFC - Instituto Federal Catarinense</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">IFC - Instituto Federal Catarinense</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ifc.edu.br</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.ifc.edu.br</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Marcos Malfatti</md:SurName>
+ <md:EmailAddress>cirt@ifc.edu.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
index b977698c..2e674f68 100644
--- a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
@@ -11,6 +11,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix-marseille.fr</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">CROUS Aix Marseille</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAACKElEQVR42k1STWsUQRCtqp6P3ZlNNCuKCSRuNkeFaNQ9RkxQcE+KqAiCiAavQkTUgwQhguLXvzAegl5EDxH/gejBUzY3D0aISNaZ2dmd7rKmJ5ukDg1V/erVq+6HYIMADEAFYFGFF8k3/eKySR/qKAJAALZFhH5yFt37KqijItgJ6Vxj/UTHn7lXwFABaIA7VHqgAkGkUkLcbmDmksW90MkzkwgXCfoMuoLuAMQWzbtCUtEjV/MqmAZHBtIQYM6NaJgdQRdCJSifI6ljr0T3ghPKkvhahefJR7uiEELOStwVaRpLYSFbigZYAS7pFH+6VWM5C8mCNr2OMzpKA4PdH9+2ePKTDGQamIxAizXzuWiyrho5GFy7QvVhf+Z0uXkuuHzJa5x0TxwtN5t7b92kHMcFN4I2YHpABFpzp+Mdn1LjY/7sKX92unL7hjd5JJy7biXJDEA2Bish+p7Z2PCmjklbttoCw6pey1bX1Miw/rUOtTF8pcIL5BMhdxO/0XAnD3e/fnfGD7EIThI6sN+027JY9O6DYngLbXqs4xbrEqAuto4TZ6LGaYoO6T9/46Xl9NOX6ONK2fNaLi2Q3XYG3TfuYMdoqA65ewZoX5V7GUcRb/7T6781EjGXSV3NNnODFLa7R+V5J4BelnCG+Ttai6Fi1y1x/pkvdfLUWmPHfDLnkRNMoMNbXspfT3wighd1vLJtvt32lvO5/XjXFnsA7016V0emD5D4DxLK/P0UpMMMAAAAAElFTkSuQmCC</mdui:Logo>
<mdui:InformationURL xml:lang="fr">http://www.crous-aix-marseille.fr</mdui:InformationURL>
<mdui:DisplayName xml:lang="fr">CROUS Aix Marseille</mdui:DisplayName>
</mdui:UIInfo>
@@ -19,6 +20,32 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDWDCCAkCgAwIBAgIVAIzAhdkq/wHfP+MLv6y1Gq7I5sAKMA0GCSqGSIb3DQEB
+BQUAMCYxJDAiBgNVBAMMG2lkcDEuY3JvdXMtYWl4LW1hcnNlaWxsZS5mcjAeFw0x
+NTExMzAxMzE4MjRaFw0zNTExMzAxMzE4MjRaMCYxJDAiBgNVBAMMG2lkcDEuY3Jv
+dXMtYWl4LW1hcnNlaWxsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAI6HunLDA0sm6NUuC9RrAWpBlXhb9H5tcm3z4maf1rgO9rFTW+4fyq8dlu5I
++CdyoFvuqnvLyv6MiODwG1A0MDIy19Fd6Z8D5Qqya+UrAbUPJmVUBIXqKM1HZQqO
+303QdUGu0oBta6q80E/pQKyxYCwIzVycxaPiMzhHSpLHElCGAhIc+3E8Mgjl8/7H
+qYg4LAkfQDHin6F+V9m5zaSkj7iIToXXE4Vm8Oy5VyLeYG6WXzlPT/lfV7ZH2R1H
+O1WVEpDRRJeLrcMJI+nLsB6a/rF7FsnBNR0Lur3dF+43cmOkvu9THQmWlObMCzvC
+PAYNlAbBPJgN1DvkAaFwzuTPMIcCAwEAAaN9MHswHQYDVR0OBBYEFNsUfJ30atBr
+uB0A4kDIr9W8hcNdMFoGA1UdEQRTMFGCG2lkcDEuY3JvdXMtYWl4LW1hcnNlaWxs
+ZS5mcoYyaHR0cHM6Ly9pZHAxLmNyb3VzLWFpeC1tYXJzZWlsbGUuZnIvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAB7c24mIxvmHmXO6J/z+kSKI2FrA
++dKhppqNfgrS4vlAdILD1xs5eM7TcJ1hYwE7yGzDrRu0+/TsMZdV/xQf5FCuxpJ+
+cMnHOSmdrJZs0c1qMts6ENrmq0gbYYj1MIQtta8edKJxwX6h5I5xxe3760XX7Yxu
+6TXAuO9ad16w2S2fm7nPiAKUgF/0gkGSmmhX1XfjtgAkXI+dWRBWEgHcvuGB2IF4
+ueRD3DAmcG5FQzKJgsVArWHFlheXmYltggBdvHlDpVAkuDOXzmFwSSfzsx8wWqUy
+A3MtYpG2arwsbAWqPkdeX6boKR/Y2hD6jMaIasjC/ZSypz4Dgwh/y28s9R4=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEgTCCA2mgAwIBAgIQMbkj1D0MR48qNrGSMyNhRzANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEzMDEyNTAwMDAwMFoXDTE2MDEyNTIzNTk1OVowUTELMAkGA1UE
diff --git a/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml
index 11f44a67..cae876bb 100644
--- a/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml
@@ -31,32 +31,36 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEfTCCA2WgAwIBAgIRALXH4vfn8/gr0Iw5Iowy/gEwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMFcxCzAJBgNV
- BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
- cmFndWUxGTAXBgNVBAMTEGlkcDIuY2l2LmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
- AQUAA4IBDwAwggEKAoIBAQDIAANNkRJrnWIbXPvPd1g/2Dlj8SObKDs4aLG90fkl
- 7XvId+XJ71GJ8aEjJ9lGAEqs2a9sgm2WpcLQ/B+Y9veRyRtnaK0Ywd8+iSThsA58
- oTN5H3V3m/M0oMTd9UPkQSHCLUn+Dp1w04DJ6J8ECWoI2rvIblGHGzxfzF4cb2KH
- aMvWDGSuiQh6GeKkwHDTVTr9pZK8Evcw7RT/4KlChf5hfFD3ZwGsrWCjI25NrR+6
- 753XeaVIOOCKZladSF/93t8kAM4Z+n/ijQDytg3v4poSt0LM5X4+8b7AYTDSjkUq
- Nh36JZ+OZY4jRrBsrM0S4RXWuPB9DEc8hLe/CIRZWGIzAgMBAAGjggFjMIIBXzAf
- BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUWkdTT+6T
- qjlT9i5aI+IBxfKpCm4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
- VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
- MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
- Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
- dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
- BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
- Mi5jaXYuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAvV4rEv6A07BXcUMTF6+z
- Da8v2shV1S+f0SGfIdL1DzvaUFf7VAWuKOlwny8OfpzXVCs3yg+KSDWUWi8HWR6y
- dKWsuHljnD2DxAAPQNZeuESbPSyeZK/EJdSu4Ii+OH0exDRjZjZ3v3VsoueQ41tt
- 1/Fji03+9bZCQi9dOQpQji/q2SrnKRpPsoCemY+bo8E7SanrUd7jwX1ef6HaOnTP
- l8oHphtTzvbg+i3qaTH9bDQXdXbcFZPklU7+5k80wHe56+1sECQ5g1lB+ZFzx1Oi
- i5rCf/Zx3bkYkE+xPXAOcCGEWs35at7QpIXuoG9FDU8UKW2cMgEq9GEOddx/wVqB
- 6w==
- </ds:X509Certificate>
+MIIFSDCCBDCgAwIBAgIQBXyYdVS7UxZI1dayu2ZXbDANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNTExMTMwMDAwMDBaFw0xODExMjExMjAwMDBaMIGOMQswCQYDVQQG
+EwJDWjEdMBsGA1UECAwUSGxhdm7DrSBtxJtzdG8gUHJhaGExEDAOBgNVBAcTB1By
+YWhhIDYxMzAxBgNVBAoMKsSMZXNrw6kgdnlzb2vDqSB1xI1lbsOtIHRlY2huaWNr
+w6kgdiBQcmF6ZTEZMBcGA1UEAxMQaWRwMi5jaXYuY3Z1dC5jejCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKFi5O/MIGOQ7k41iOHwDzkOIJL/0F5TZyR6
+sTBSLWTOlTo5JIeaWj4vcL6Vww6kbnV9uQci/8eEOSrnI9DHrfA59vjgcH67PE1E
+zEhgCaCfrcNT1RnLBsb0OgyXay9sfr/Ylq0UORDTyPNSp8zDOPpwzvcz5dmfQ4uO
+OP1R6H5h1BPJ0MlRaTtnuIaNQ71nUHmy0UWQc2dJTqf0xEXUSzbr28LD9TlaJjm9
+oPdnwPxPGUvc5YjxAe5ElH179C/rIkxaz0313LwOrYWEdNn0KNJ6mRkD4Xcj0MiJ
+VD201Gjw6nSWnXLvfqOPxpv+vfKpnGnAUzBaMySV0spSVkU/iUECAwEAAaOCAckw
+ggHFMB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBQ5
+zJX+DRBUzFYzzJTV7wxCcFZTOTAbBgNVHREEFDASghBpZHAyLmNpdi5jdnV0LmN6
+MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+awYDVR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVO
+QVNTTENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJF
+TkFTU0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUH
+AgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsG
+AQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29t
+MDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5B
+U1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAEdk6P
+HL6Vy1eHvc76Rvsdf1eeZYgQhC83Mu3Jl7YdJ3Gn0e9/Ae2uFUI3ojr0OUEqyLNy
+QyeDENJQ0bmn8N10sXxSSx4kTXe+FXjpCk/voBuAwIkm1e00/xmgfWLq40FVmZTe
+A4+h8NYs+ZVSDvLlBnsSj9urq61ARMT3jGlNeTzC0V+6CE9SizLKMJ1c5/jNzGM0
+V9zEp+fa293vqzGiIWE+Jk982d31nGCZR1WdrPcjGd2s3oEPc09v+pn5TTdHEeo+
+ANYmEJCunBeqEsRfmPxWNVpqZB+YKKqbDRGVQpSJUN8ck7lFolqJBnncLaNXBJP3
+EL3PvAXtdbMpcuHB
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -78,32 +82,36 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEfTCCA2WgAwIBAgIRALXH4vfn8/gr0Iw5Iowy/gEwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMFcxCzAJBgNV
- BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
- cmFndWUxGTAXBgNVBAMTEGlkcDIuY2l2LmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
- AQUAA4IBDwAwggEKAoIBAQDIAANNkRJrnWIbXPvPd1g/2Dlj8SObKDs4aLG90fkl
- 7XvId+XJ71GJ8aEjJ9lGAEqs2a9sgm2WpcLQ/B+Y9veRyRtnaK0Ywd8+iSThsA58
- oTN5H3V3m/M0oMTd9UPkQSHCLUn+Dp1w04DJ6J8ECWoI2rvIblGHGzxfzF4cb2KH
- aMvWDGSuiQh6GeKkwHDTVTr9pZK8Evcw7RT/4KlChf5hfFD3ZwGsrWCjI25NrR+6
- 753XeaVIOOCKZladSF/93t8kAM4Z+n/ijQDytg3v4poSt0LM5X4+8b7AYTDSjkUq
- Nh36JZ+OZY4jRrBsrM0S4RXWuPB9DEc8hLe/CIRZWGIzAgMBAAGjggFjMIIBXzAf
- BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUWkdTT+6T
- qjlT9i5aI+IBxfKpCm4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
- VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
- MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
- Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
- dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
- BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
- Mi5jaXYuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAvV4rEv6A07BXcUMTF6+z
- Da8v2shV1S+f0SGfIdL1DzvaUFf7VAWuKOlwny8OfpzXVCs3yg+KSDWUWi8HWR6y
- dKWsuHljnD2DxAAPQNZeuESbPSyeZK/EJdSu4Ii+OH0exDRjZjZ3v3VsoueQ41tt
- 1/Fji03+9bZCQi9dOQpQji/q2SrnKRpPsoCemY+bo8E7SanrUd7jwX1ef6HaOnTP
- l8oHphtTzvbg+i3qaTH9bDQXdXbcFZPklU7+5k80wHe56+1sECQ5g1lB+ZFzx1Oi
- i5rCf/Zx3bkYkE+xPXAOcCGEWs35at7QpIXuoG9FDU8UKW2cMgEq9GEOddx/wVqB
- 6w==
- </ds:X509Certificate>
+MIIFSDCCBDCgAwIBAgIQBXyYdVS7UxZI1dayu2ZXbDANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNTExMTMwMDAwMDBaFw0xODExMjExMjAwMDBaMIGOMQswCQYDVQQG
+EwJDWjEdMBsGA1UECAwUSGxhdm7DrSBtxJtzdG8gUHJhaGExEDAOBgNVBAcTB1By
+YWhhIDYxMzAxBgNVBAoMKsSMZXNrw6kgdnlzb2vDqSB1xI1lbsOtIHRlY2huaWNr
+w6kgdiBQcmF6ZTEZMBcGA1UEAxMQaWRwMi5jaXYuY3Z1dC5jejCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKFi5O/MIGOQ7k41iOHwDzkOIJL/0F5TZyR6
+sTBSLWTOlTo5JIeaWj4vcL6Vww6kbnV9uQci/8eEOSrnI9DHrfA59vjgcH67PE1E
+zEhgCaCfrcNT1RnLBsb0OgyXay9sfr/Ylq0UORDTyPNSp8zDOPpwzvcz5dmfQ4uO
+OP1R6H5h1BPJ0MlRaTtnuIaNQ71nUHmy0UWQc2dJTqf0xEXUSzbr28LD9TlaJjm9
+oPdnwPxPGUvc5YjxAe5ElH179C/rIkxaz0313LwOrYWEdNn0KNJ6mRkD4Xcj0MiJ
+VD201Gjw6nSWnXLvfqOPxpv+vfKpnGnAUzBaMySV0spSVkU/iUECAwEAAaOCAckw
+ggHFMB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBQ5
+zJX+DRBUzFYzzJTV7wxCcFZTOTAbBgNVHREEFDASghBpZHAyLmNpdi5jdnV0LmN6
+MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+awYDVR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVO
+QVNTTENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJF
+TkFTU0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUH
+AgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsG
+AQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29t
+MDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5B
+U1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAEdk6P
+HL6Vy1eHvc76Rvsdf1eeZYgQhC83Mu3Jl7YdJ3Gn0e9/Ae2uFUI3ojr0OUEqyLNy
+QyeDENJQ0bmn8N10sXxSSx4kTXe+FXjpCk/voBuAwIkm1e00/xmgfWLq40FVmZTe
+A4+h8NYs+ZVSDvLlBnsSj9urq61ARMT3jGlNeTzC0V+6CE9SizLKMJ1c5/jNzGM0
+V9zEp+fa293vqzGiIWE+Jk982d31nGCZR1WdrPcjGd2s3oEPc09v+pn5TTdHEeo+
+ANYmEJCunBeqEsRfmPxWNVpqZB+YKKqbDRGVQpSJUN8ck7lFolqJBnncLaNXBJP3
+EL3PvAXtdbMpcuHB
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml b/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml
index e696bcfa..d73c06b7 100644
--- a/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml
+++ b/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml
@@ -10,6 +10,7 @@
<mdui:DisplayName xml:lang="en">Dublin City University</mdui:DisplayName>
<mdui:InformationURL xml:lang="en">http://www.dcu.ie</mdui:InformationURL>
<mdui:Logo height="102" width="150">https://edugate.heanet.ie/rr3/logos/dcu.png</mdui:Logo>
+ <mdui:Logo height="102" width="150" xml:lang="en">data:image/png;base64,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</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:GeolocationHint>geo:53.385325,-6.257143</mdui:GeolocationHint>
diff --git a/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
index 16b4acd5..0219febc 100644
--- a/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
@@ -97,19 +97,19 @@ aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
<md:ContactPerson contactType="administrative">
<md:Company>University of Gävle (Alumni)</md:Company>
<md:SurName>Network Operations</md:SurName>
- <md:EmailAddress>nat@hig.se</md:EmailAddress>
+ <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
<md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>University of Gävle (Alumni)</md:Company>
<md:SurName>Network Operations</md:SurName>
- <md:EmailAddress>nat@hig.se</md:EmailAddress>
+ <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
<md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>University of Gävle (Alumni)</md:Company>
<md:SurName>IT Support</md:SurName>
- <md:EmailAddress>itsupport@hig.se</md:EmailAddress>
+ <md:EmailAddress>mailto:itsupport@hig.se</md:EmailAddress>
<md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..2a575de4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.hua.gr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hua.gr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Harokopio University</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.hua.gr/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="el">http://www.hua.gr/</mdui:InformationURL>
+ <mdui:Logo width="83" height="81">https://idp.hua.gr/logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>195.130.90.0/23</mdui:IPHint>
+ <mdui:IPHint>195.251.30.0/23</mdui:IPHint>
+ <mdui:IPHint>83.212.240.0/23</mdui:IPHint>
+ <mdui:IPHint>83.212.242.0/24</mdui:IPHint>
+ <mdui:DomainHint>hua.gr</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:37.96118327,23.70823603</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEmzCCA4OgAwIBAgIRANQlWe4RJ07BgbSF+F+w/jEwDQYJKoZIhvcNAQEFBQAw
+ NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+ IFNTTCBDQTAeFw0xMTA1MzEwMDAwMDBaFw0xNDA1MzAyMzU5NTlaMG0xCzAJBgNV
+ BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEnMCUGA1UE
+ ChMeSGFyb2tvcGlvIFVuaXZlcnNpdHkgb2YgQXRoZW5zMRMwEQYDVQQDEwppZHAu
+ aHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAruot1FGyNNP7
+ VdnQMt3didkog3AguzGJ/9oB4MDnWeskNIIPW/X4FKDHhICwO7nKD/jPoYS2xrBp
+ 74VOXW8u3RL7H554E3fFXJMi00MN294Ba3vi02nuCNFwdY7HTxFaCOzZaAhG5kYa
+ TWypaQw0W87HIaVVgvjnhvf1PPJCMi+YBMvnmXNasSs57N40BfJBLDgto/UBWK/2
+ Pgx/zvUvL7Hln/a79ehlsaH+aT5ewllpO+yVde2rC9R1sJMFAStOLhtOL7JlKkEJ
+ AQPtjEqBiJZlYgbGNNe9F1ikfCcdmzt33y2T8gyUTxbPRve1PEEjcPYLNnmAkK13
+ TPvft0w/lQIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+ 6pDjue0wHQYDVR0OBBYEFBJc0q0dwVcOZFxUxHnpldmmeM88MA4GA1UdDwEB/wQE
+ AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+ AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
+ dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
+ BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
+ RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
+ bmEub3JnMCMGA1UdEQQcMBqCCmlkcC5odWEuZ3KCDGxvZ2luLmh1YS5ncjANBgkq
+ hkiG9w0BAQUFAAOCAQEAbfA5ENIlPCsvxmQuMVGL/mnwO1MDKYpij/1DywTO+JBS
+ I65ViCF0Irv4Vpuc9bVIL/nC/9zlUpcWFC1Rvq4BdSTZwnYVJsq71r8g78ZbFY6u
+ nsogzG6sspPj77HYXbUcUnz+DwmgPPHTNKikhPXenQSMIgTGkZRKaEj6CbhTWxpU
+ 9y43i3EObg6zxcqwyIaawldvSwKTBbUuiepWzDASHeGBW4r2uLPHnNc6gwPwdei5
+ mBFTKd3S15BA5RiJ2Z+u1X5fzgGuyyEI5VnAdC7SBqhh7bm90mVoHLoWjTS378xQ
+ Oy3Soy1kO0DpSfaKXP7Ss8TN2ndbGpO1UhaBeVwMTg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hua.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hua.gr/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hua.gr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hua.gr/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hua.gr</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEmzCCA4OgAwIBAgIRANQlWe4RJ07BgbSF+F+w/jEwDQYJKoZIhvcNAQEFBQAw
+ NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+ IFNTTCBDQTAeFw0xMTA1MzEwMDAwMDBaFw0xNDA1MzAyMzU5NTlaMG0xCzAJBgNV
+ BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEnMCUGA1UE
+ ChMeSGFyb2tvcGlvIFVuaXZlcnNpdHkgb2YgQXRoZW5zMRMwEQYDVQQDEwppZHAu
+ aHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAruot1FGyNNP7
+ VdnQMt3didkog3AguzGJ/9oB4MDnWeskNIIPW/X4FKDHhICwO7nKD/jPoYS2xrBp
+ 74VOXW8u3RL7H554E3fFXJMi00MN294Ba3vi02nuCNFwdY7HTxFaCOzZaAhG5kYa
+ TWypaQw0W87HIaVVgvjnhvf1PPJCMi+YBMvnmXNasSs57N40BfJBLDgto/UBWK/2
+ Pgx/zvUvL7Hln/a79ehlsaH+aT5ewllpO+yVde2rC9R1sJMFAStOLhtOL7JlKkEJ
+ AQPtjEqBiJZlYgbGNNe9F1ikfCcdmzt33y2T8gyUTxbPRve1PEEjcPYLNnmAkK13
+ TPvft0w/lQIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+ 6pDjue0wHQYDVR0OBBYEFBJc0q0dwVcOZFxUxHnpldmmeM88MA4GA1UdDwEB/wQE
+ AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+ AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
+ dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
+ BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
+ RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
+ bmEub3JnMCMGA1UdEQQcMBqCCmlkcC5odWEuZ3KCDGxvZ2luLmh1YS5ncjANBgkq
+ hkiG9w0BAQUFAAOCAQEAbfA5ENIlPCsvxmQuMVGL/mnwO1MDKYpij/1DywTO+JBS
+ I65ViCF0Irv4Vpuc9bVIL/nC/9zlUpcWFC1Rvq4BdSTZwnYVJsq71r8g78ZbFY6u
+ nsogzG6sspPj77HYXbUcUnz+DwmgPPHTNKikhPXenQSMIgTGkZRKaEj6CbhTWxpU
+ 9y43i3EObg6zxcqwyIaawldvSwKTBbUuiepWzDASHeGBW4r2uLPHnNc6gwPwdei5
+ mBFTKd3S15BA5RiJ2Z+u1X5fzgGuyyEI5VnAdC7SBqhh7bm90mVoHLoWjTS378xQ
+ Oy3Soy1kO0DpSfaKXP7Ss8TN2ndbGpO1UhaBeVwMTg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hua.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Harokopio University</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Harokopio University</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.hua.gr/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.hua.gr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Konstantinos</md:GivenName>
+ <md:SurName>Piperidis</md:SurName>
+ <md:EmailAddress>kpiperidhs@hua.gr</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Konstantinos</md:GivenName>
+ <md:SurName>Piperidis</md:SurName>
+ <md:EmailAddress>kpiperidhs@hua.gr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
index adf1e532..9a00b2af 100644
--- a/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
@@ -112,19 +112,19 @@ aRQKNbVQdPN5ht6TrINjDQ==
<md:ContactPerson contactType="administrative">
<md:Company>University West</md:Company>
<md:SurName>Magnus Andersson</md:SurName>
- <md:EmailAddress>Magnus.Andersson@hv.se</md:EmailAddress>
+ <md:EmailAddress>mailto:Magnus.Andersson@hv.se</md:EmailAddress>
<md:TelephoneNumber>+46 520 223193</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>University West</md:Company>
<md:SurName>Christian Jiresjö</md:SurName>
- <md:EmailAddress>Christian.Jiresjo@hv.se</md:EmailAddress>
+ <md:EmailAddress>mailto:Christian.Jiresjo@hv.se</md:EmailAddress>
<md:TelephoneNumber>+46 520 223189</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>University West</md:Company>
<md:SurName>Servicedesk Högkoslan Väst</md:SurName>
- <md:EmailAddress>servicedesk@hv.se</md:EmailAddress>
+ <md:EmailAddress>mailto:servicedesk@hv.se</md:EmailAddress>
<md:TelephoneNumber>+46 520 223300</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml
index e7f1185f..fa2cc9e6 100644
--- a/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml
@@ -1,17 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.iay.org.uk/idp/shibboleth">
<!--
- This is an "SDSS (Fountainhall)" test IdP for Ian A. Young.
+ This is an "Ian A. Young" IdP for Ian A. Young.
-->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-30T16:36:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">SDSS (Fountainhall)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ian A. Young</mdui:DisplayName>
<mdui:Description xml:lang="en">This is the identity provider for the iay.org.uk domain.</mdui:Description>
<mdui:Logo height="80" width="80">https://idp2.iay.org.uk/images/heads_80x80.jpg</mdui:Logo>
<mdui:Logo height="43" width="100">https://idp2.iay.org.uk/images/heads_100x43.jpg</mdui:Logo>
@@ -96,7 +101,7 @@
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">Ian A. Young</OrganizationName>
- <OrganizationDisplayName xml:lang="en">SDSS (Fountainhall)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Ian A. Young</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://iay.org.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
index d029f6bb..cc4ca424 100644
--- a/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
@@ -32,30 +32,26 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIEajCCA1KgAwIBAgIQEi8JxmnGiL6xNZ8O2MTYZDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxNzAwMDAwMFoXDTE1MTIxNzIzNTk1OVowRTELMAkGA1UE
-BhMCQ1oxGzAZBgNVBAoTEk1hc2FyeWsgVW5pdmVyc2l0eTEZMBcGA1UEAxMQaWRw
-Mi5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQd
-LDOtSIbIrXUepE/6tvHPC8Ly7TjX7qfkaY/1qd+9QMgXNniLApfu9kCl/ZubelQJ
-nJbx5GJaxuS1RRl0Nuq5zf52OnOQxFrWtmrzticEMu5P1rDKcuQh4uk1Nztla599
-0xWUwVM3oZUQl4+O477j9bN5yvIVB4gsIp5Fj9rplt9lc8qud7nA6qxzM1UjE5eH
-s/NCsnTh5Ce6ocP1zEhVZBcG0yXOenWGo3LzclMk9Ffy8wnJ4fLaoTGVON1n31Dk
-zg3YJ6hxSo92X+iwdfYLoHVTPe6rQDxT7V8vO8zRdDqzvwRn39nSXrtGOp6bCXbk
-IrEo3UH1e490sCkkRVMCAwEAAaOCAWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRBJryty03ccYy/kmP60rnahOoGVTAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAyLmljcy5tdW5pLmN6MA0GCSqG
-SIb3DQEBBQUAA4IBAQBSfzF1XO5gVygzYna/TZwXE1DUJfiTTiK8YYeU+bDKffkf
-O2+4F/N5Jij4C3s82EHP8otVXA4uXGWVvqbLCN+dSkN5zAeE7Hq48m1u/nYVyCKf
-pgLCkrg64JqIPIm8yF+bu9cvU0MbkzZTFCvbxnfqBQCKKfQ4Q6j3MiW12pfifIGe
-r+OsRrA4ZCo+6qGhA3bRfozFYUHCdJA+MxJhZzfcMae1MxK24wGMTSEabFlu6evm
-SJdlV4XPhmyysjuIHh3SnsS2NHpv0l04pT/JJV4shfZFHwqQS06ggNtpqysl3Y6O
-11KVcl/v2z6hhhjdrelepkLFCGKUVgpSOlcImQNb
+MIIDuTCCAqGgAwIBAgIJAIcuS9ZS4u6JMA0GCSqGSIb3DQEBCwUAMHMxCzAJBgNV
+BAYTAkNaMRcwFQYDVQQIDA5DemVjaCBSZXB1YmxpYzETMBEGA1UEBwwKQnJuby1z
+dHJlZDEbMBkGA1UECgwSTWFzYXJ5ayBVbml2ZXJzaXR5MRkwFwYDVQQDDBBpZHAy
+Lmljcy5tdW5pLmN6MB4XDTE1MTEwMjE0NDAyOVoXDTI1MTAzMDE0NDAyOVowczEL
+MAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMRMwEQYDVQQHDApC
+cm5vLXN0cmVkMRswGQYDVQQKDBJNYXNhcnlrIFVuaXZlcnNpdHkxGTAXBgNVBAMM
+EGlkcDIuaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDeIqLYgsuIux8BsdTIhgYGkiYoIw38/DcC+ewVW4/433rYh0ouinyE9Reb3yNj
+eIjmD1jJQR80M+SFmiRlt8ebn21aD6gPPygf3CbKjVtkWLof29XdQPUWQsn+Kill
+15KwgtDTSL5/jmLUpWF1eJvWTMwisIWQFJuXe0Nm4CsIMvJV7xI17xf7a9WmR86s
+/tMGVKZGNXoGEzbKVj4QGdRIQfrj8REBmrkQjLuFyKqqjMotEYNb+WlLOi9uccl8
+kLI2ImRmoDzFqNQhQJzAPkrFd1W9Fpd6uF0iwObZuz9RrJbuG6KomTu7CGpWvqdF
+N/Ttrun8FfiEBF5puRbsbGMdAgMBAAGjUDBOMB0GA1UdDgQWBBTGPc2XZWR+uMNb
+wMP5Zf4xPz50aDAfBgNVHSMEGDAWgBTGPc2XZWR+uMNbwMP5Zf4xPz50aDAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCnwQtxjbkbEkZmLZU8Q61gcsXS
+tqUx5syEANSeutZKtElKlzDaXHGeKyzeIXnlzLH7xIP77rUDKwbJOMpCwAJgnqoN
+be5BkJpg7j4tjCjsMtftW7A2DIOuHnpdBw8CIK9VKxjVpalhjA3kOIZgbf8444ct
+UmZpPnApmRS6ar+8RKwCFo5cf/CoaPEoj0sTMtXLMfKLF2ZFdaaeooR2Uy68Sieu
+LulLpiqPzaI83atwCQLaqKgRHyRil4TplDgI47HQNUEp031rB4a+IEPvpqtcPVnW
+dregv7/EXm4k8mSJTVblFjww5QjaLV+D9vMqwslgUzmGhA5yBoBZn5OY/qYv
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -79,30 +75,26 @@ SJdlV4XPhmyysjuIHh3SnsS2NHpv0l04pT/JJV4shfZFHwqQS06ggNtpqysl3Y6O
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIEajCCA1KgAwIBAgIQEi8JxmnGiL6xNZ8O2MTYZDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxNzAwMDAwMFoXDTE1MTIxNzIzNTk1OVowRTELMAkGA1UE
-BhMCQ1oxGzAZBgNVBAoTEk1hc2FyeWsgVW5pdmVyc2l0eTEZMBcGA1UEAxMQaWRw
-Mi5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQd
-LDOtSIbIrXUepE/6tvHPC8Ly7TjX7qfkaY/1qd+9QMgXNniLApfu9kCl/ZubelQJ
-nJbx5GJaxuS1RRl0Nuq5zf52OnOQxFrWtmrzticEMu5P1rDKcuQh4uk1Nztla599
-0xWUwVM3oZUQl4+O477j9bN5yvIVB4gsIp5Fj9rplt9lc8qud7nA6qxzM1UjE5eH
-s/NCsnTh5Ce6ocP1zEhVZBcG0yXOenWGo3LzclMk9Ffy8wnJ4fLaoTGVON1n31Dk
-zg3YJ6hxSo92X+iwdfYLoHVTPe6rQDxT7V8vO8zRdDqzvwRn39nSXrtGOp6bCXbk
-IrEo3UH1e490sCkkRVMCAwEAAaOCAWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRBJryty03ccYy/kmP60rnahOoGVTAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAyLmljcy5tdW5pLmN6MA0GCSqG
-SIb3DQEBBQUAA4IBAQBSfzF1XO5gVygzYna/TZwXE1DUJfiTTiK8YYeU+bDKffkf
-O2+4F/N5Jij4C3s82EHP8otVXA4uXGWVvqbLCN+dSkN5zAeE7Hq48m1u/nYVyCKf
-pgLCkrg64JqIPIm8yF+bu9cvU0MbkzZTFCvbxnfqBQCKKfQ4Q6j3MiW12pfifIGe
-r+OsRrA4ZCo+6qGhA3bRfozFYUHCdJA+MxJhZzfcMae1MxK24wGMTSEabFlu6evm
-SJdlV4XPhmyysjuIHh3SnsS2NHpv0l04pT/JJV4shfZFHwqQS06ggNtpqysl3Y6O
-11KVcl/v2z6hhhjdrelepkLFCGKUVgpSOlcImQNb
+MIIDuTCCAqGgAwIBAgIJAIcuS9ZS4u6JMA0GCSqGSIb3DQEBCwUAMHMxCzAJBgNV
+BAYTAkNaMRcwFQYDVQQIDA5DemVjaCBSZXB1YmxpYzETMBEGA1UEBwwKQnJuby1z
+dHJlZDEbMBkGA1UECgwSTWFzYXJ5ayBVbml2ZXJzaXR5MRkwFwYDVQQDDBBpZHAy
+Lmljcy5tdW5pLmN6MB4XDTE1MTEwMjE0NDAyOVoXDTI1MTAzMDE0NDAyOVowczEL
+MAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMRMwEQYDVQQHDApC
+cm5vLXN0cmVkMRswGQYDVQQKDBJNYXNhcnlrIFVuaXZlcnNpdHkxGTAXBgNVBAMM
+EGlkcDIuaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDeIqLYgsuIux8BsdTIhgYGkiYoIw38/DcC+ewVW4/433rYh0ouinyE9Reb3yNj
+eIjmD1jJQR80M+SFmiRlt8ebn21aD6gPPygf3CbKjVtkWLof29XdQPUWQsn+Kill
+15KwgtDTSL5/jmLUpWF1eJvWTMwisIWQFJuXe0Nm4CsIMvJV7xI17xf7a9WmR86s
+/tMGVKZGNXoGEzbKVj4QGdRIQfrj8REBmrkQjLuFyKqqjMotEYNb+WlLOi9uccl8
+kLI2ImRmoDzFqNQhQJzAPkrFd1W9Fpd6uF0iwObZuz9RrJbuG6KomTu7CGpWvqdF
+N/Ttrun8FfiEBF5puRbsbGMdAgMBAAGjUDBOMB0GA1UdDgQWBBTGPc2XZWR+uMNb
+wMP5Zf4xPz50aDAfBgNVHSMEGDAWgBTGPc2XZWR+uMNbwMP5Zf4xPz50aDAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCnwQtxjbkbEkZmLZU8Q61gcsXS
+tqUx5syEANSeutZKtElKlzDaXHGeKyzeIXnlzLH7xIP77rUDKwbJOMpCwAJgnqoN
+be5BkJpg7j4tjCjsMtftW7A2DIOuHnpdBw8CIK9VKxjVpalhjA3kOIZgbf8444ct
+UmZpPnApmRS6ar+8RKwCFo5cf/CoaPEoj0sTMtXLMfKLF2ZFdaaeooR2Uy68Sieu
+LulLpiqPzaI83atwCQLaqKgRHyRil4TplDgI47HQNUEp031rB4a+IEPvpqtcPVnW
+dregv7/EXm4k8mSJTVblFjww5QjaLV+D9vMqwslgUzmGhA5yBoBZn5OY/qYv
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
index 864c6ed7..d9651401 100644
--- a/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
@@ -115,19 +115,19 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
<md:ContactPerson contactType="administrative">
<md:Company>Karlstad University</md:Company>
<md:SurName>IT-avdelningen</md:SurName>
- <md:EmailAddress>webbteknik@kau.se</md:EmailAddress>
+ <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
<md:TelephoneNumber>+46 54 700 2200</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Karlstad University</md:Company>
<md:SurName>Paul Scott</md:SurName>
- <md:EmailAddress>paul.scott@kau.se</md:EmailAddress>
+ <md:EmailAddress>mailto:paul.scott@kau.se</md:EmailAddress>
<md:TelephoneNumber>+46 54 700 2307</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Karlstad University</md:Company>
<md:SurName>IT-avdelningen Karlstads universitet</md:SurName>
- <md:EmailAddress>datasupport@kau.se</md:EmailAddress>
+ <md:EmailAddress>mailto:datasupport@kau.se</md:EmailAddress>
<md:TelephoneNumber>+46 54 700 2200</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml
index 05879dc7..f9da53b6 100644
--- a/swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.uop.gr/idp/shibboleth">
<md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
<mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
@@ -14,6 +9,25 @@
<md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uop.gr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of the Peloponnese</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Πελοποννήσου</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.uop.gr/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="el">http://www.uop.gr/</mdui:InformationURL>
+ <mdui:Logo height="64" width="64">http://www.uop.gr/images/stories/uop-logo-64px.png</mdui:Logo>
+ <mdui:Logo height="128" width="128">http://www.uop.gr/images/stories/uop-logo-128px.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>uop.gr</mdui:DomainHint>
+ <mdui:IPHint>195.251.113.0/24</mdui:IPHint>
+ <mdui:IPHint>195.251.46.0/24</mdui:IPHint>
+ <mdui:IPHint>195.251.47.0/24</mdui:IPHint>
+ <mdui:IPHint>195.251.112.0/24</mdui:IPHint>
+ <mdui:IPHint>195.251.38.0/24</mdui:IPHint>
+ <mdui:IPHint>195.251.39.0/24</mdui:IPHint>
+ <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:37.512646, 22.368098</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml
index ef54df70..07635d77 100644
--- a/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.bucks.ac.uk/idp/shibboleth">
<!--
- This is a Test Shibboleth IdP for Buckinghamshire New University.
+ This is a test Shibboleth IdP for Buckinghamshire New University.
-->
<Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -9,40 +9,90 @@
<saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T11:14:51Z"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T11:14:51Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
</Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucks.ac.uk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Buckinghamshire New University (Test Only)</mdui:DisplayName>
+ <mdui:Description xml:lang="en">BNU Shib 3 test facilty</mdui:Description>
+ <mdui:Logo height="70" width="208">https://idp3.bucks.ac.uk/idp/buckslogo.png</mdui:Logo>
+ </mdui:UIInfo>
</Extensions>
- <KeyDescriptor>
+ <KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEbTCCA1WgAwIBAgIQD37jMrv/ilUrfisl2656RjANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQwNDAwMDAwMFoXDTE2MDQwMzIzNTk1OVowPjEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBpZHAzLmJ1Y2tz
- LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7mQCL3VNnsub
- KOIwNicoFGR7eXPwqyXu/GI3B+88ZlWfKqyrgbjgHvI1TQGuOA30eZa+BQ8oE6ba
- eugWOQfAXGVKFWV84Zn+BUheq0lJOr6iLqk34rSg2WXAB70AqiF8t8rTkGFwcaXd
- /E+Ur1o4yicFAVkiC5Knnuxi9RUR/YUjN4X3/JmKrbZL6UGCQdgtAcZHNhRVr+4U
- Awbkt7auBk1+47NNuS+z5+QNxw+FOeeWaWWfogNuYT4oVdvmVe2xqvKwZsT0lJfa
- cD9CDd5zMUBrj95OeNGqAs3UtBZyJ8+WeCCnISmSLvfIx33j0wOf/gRkDGo4My8c
- XFSXDITeCQIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
- 6pDjue0wHQYDVR0OBBYEFEaX2Ffnub92Gu5nd0efBgpPl26LMA4GA1UdDwEB/wQE
- AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
- AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
- MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
- bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
- cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
- cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAzLmJ1Y2tzLmFjLnVrMA0G
- CSqGSIb3DQEBBQUAA4IBAQBwutInsCS1qellB/wBmWl4+p+AQCHlDTy3Y7Gjf0cq
- YBxX+WIMK9SImrghfyup5oeNW48ZyoYCFPrvVi5TnD0ePLEmq2OlwS5QPze5Mcj1
- nc6ZN1AZ/NoGjruL5VPXnqqpBtZhdiqJTVhz4e3Cu7aMNdvrmp1N9OmErTjzUgPM
- cguZEpCIsvjpOFM3DFJipy2cgw+pm8D5UWFJSnh9tabIl3JlSzqKs4/8fg/Bt+rm
- j/vHB25TABxWABlqgiECCNu769HoO1GyA2D5ndq1TpitlxwRKomochfdj/dzBnUb
- h5Z+5jD6KctmouJkUll6AJeuyu7XmvyP37oXnKxI0SPh
+ MIIDKzCCAhOgAwIBAgIUcF2+rhqg1Bkw5f32M83xfEhRa8EwDQYJKoZIhvcNAQEL
+ BQAwGzEZMBcGA1UEAwwQaWRwMy5idWNrcy5hYy51azAeFw0xNTExMTIxNDE3NTha
+ Fw0zNTExMTIxNDE3NThaMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswggEi
+ MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGC9v51zaMhkIeSAgJp7/cSZ0H
+ lUkTjWqvzqQX6wQ2Xh4faUzoS0evAdclm35MNMDJVgm5FlbVHgCQJru6wEXV/N+T
+ zRA6n4bkCR89hFUt4QIboTXnnmf9ct42HwNsZlG6NC+PhTTYzX1bxsoOBctTz/yK
+ Td3ISnePjxPWXGtrKhuQPbJBWNlMmcUsXFo5vSgJV32t1SPoQ+1r+J6dHyB2Ln8G
+ ICM3ueoYAYfjM5MMUrQLPrdei/NJ+jotQZcnYZw2QmqfTIAOWeSjBOJV17pAGEMV
+ EfQ1hvBZcPMsUo3MDlsak816X+h7TrNAeGBdIoCzYoMh6IfmcUC1+nUpaVP9AgMB
+ AAGjZzBlMB0GA1UdDgQWBBQciq33YUsxfPT8gJ7N7wb8/2Co2TBEBgNVHREEPTA7
+ ghBpZHAzLmJ1Y2tzLmFjLnVrhidodHRwczovL2lkcDMuYnVja3MuYWMudWsvaWRw
+ L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAAP6MPMq6ELrqC9cADE9GS9G
+ 1gyGw9tfQtKUKCJJCSiiPdOsknb5wveSfsX4VmE5mB6hLDAxUlmN46aXhvyIf0ue
+ Y6thbi4ZHYD0NS9KODF+3XSCgS5Dq9pezxjAj1Ar32UQkMBNYyOOQg81Yp+N9rOV
+ 2zeHnHgVxjf+5O/Bl2wZ9YoYE0qp6TwPLPvmkSeeXapOgbHZZ4Qw4Zq8Zo9toWBL
+ MerL+bqLgF8ha1zmFCDQYst25i4+p4i5OFYEG9v/70WZaG+CKx0rZbA1z2sfCZl8
+ syWhQSP5tdqQepmqMo8f8TVdHAU4IXlBL9qROtr5BlTAVNpUB98cX12KJwl4OjE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVAOzsg1/QvG6GlxDD0oixe7saqY58MA0GCSqGSIb3DQEB
+ CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU2
+ WhcNMzUxMTEyMTQxNzU2WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncjTXXULy1jZ0DQn0AdP745N
+ AqZQhnf2kw4qg/p+QdCKX9AXS9NoE067k6UEQ21rljSHNKBmZLq6AoO1wTOvxI4m
+ GsOz4NJaBOvCuMgFEww93p0tsyncKyo7DawvDj2NFS/Lfop/FixhFTxTIzq58bJi
+ u1s0CYzXoWVhXZmbPPz6fc6JwnSe/b0qE9cFf5tLdYFGhKN3a8pXn/pRuNVlouVD
+ Cf4j2jUyXoniYOulPeyZg2WhG7X8kj6bgdaVLY0MGR/F6UerVbqpEEU41/szjw0p
+ 4Xf1QihYueaGMZjxrxw1fEHmsf5CqSL06yh8R3+MMwgfBqqq/CtCb65Si2N8/wID
+ AQABo2cwZTAdBgNVHQ4EFgQUMF/aF1hr/K1zjWgo+33U2JhMoDMwRAYDVR0RBD0w
+ O4IQaWRwMy5idWNrcy5hYy51a4YnaHR0cHM6Ly9pZHAzLmJ1Y2tzLmFjLnVrL2lk
+ cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA+ktUiMDNcGNSgUPZbYpsc
+ eLVLDOnjZr3gtLQxp3icZ9tJSg8rgvl+rPsGj6PU70fT+xwpbIPVPvQdKfc6RrFw
+ t3zNtTHnsC+BXeQq/Q/vI5668Edg9MYSNQkGXArMNIleDmp8k8vImQUcXKo0cvJz
+ 5YC28RXv+o0ps/vUETv1uw+bq7qOixZWidd9/JfLJJeK5o4w2hc788sn2/SWgZll
+ IsskCLVsmeAnKVlvqOhPOWzw15NcK0RQZxuxUFqGxFIGwDRm8bhhsXZql6NSqZWS
+ TQZq49Nrw0CYAAaMBdh38rSxAbF/RkpQjh265fw0s0GXrCbacEhONcqNl3PIL09L
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVAJJgU10aDKjkSRc9fnYGv63VALGeMA0GCSqGSIb3DQEB
+ CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU3
+ WhcNMzUxMTEyMTQxNzU3WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvS5TCq2OYLfSoO+q8Q5E+oo6
+ Xea/x47rL37fvRtT39FYYgiRDSa0mcHFtnvULQI45Yh/U9MjeE5Ol9/G3I5p9o0R
+ RZMoKVVnaegwSE7vygJd8rEzJXcXouoWQ3ePIUoTSoCjLjL1MATXPU3Z8f7H5/rU
+ 6UgzcJ4dDs/xkIkIL+it3sENBm6jnddj1keNg5yIVf8I+EckJaGfqvY+AUhsN/bC
+ mvf6o3tIMrqw41u5Wt2XG3jhxRt2F9ei4FCIM/XppBHvzA8NR4qZqGGMrSp19fAE
+ VLpWJlivpaoSv/XheYV4NXL5CKOocCThxwt9NoicmabOQdq6hRbas/x6mW6nHQID
+ AQABo2cwZTAdBgNVHQ4EFgQUV1ip+SftPrM1Ib+LMfvMzjYmFKMwRAYDVR0RBD0w
+ O4IQaWRwMy5idWNrcy5hYy51a4YnaHR0cHM6Ly9pZHAzLmJ1Y2tzLmFjLnVrL2lk
+ cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCuTOFng8ZyGpXTwt91yGT9
+ QJ9uf0/hIxzFSvoK9fnM8sv7MOalZfQV+ENjQ70LABFuD5429dDq1Rm6JGTDEywG
+ I5spspkqWlq0YIjXlbWqZZpk8S/SazbSrm1GkaIqKXqyd1tJystzgOeUojAUMsE6
+ VQtC2IuRe/ES9DHmTVZVxA7Nl8+KVzI5llJv6uOnf3zMdweH0WH+GWUixJxeMKGL
+ 9dMTFSDNYzvy8DXVVhOJQ1QSzeWfszC11PxjNmLnt4wQ7iJ6mgiZ2eCTg8tJnhlj
+ IkB9rjmfh3VWJXkX4+k73yaY7QsyGPCJ4FeNj8S1uhMBMm2h7wZr65aGQvaMVfLP
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -56,46 +106,86 @@
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.bucks.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.bucks.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucks.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDKzCCAhOgAwIBAgIUcF2+rhqg1Bkw5f32M83xfEhRa8EwDQYJKoZIhvcNAQEL
+ BQAwGzEZMBcGA1UEAwwQaWRwMy5idWNrcy5hYy51azAeFw0xNTExMTIxNDE3NTha
+ Fw0zNTExMTIxNDE3NThaMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswggEi
+ MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGC9v51zaMhkIeSAgJp7/cSZ0H
+ lUkTjWqvzqQX6wQ2Xh4faUzoS0evAdclm35MNMDJVgm5FlbVHgCQJru6wEXV/N+T
+ zRA6n4bkCR89hFUt4QIboTXnnmf9ct42HwNsZlG6NC+PhTTYzX1bxsoOBctTz/yK
+ Td3ISnePjxPWXGtrKhuQPbJBWNlMmcUsXFo5vSgJV32t1SPoQ+1r+J6dHyB2Ln8G
+ ICM3ueoYAYfjM5MMUrQLPrdei/NJ+jotQZcnYZw2QmqfTIAOWeSjBOJV17pAGEMV
+ EfQ1hvBZcPMsUo3MDlsak816X+h7TrNAeGBdIoCzYoMh6IfmcUC1+nUpaVP9AgMB
+ AAGjZzBlMB0GA1UdDgQWBBQciq33YUsxfPT8gJ7N7wb8/2Co2TBEBgNVHREEPTA7
+ ghBpZHAzLmJ1Y2tzLmFjLnVrhidodHRwczovL2lkcDMuYnVja3MuYWMudWsvaWRw
+ L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAAP6MPMq6ELrqC9cADE9GS9G
+ 1gyGw9tfQtKUKCJJCSiiPdOsknb5wveSfsX4VmE5mB6hLDAxUlmN46aXhvyIf0ue
+ Y6thbi4ZHYD0NS9KODF+3XSCgS5Dq9pezxjAj1Ar32UQkMBNYyOOQg81Yp+N9rOV
+ 2zeHnHgVxjf+5O/Bl2wZ9YoYE0qp6TwPLPvmkSeeXapOgbHZZ4Qw4Zq8Zo9toWBL
+ MerL+bqLgF8ha1zmFCDQYst25i4+p4i5OFYEG9v/70WZaG+CKx0rZbA1z2sfCZl8
+ syWhQSP5tdqQepmqMo8f8TVdHAU4IXlBL9qROtr5BlTAVNpUB98cX12KJwl4OjE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEbTCCA1WgAwIBAgIQD37jMrv/ilUrfisl2656RjANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQwNDAwMDAwMFoXDTE2MDQwMzIzNTk1OVowPjEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBpZHAzLmJ1Y2tz
- LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7mQCL3VNnsub
- KOIwNicoFGR7eXPwqyXu/GI3B+88ZlWfKqyrgbjgHvI1TQGuOA30eZa+BQ8oE6ba
- eugWOQfAXGVKFWV84Zn+BUheq0lJOr6iLqk34rSg2WXAB70AqiF8t8rTkGFwcaXd
- /E+Ur1o4yicFAVkiC5Knnuxi9RUR/YUjN4X3/JmKrbZL6UGCQdgtAcZHNhRVr+4U
- Awbkt7auBk1+47NNuS+z5+QNxw+FOeeWaWWfogNuYT4oVdvmVe2xqvKwZsT0lJfa
- cD9CDd5zMUBrj95OeNGqAs3UtBZyJ8+WeCCnISmSLvfIx33j0wOf/gRkDGo4My8c
- XFSXDITeCQIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
- 6pDjue0wHQYDVR0OBBYEFEaX2Ffnub92Gu5nd0efBgpPl26LMA4GA1UdDwEB/wQE
- AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
- AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
- MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
- bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
- cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
- cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAzLmJ1Y2tzLmFjLnVrMA0G
- CSqGSIb3DQEBBQUAA4IBAQBwutInsCS1qellB/wBmWl4+p+AQCHlDTy3Y7Gjf0cq
- YBxX+WIMK9SImrghfyup5oeNW48ZyoYCFPrvVi5TnD0ePLEmq2OlwS5QPze5Mcj1
- nc6ZN1AZ/NoGjruL5VPXnqqpBtZhdiqJTVhz4e3Cu7aMNdvrmp1N9OmErTjzUgPM
- cguZEpCIsvjpOFM3DFJipy2cgw+pm8D5UWFJSnh9tabIl3JlSzqKs4/8fg/Bt+rm
- j/vHB25TABxWABlqgiECCNu769HoO1GyA2D5ndq1TpitlxwRKomochfdj/dzBnUb
- h5Z+5jD6KctmouJkUll6AJeuyu7XmvyP37oXnKxI0SPh
+ MIIDLDCCAhSgAwIBAgIVAOzsg1/QvG6GlxDD0oixe7saqY58MA0GCSqGSIb3DQEB
+ CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU2
+ WhcNMzUxMTEyMTQxNzU2WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncjTXXULy1jZ0DQn0AdP745N
+ AqZQhnf2kw4qg/p+QdCKX9AXS9NoE067k6UEQ21rljSHNKBmZLq6AoO1wTOvxI4m
+ GsOz4NJaBOvCuMgFEww93p0tsyncKyo7DawvDj2NFS/Lfop/FixhFTxTIzq58bJi
+ u1s0CYzXoWVhXZmbPPz6fc6JwnSe/b0qE9cFf5tLdYFGhKN3a8pXn/pRuNVlouVD
+ Cf4j2jUyXoniYOulPeyZg2WhG7X8kj6bgdaVLY0MGR/F6UerVbqpEEU41/szjw0p
+ 4Xf1QihYueaGMZjxrxw1fEHmsf5CqSL06yh8R3+MMwgfBqqq/CtCb65Si2N8/wID
+ AQABo2cwZTAdBgNVHQ4EFgQUMF/aF1hr/K1zjWgo+33U2JhMoDMwRAYDVR0RBD0w
+ O4IQaWRwMy5idWNrcy5hYy51a4YnaHR0cHM6Ly9pZHAzLmJ1Y2tzLmFjLnVrL2lk
+ cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA+ktUiMDNcGNSgUPZbYpsc
+ eLVLDOnjZr3gtLQxp3icZ9tJSg8rgvl+rPsGj6PU70fT+xwpbIPVPvQdKfc6RrFw
+ t3zNtTHnsC+BXeQq/Q/vI5668Edg9MYSNQkGXArMNIleDmp8k8vImQUcXKo0cvJz
+ 5YC28RXv+o0ps/vUETv1uw+bq7qOixZWidd9/JfLJJeK5o4w2hc788sn2/SWgZll
+ IsskCLVsmeAnKVlvqOhPOWzw15NcK0RQZxuxUFqGxFIGwDRm8bhhsXZql6NSqZWS
+ TQZq49Nrw0CYAAaMBdh38rSxAbF/RkpQjh265fw0s0GXrCbacEhONcqNl3PIL09L
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLDCCAhSgAwIBAgIVAJJgU10aDKjkSRc9fnYGv63VALGeMA0GCSqGSIb3DQEB
+ CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU3
+ WhcNMzUxMTEyMTQxNzU3WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvS5TCq2OYLfSoO+q8Q5E+oo6
+ Xea/x47rL37fvRtT39FYYgiRDSa0mcHFtnvULQI45Yh/U9MjeE5Ol9/G3I5p9o0R
+ RZMoKVVnaegwSE7vygJd8rEzJXcXouoWQ3ePIUoTSoCjLjL1MATXPU3Z8f7H5/rU
+ 6UgzcJ4dDs/xkIkIL+it3sENBm6jnddj1keNg5yIVf8I+EckJaGfqvY+AUhsN/bC
+ mvf6o3tIMrqw41u5Wt2XG3jhxRt2F9ei4FCIM/XppBHvzA8NR4qZqGGMrSp19fAE
+ VLpWJlivpaoSv/XheYV4NXL5CKOocCThxwt9NoicmabOQdq6hRbas/x6mW6nHQID
+ AQABo2cwZTAdBgNVHQ4EFgQUV1ip+SftPrM1Ib+LMfvMzjYmFKMwRAYDVR0RBD0w
+ O4IQaWRwMy5idWNrcy5hYy51a4YnaHR0cHM6Ly9pZHAzLmJ1Y2tzLmFjLnVrL2lk
+ cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCuTOFng8ZyGpXTwt91yGT9
+ QJ9uf0/hIxzFSvoK9fnM8sv7MOalZfQV+ENjQ70LABFuD5429dDq1Rm6JGTDEywG
+ I5spspkqWlq0YIjXlbWqZZpk8S/SazbSrm1GkaIqKXqyd1tJystzgOeUojAUMsE6
+ VQtC2IuRe/ES9DHmTVZVxA7Nl8+KVzI5llJv6uOnf3zMdweH0WH+GWUixJxeMKGL
+ 9dMTFSDNYzvy8DXVVhOJQ1QSzeWfszC11PxjNmLnt4wQ7iJ6mgiZ2eCTg8tJnhlj
+ IkB9rjmfh3VWJXkX4+k73yaY7QsyGPCJ4FeNj8S1uhMBMm2h7wZr65aGQvaMVfLP
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.bucks.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">Buckinghamshire New University</OrganizationName>
@@ -103,12 +193,12 @@
<OrganizationURL xml:lang="en">http://www.bucks.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>ITHelpdesk</GivenName>
- <EmailAddress>mailto:it@bucks.ac.uk</EmailAddress>
+ <GivenName>Core Systems</GivenName>
+ <EmailAddress>mailto:coresystems@bucks.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Michael</GivenName>
- <SurName>Thompson</SurName>
- <EmailAddress>mailto:Michael.Thompson@bucks.ac.uk</EmailAddress>
+ <GivenName>Oliver</GivenName>
+ <SurName>Facey</SurName>
+ <EmailAddress>mailto:oliver.facey@bucks.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..9fded05e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.cyceron.fr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-02T15:40:57Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cyceron.fr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Cyceron</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wwCDwEr/r6u7AAAAhVJREFUOMttk02IjWEYhq/7mzlNI8k0zaTs2Ig6RzaSGspPyopS0qREsqbQec8CnfeEDVvC0kKEskBk/JXC4vs0iUyWZmxmLGRM47stvEdf0zyrt6f7uZ7fVyQL9UgsAqEej0oatn1J0k+gF7hg+y7wCrgu6ZDt/bEIt7IuIAUH4ApwDnjXzpsAe4DjwO35+XkBBwEBkUQHoNXoZMAo4CRY02p0hsqyfJBl2RNJ92q12glgFlgi6TFJSAVyB9gLYBtgCJiWZNvfgUHgs6R9c3NzH2q1mrNQj/8Btjen55gkgAlJU7YngGWSkDRcluX4xY9nHItAr6T1rUbnGdBnu9d2TyxCGepxi6QxAEmDtr/aXi5pQFIN+AOgUI8fgHX6l/IbsLKdN50241QJwJt23tyUWp0B+oDYC6xOwbY9FIvgUI+Hga2SfgH9aR7nK60iqQ84mUm6bBvbktRuNTprJV2TNGq7HzglaSQW4X5l3q9ty/bNrJ03m8AuSdvbefMscLq6Gdt5O2++XHBwu4GhWIRjajU6pIPpCnZKelRhNIBPwO+qrmvVQ1ple6Okq7Zn0/omgRyYiUUYYBFTCh4BnqdBSlKjnTeLVqMzBQynIe6IRXiyEJClPo9UgcB08o9XtG8Xq6D7md6lLKS9d/0HbO+TtCEW4cdigJ50yu+BpZJmgBtlWT4cWbGtD8gkTQJfXkw99WKAvw6F+iqRRKrtAAAAAElFTkSuQmCC</mdui:Logo>
+ <mdui:InformationURL xml:lang="fr">http://www.cyceron.fr</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Idp cyceron</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Cyceron</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Idp cyceron</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDJzCCAg+gAwIBAgIUd4yV7VyJaaQKxD07SGw7Mn368dkwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPaWRwMy5jeWNlcm9uLmZyMB4XDTE1MTIwMjEzMzQyM1oX
+DTM1MTIwMjEzMzQyM1owGjEYMBYGA1UEAwwPaWRwMy5jeWNlcm9uLmZyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnCJRC+vTSzgV9lVg0zUR5VzPmUbi
+MXVIGNtfg9ZRukOtdksNmbXUunvrJ+gG6rU2mdFNwnYc7SoYM2IzLqDZRWNTDESg
+E3whqTQ/mIfq3GHGNowlDBUIEeNtOOrAnrLnUX1ajLUESWpeNw/dFv46xr9Be93n
+gnP4z6gxLYnwaj2t52QJl60m4iqFqsSFfQbtBoQJo0x6DR44gB8ZQ5J+f2ylDnlD
+QsZJur2u53nH9Ja00gHtVBB9DV1gPRWQ8RzhcA1S47BzieDEtNtxppyYoW25I+tR
+2uw5CNq2xJMMTcJFHIXrnv/7+HEJAW6GZylB7/R6z0SYEZGZI6ff+6U9fQIDAQAB
+o2UwYzAdBgNVHQ4EFgQUHUzKe91PU4ztZ5XWpwejI2zQ+CIwQgYDVR0RBDswOYIP
+aWRwMy5jeWNlcm9uLmZyhiZodHRwczovL2lkcDMuY3ljZXJvbi5mci9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEADDyuxvPXK3/OP9vZ6QCakxTzLDhP
+Sz5vsenCwGRlELfqBLUT/wU2FqgaVM6Z6YyeBWcXjVZ9u1jqovn8B+9saeCoJMN/
+fqnqIzjWt84UXNmCiVdQ/zhGF4KRkXxDR0lyW7MkTI0L3tZ/TY21Dcgbm7ACaHV0
+3jVbpwNVin0fd+b0R45UlIMcVjSG44fNpctROgRstPgmnQHu+HFAl5QnYKl+12AW
+33nMIlovQpwCdCGTKk0WUUutJcCbrFFYZUHEzi4v3rqcLzaQ4xxK6tJTvGvAaQPA
+oHzPlWtlZWRz8eUkil/RDUfqu2/GSUhl0CIvH7Ib10F4sZlZP00xsWd4yA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.cyceron.fr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.cyceron.fr/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.cyceron.fr/idp/profile/Shibboleth/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Cyceron</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Cyceron</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.cyceron.fr</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Antoine NOURRY</md:SurName>
+ <md:EmailAddress>nourry@cyceron.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
index a32b9195..b19d0dca 100644
--- a/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
@@ -11,10 +11,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usp.br</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</mdui:DisplayName>
- <mdui:Description xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</mdui:Description>
- <mdui:Description xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</mdui:Description>
+ <mdui:DisplayName xml:lang="en">USP - Universidade de Sao Paulo</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">USP - Universidade de Sao Paulo</mdui:DisplayName>
+ <mdui:Description xml:lang="en">USP - Universidade de Sao Paulo</mdui:Description>
+ <mdui:Description xml:lang="pt-br">USP - Universidade de Sao Paulo</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.usp.br/</mdui:InformationURL>
<mdui:InformationURL xml:lang="pt-br">http://www.usp.br/</mdui:InformationURL>
</mdui:UIInfo>
@@ -100,10 +100,10 @@ XmViErkqVYyvS+Fpeslb5K1Zlyk=
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">USP - Universidade de Sao Paulo</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">USP - Universidade de Sao Paulo</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">USP - Universidade de Sao Paulo</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">USP - Universidade de Sao Paulo</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.usp.br/</md:OrganizationURL>
<md:OrganizationURL xml:lang="pt-br">http://www.usp.br/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml
index 988a6652..ba73e43e 100644
--- a/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml
@@ -8,7 +8,7 @@
<mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</Extensions>
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bham.ac.uk</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -17,28 +17,80 @@
<mdui:Logo height="48" width="39">https://idpdev.bham.ac.uk/idp/images/University-of-Birmingham-crest.gif</mdui:Logo>
</mdui:UIInfo>
</Extensions>
- <KeyDescriptor>
+ <KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDMDCCAhigAwIBAgIVAIYsx+VotYdyVTmVfMXJU4jl5M1bMA0GCSqGSIb3DQEB
- BQUAMBwxGjAYBgNVBAMTEWlkcGRldi5iaGFtLmFjLnVrMB4XDTEzMTAyMzA3MTM0
- MFoXDTMzMTAyMzA3MTM0MFowHDEaMBgGA1UEAxMRaWRwZGV2LmJoYW0uYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCY1FzTRZgi3cA4QNBcz4xV
- ZFi8+EqBjDqQ2fef/4ckTS6W/nrV0qsAx7Hlthl4O1XlzGC2bk2+ZdLFFCQ4nV64
- 0/ec4Wx2UxEZXpxQjibnv0MqYbyk/J/wiAKp+xGA0NT3EOP8pCamp2QXWgZWBysR
- kb4Rpp3NcTRUTuDMk4nevte93t0D5tExns8/INhpPrDcshTJvcqe8ceYuu8qXYC3
- OhBfpG4xYMdosIaATTYouAFHAu3Y9x7+uhkmdkY6HxAgbHrFCQLw0NdStHjZnEMo
- FhqUPvQ/mM7hAeLgv+ivO2onTG16pEMT3xBolhwMmUumPE6W42L0zCtCGmaIRrTb
- AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczov
- L2lkcGRldi5iaGFtLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQzLn0z
- tT3JpTytvqqhKNA5jtDrBTANBgkqhkiG9w0BAQUFAAOCAQEAbewlCu0UQk1sQRRK
- ZRkARC7tHeeShJtm5xiA3tPARCJuUU5g635kdn0HDZRqynQHuOGyQK/5pif77kE/
- TvbgqYEydFkU6NpM9Ne78CD10IjCpz+P/zjTVXcxIDa2jJiJqFcqNp0YIkoVdMzn
- T3zHRhWrJJ+yBglhscYdfNMpfPXTTQyR2mtgtB1gFDSWyMNIktRiUcSvltCol+pl
- mMEHtar6zXK5BR8uawb21eNUiYbCLPi6X87G4HidymZk157RPBW7l+qPYNMUyt5E
- c32vcTICvbiBLWmnqG8k6evZ9Ztpd+rlDpGO+iynDGglTmnOA6HbmT9P9DBEEwso
- 1YEpyA==
+ MIIDLzCCAhegAwIBAgIUIVfgOu5tTWi4eR0vOLjm8kVDIzgwDQYJKoZIhvcNAQEL
+ BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA4
+ WhcNMzUxMTE5MDg0NzA4WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
+ ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALG3IP3QvX9BKJDA94oGiquA
+ Mz15vKyq/OtUkLmiC19jzJg6VtznAL6yp4qFPv4t/19pj+2reQWT7zs5nkTEKkkj
+ ap4FOOpyGRuwPQQG48Gc2jYEY00BJM+TPa8LnotOR6znW333Ep3k1/pSr6dDpwHE
+ 08mnqnmJDCUVyAzqmApkNPYTlepo9oW94RvQ0WpXj0Z5KwhoE4yuxq7+mdHwInjI
+ XRQt6iHCOOapTcai47EC50z10WevvjqGBoPtWO/kaApC/H1sjw/8FmoV0Bn+BD0n
+ 423NXJnQ2kUm43vZuuHEjuw1ByNvbW4lx33ghTIT0yX7sGQwtoJDYbTGDzRdG08C
+ AwEAAaNpMGcwHQYDVR0OBBYEFKct1G1nTMcO8eIOvkAnHOgeJFmpMEYGA1UdEQQ/
+ MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczovL2lkcGRldi5iaGFtLmFjLnVr
+ L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBvofZpFqz8kPrEPSVY
+ zPeClJi1VajT0HznS94/ZDYJMu/xP+fjaXSgGNKYpo37Uc079s/tteWxA9y5hJ0G
+ 64sGBXm2041w3FhbK/IJo4WGQf5utrF0aNhPAT4x4NAWRwZRA2JqHNV/Geawmht3
+ p6y9IYZNOrv4M2YHzVmeY25Nb3c4AEsG47chKwFsReLvcuucqbMWC7yJUZoqCOT7
+ fgbE9mA7sxBJ8warsZ6DVZmljLnF92j/X/lXDGjURpapxtSY0+UYg0FAwq4YlA4w
+ sZsmv/TzR9q8jnIN9nRfOVaA/uIzGPuI7hlMbTfkx0gAXOxFF2uiwX0H/SXGmYkk
+ tHKz
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMDCCAhigAwIBAgIVAJ+rTweaxT3S5IdRTlFMWNcLNE1IMA0GCSqGSIb3DQEB
+ CwUAMBwxGjAYBgNVBAMMEWlkcGRldi5iaGFtLmFjLnVrMB4XDTE1MTExOTA4NDcw
+ N1oXDTM1MTExOTA4NDcwN1owHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWsw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUaNT+DQalsoK/PJotX5oh
+ seeMwxjnMpFJNljC/l4tet23SMyk2596lp9Y8sE3yKh2FtnznsF4S+TI+x/bx+gt
+ Euu5MAgwZMb2ZZFaYTp6O0d0fE588PJE47b7gWczkxPrXu1aGIBy3cffMyhdqL1e
+ bG6/mSc15t0RQear14o2oELmubPR+ZjrH88WOqzAtz2oSN5VYE0hutqV6PdUC8AS
+ q8gcIzJ2u14oxr0P3zfV93qhxiD9P6kSKdF2kqKAcht4+0uMchWbWLbqLpumuS69
+ CnuV1iglJGJopDbEMK6bYr8XMVcU5fbhdFGBUNSnOKUd/89GbKvBTX+mjdRmzv4H
+ AgMBAAGjaTBnMB0GA1UdDgQWBBTWrGSLIekxRAms8ycd1foNhIMB5TBGBgNVHREE
+ PzA9ghFpZHBkZXYuYmhhbS5hYy51a4YoaHR0cHM6Ly9pZHBkZXYuYmhhbS5hYy51
+ ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEALNUtZ95OSpqYy4HL
+ bcLDeFsVwfWAwg7kOrezxRWWVdz6noGhr891sAQ4m1bIkNMHtwkJd9t5bJqw3kk1
+ f/37P1gfNJG73EbyarZU6QzyzEOljRYPxFiagDe/pom4uoSumr2cpu56PW5gq5RD
+ BIK1y6p5gu/NbDwqTPGkltVzRTCjVm44G5m8OtLvvAjtKhoNw/Dex4yxofdhdCrs
+ 3S+sgmkLrNrjUHcCBefyLbrX+T6KbVKjhNZHDlNNqkKiw8MbWo9eQwcwjNV4Ln8z
+ OvMRf3TuK2qF9eWHTcGhip5YVOeps3YnuVE3iFzvSeW7sFuydHpiLxeDAV3Zz/fX
+ 1eJP3Q==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLzCCAhegAwIBAgIUUI3OcSf1ugfmUml1jp6Uz6UPFf0wDQYJKoZIhvcNAQEL
+ BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA3
+ WhcNMzUxMTE5MDg0NzA3WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
+ ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKv0OMi7eSvWLrc7jc4jfBsk
+ r+3mD8o38/LuKJkxpfzgAuz91XbX/1+5sx24gpb4f94RVYbVA8i/hEbvR3lneiiN
+ 9A3yApH3NNmvEhQH7Qzol2ZXhWdBHmNf57h7L4RHgyPtcSxPjPkL387haB3iGoU1
+ Nz6Wr/RwSaYks4VXVh8/EJH2908H+PTk3PM2WlTqMLdllzZTimq1y9PZeZZNDDTM
+ 9+RTZIZW+B/VRwlmist3L46I+ftHyJzQpDleCq/WeajFMQriTYVi8NFYw+ym2Drl
+ wmThyH4g99kK0Ofrv5gigDLpMdn5oQ7CA4AdAHcNMN7wU6DCgzyuUstOHCKRJlEC
+ AwEAAaNpMGcwHQYDVR0OBBYEFO9JKvKCIsh+vUHamkucUrIv+beQMEYGA1UdEQQ/
+ MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczovL2lkcGRldi5iaGFtLmFjLnVr
+ L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAE4MCBT5XbidZy6cyy
+ E939H/RzH8OVX+zqaERhPPRHFue6155e20KgBorDtr8ACbur33e4gQotJYFvjtt8
+ HCFZbSQwvW3OBtQPzqG5yZZ47EH0aasrqIA3PY8hVis9fSwjStFSR7cAygUUFRuB
+ imk4LuZAq2W54mkl+xazBjpcZN4cK118cyL/TMxNXPJ82qGAfy8mdIsIGKEfhBdI
+ rMvl4K04hEvzQblh3Lghb1GtF8GMjIIQAjQIoUiRPCWUd37tRW17rE1RLLjVCLlz
+ SnivPWw0ouKAaF/GJbfDfu2SAhuJ2Fw6RC7bU7pyMbFZ3NrCAQHA4l0tJAHME7EA
+ 2T4z
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -52,40 +104,89 @@
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bham.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLzCCAhegAwIBAgIUIVfgOu5tTWi4eR0vOLjm8kVDIzgwDQYJKoZIhvcNAQEL
+ BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA4
+ WhcNMzUxMTE5MDg0NzA4WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
+ ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALG3IP3QvX9BKJDA94oGiquA
+ Mz15vKyq/OtUkLmiC19jzJg6VtznAL6yp4qFPv4t/19pj+2reQWT7zs5nkTEKkkj
+ ap4FOOpyGRuwPQQG48Gc2jYEY00BJM+TPa8LnotOR6znW333Ep3k1/pSr6dDpwHE
+ 08mnqnmJDCUVyAzqmApkNPYTlepo9oW94RvQ0WpXj0Z5KwhoE4yuxq7+mdHwInjI
+ XRQt6iHCOOapTcai47EC50z10WevvjqGBoPtWO/kaApC/H1sjw/8FmoV0Bn+BD0n
+ 423NXJnQ2kUm43vZuuHEjuw1ByNvbW4lx33ghTIT0yX7sGQwtoJDYbTGDzRdG08C
+ AwEAAaNpMGcwHQYDVR0OBBYEFKct1G1nTMcO8eIOvkAnHOgeJFmpMEYGA1UdEQQ/
+ MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczovL2lkcGRldi5iaGFtLmFjLnVr
+ L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBvofZpFqz8kPrEPSVY
+ zPeClJi1VajT0HznS94/ZDYJMu/xP+fjaXSgGNKYpo37Uc079s/tteWxA9y5hJ0G
+ 64sGBXm2041w3FhbK/IJo4WGQf5utrF0aNhPAT4x4NAWRwZRA2JqHNV/Geawmht3
+ p6y9IYZNOrv4M2YHzVmeY25Nb3c4AEsG47chKwFsReLvcuucqbMWC7yJUZoqCOT7
+ fgbE9mA7sxBJ8warsZ6DVZmljLnF92j/X/lXDGjURpapxtSY0+UYg0FAwq4YlA4w
+ sZsmv/TzR9q8jnIN9nRfOVaA/uIzGPuI7hlMbTfkx0gAXOxFF2uiwX0H/SXGmYkk
+ tHKz
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDMDCCAhigAwIBAgIVAIYsx+VotYdyVTmVfMXJU4jl5M1bMA0GCSqGSIb3DQEB
- BQUAMBwxGjAYBgNVBAMTEWlkcGRldi5iaGFtLmFjLnVrMB4XDTEzMTAyMzA3MTM0
- MFoXDTMzMTAyMzA3MTM0MFowHDEaMBgGA1UEAxMRaWRwZGV2LmJoYW0uYWMudWsw
- ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCY1FzTRZgi3cA4QNBcz4xV
- ZFi8+EqBjDqQ2fef/4ckTS6W/nrV0qsAx7Hlthl4O1XlzGC2bk2+ZdLFFCQ4nV64
- 0/ec4Wx2UxEZXpxQjibnv0MqYbyk/J/wiAKp+xGA0NT3EOP8pCamp2QXWgZWBysR
- kb4Rpp3NcTRUTuDMk4nevte93t0D5tExns8/INhpPrDcshTJvcqe8ceYuu8qXYC3
- OhBfpG4xYMdosIaATTYouAFHAu3Y9x7+uhkmdkY6HxAgbHrFCQLw0NdStHjZnEMo
- FhqUPvQ/mM7hAeLgv+ivO2onTG16pEMT3xBolhwMmUumPE6W42L0zCtCGmaIRrTb
- AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczov
- L2lkcGRldi5iaGFtLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQzLn0z
- tT3JpTytvqqhKNA5jtDrBTANBgkqhkiG9w0BAQUFAAOCAQEAbewlCu0UQk1sQRRK
- ZRkARC7tHeeShJtm5xiA3tPARCJuUU5g635kdn0HDZRqynQHuOGyQK/5pif77kE/
- TvbgqYEydFkU6NpM9Ne78CD10IjCpz+P/zjTVXcxIDa2jJiJqFcqNp0YIkoVdMzn
- T3zHRhWrJJ+yBglhscYdfNMpfPXTTQyR2mtgtB1gFDSWyMNIktRiUcSvltCol+pl
- mMEHtar6zXK5BR8uawb21eNUiYbCLPi6X87G4HidymZk157RPBW7l+qPYNMUyt5E
- c32vcTICvbiBLWmnqG8k6evZ9Ztpd+rlDpGO+iynDGglTmnOA6HbmT9P9DBEEwso
- 1YEpyA==
+ MIIDMDCCAhigAwIBAgIVAJ+rTweaxT3S5IdRTlFMWNcLNE1IMA0GCSqGSIb3DQEB
+ CwUAMBwxGjAYBgNVBAMMEWlkcGRldi5iaGFtLmFjLnVrMB4XDTE1MTExOTA4NDcw
+ N1oXDTM1MTExOTA4NDcwN1owHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWsw
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUaNT+DQalsoK/PJotX5oh
+ seeMwxjnMpFJNljC/l4tet23SMyk2596lp9Y8sE3yKh2FtnznsF4S+TI+x/bx+gt
+ Euu5MAgwZMb2ZZFaYTp6O0d0fE588PJE47b7gWczkxPrXu1aGIBy3cffMyhdqL1e
+ bG6/mSc15t0RQear14o2oELmubPR+ZjrH88WOqzAtz2oSN5VYE0hutqV6PdUC8AS
+ q8gcIzJ2u14oxr0P3zfV93qhxiD9P6kSKdF2kqKAcht4+0uMchWbWLbqLpumuS69
+ CnuV1iglJGJopDbEMK6bYr8XMVcU5fbhdFGBUNSnOKUd/89GbKvBTX+mjdRmzv4H
+ AgMBAAGjaTBnMB0GA1UdDgQWBBTWrGSLIekxRAms8ycd1foNhIMB5TBGBgNVHREE
+ PzA9ghFpZHBkZXYuYmhhbS5hYy51a4YoaHR0cHM6Ly9pZHBkZXYuYmhhbS5hYy51
+ ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEALNUtZ95OSpqYy4HL
+ bcLDeFsVwfWAwg7kOrezxRWWVdz6noGhr891sAQ4m1bIkNMHtwkJd9t5bJqw3kk1
+ f/37P1gfNJG73EbyarZU6QzyzEOljRYPxFiagDe/pom4uoSumr2cpu56PW5gq5RD
+ BIK1y6p5gu/NbDwqTPGkltVzRTCjVm44G5m8OtLvvAjtKhoNw/Dex4yxofdhdCrs
+ 3S+sgmkLrNrjUHcCBefyLbrX+T6KbVKjhNZHDlNNqkKiw8MbWo9eQwcwjNV4Ln8z
+ OvMRf3TuK2qF9eWHTcGhip5YVOeps3YnuVE3iFzvSeW7sFuydHpiLxeDAV3Zz/fX
+ 1eJP3Q==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLzCCAhegAwIBAgIUUI3OcSf1ugfmUml1jp6Uz6UPFf0wDQYJKoZIhvcNAQEL
+ BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA3
+ WhcNMzUxMTE5MDg0NzA3WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
+ ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKv0OMi7eSvWLrc7jc4jfBsk
+ r+3mD8o38/LuKJkxpfzgAuz91XbX/1+5sx24gpb4f94RVYbVA8i/hEbvR3lneiiN
+ 9A3yApH3NNmvEhQH7Qzol2ZXhWdBHmNf57h7L4RHgyPtcSxPjPkL387haB3iGoU1
+ Nz6Wr/RwSaYks4VXVh8/EJH2908H+PTk3PM2WlTqMLdllzZTimq1y9PZeZZNDDTM
+ 9+RTZIZW+B/VRwlmist3L46I+ftHyJzQpDleCq/WeajFMQriTYVi8NFYw+ym2Drl
+ wmThyH4g99kK0Ofrv5gigDLpMdn5oQ7CA4AdAHcNMN7wU6DCgzyuUstOHCKRJlEC
+ AwEAAaNpMGcwHQYDVR0OBBYEFO9JKvKCIsh+vUHamkucUrIv+beQMEYGA1UdEQQ/
+ MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczovL2lkcGRldi5iaGFtLmFjLnVr
+ L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAE4MCBT5XbidZy6cyy
+ E939H/RzH8OVX+zqaERhPPRHFue6155e20KgBorDtr8ACbur33e4gQotJYFvjtt8
+ HCFZbSQwvW3OBtQPzqG5yZZ47EH0aasrqIA3PY8hVis9fSwjStFSR7cAygUUFRuB
+ imk4LuZAq2W54mkl+xazBjpcZN4cK118cyL/TMxNXPJ82qGAfy8mdIsIGKEfhBdI
+ rMvl4K04hEvzQblh3Lghb1GtF8GMjIIQAjQIoUiRPCWUd37tRW17rE1RLLjVCLlz
+ SnivPWw0ouKAaF/GJbfDfu2SAhuJ2Fw6RC7bU7pyMbFZ3NrCAQHA4l0tJAHME7EA
+ 2T4z
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">University of Birmingham</OrganizationName>
diff --git a/swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml
index 58078646..0cba31f1 100644
--- a/swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpi.unirc.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpi.unirc.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T06:22:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml
new file mode 100644
index 00000000..1dd16a52
--- /dev/null
+++ b/swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpstaff-ha.belnet.be/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Belnet</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Belnet operates the research and eduction network for Belgium.</mdui:Description>
+ <mdui:Logo height="16" width="16">https://federation.belnet.be/images/smallbelnetlogo.png</mdui:Logo>
+ <mdui:Logo height="75" width="153">https://federation.belnet.be/images/belnetlogo.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>193.190.0.0/15</mdui:IPHint>
+ <mdui:IPHint>2001:6a8::/32</mdui:IPHint>
+ <mdui:DomainHint>belnet.be</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:50.825312,4.365471</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFhTCCBG2gAwIBAgIQAbu/mz6B3uQHzR3sVYBohTANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNTEwMTUwMDAwMDBaFw0xODEwMTkxMjAwMDBaMIGcMQswCQYDVQQG
+EwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMTQwMgYD
+VQQKEytMZSByZXNlYXUgdGVsZW1hdGlxdWUgYmVsZ2UgZGUgbGEgcmVjaGVyY2hl
+MREwDwYDVQQLEwhTZXJ2aWNlczEeMBwGA1UEAxMVaWRwc3RhZmYtaGEuYmVsbmV0
+LmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzKNVDc6TiZnNP0tF
+f0IBNV3yHm8geck6z7iB18+nXY0t9hjE3PNC0v4gA8kJjFj1Ys5rqE0ldQNhAu8g
+KzWQeaaYfOJoGKyu85Gnc4qAhVAhvl1X7dzNNl+Db1Z5suhm8Jxi8MX2ohwxSjZJ
+/ldnwRaOAa3zO4rgu0BpGPJzQDoP2ksY21gQpePpD5xvMnK+t8oPYDU74R+mYESa
++t9bdNLXMZzQXaHjUDpdmZrkO9+eIn4KWtY8ofk0p0wNMRqOwqYoPG72nVX7+Pjj
+SkoCqFW2iNcBtaQF/0mB0Jr3xB8A6p4qCz7slAloRcnDrWWzlrtzEnkBIBifalwT
+6K+V0wIDAQABo4IB+DCCAfQwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1
+UGIwHQYDVR0OBBYEFIOvPcmgxVMJApesOV1Rzw+i5au9MEoGA1UdEQRDMEGCFWlk
+cHN0YWZmLWhhLmJlbG5ldC5iZYITaWRwc3RhZmYxLmJlbG5ldC5iZYITaWRwc3Rh
+ZmYyLmJlbG5ldC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2lj
+ZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdp
+Y2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwB
+ATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgG
+BmeBDAECAjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
+LmRpZ2ljZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDovL2NhY2VydHMuZGlnaWNl
+cnQuY29tL1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0B
+AQsFAAOCAQEAa9DOAi4UzgtnmAyHCgbKtcVDkxTSom/2w4W2Kn5yLQvo6kEH0UEQ
+2Vwo7dPhAqhN7iAPS2hMKAT88cQNBbC/QIoeP9EFDSeCudXvTx5RpDaAcT4R+syM
+tXqnOCD00HuvXGQVizAhyqbM8sWTAm/7oBtAIHluKy7MWUuIRQvjlsfMTGXJ6Kw1
+Na+iw1Vgtc8JHrdTnpMUuqMoIQj3P4r05Udx66T/cWTneDZIO02s3nmiPnOUlk5Z
+LPAq+dQEmHEHrN6uQyM6zCVLcrYt9T44SlwUFnddBpB9zblq1iveB96mSvpPlnsX
+/zsUJwYbMt+gLa9vzGSwaDg0dP+4TrQNSw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpstaff-ha.belnet.be/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFhTCCBG2gAwIBAgIQAbu/mz6B3uQHzR3sVYBohTANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNTEwMTUwMDAwMDBaFw0xODEwMTkxMjAwMDBaMIGcMQswCQYDVQQG
+EwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMTQwMgYD
+VQQKEytMZSByZXNlYXUgdGVsZW1hdGlxdWUgYmVsZ2UgZGUgbGEgcmVjaGVyY2hl
+MREwDwYDVQQLEwhTZXJ2aWNlczEeMBwGA1UEAxMVaWRwc3RhZmYtaGEuYmVsbmV0
+LmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzKNVDc6TiZnNP0tF
+f0IBNV3yHm8geck6z7iB18+nXY0t9hjE3PNC0v4gA8kJjFj1Ys5rqE0ldQNhAu8g
+KzWQeaaYfOJoGKyu85Gnc4qAhVAhvl1X7dzNNl+Db1Z5suhm8Jxi8MX2ohwxSjZJ
+/ldnwRaOAa3zO4rgu0BpGPJzQDoP2ksY21gQpePpD5xvMnK+t8oPYDU74R+mYESa
++t9bdNLXMZzQXaHjUDpdmZrkO9+eIn4KWtY8ofk0p0wNMRqOwqYoPG72nVX7+Pjj
+SkoCqFW2iNcBtaQF/0mB0Jr3xB8A6p4qCz7slAloRcnDrWWzlrtzEnkBIBifalwT
+6K+V0wIDAQABo4IB+DCCAfQwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1
+UGIwHQYDVR0OBBYEFIOvPcmgxVMJApesOV1Rzw+i5au9MEoGA1UdEQRDMEGCFWlk
+cHN0YWZmLWhhLmJlbG5ldC5iZYITaWRwc3RhZmYxLmJlbG5ldC5iZYITaWRwc3Rh
+ZmYyLmJlbG5ldC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2lj
+ZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdp
+Y2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwB
+ATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgG
+BmeBDAECAjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
+LmRpZ2ljZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDovL2NhY2VydHMuZGlnaWNl
+cnQuY29tL1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0B
+AQsFAAOCAQEAa9DOAi4UzgtnmAyHCgbKtcVDkxTSom/2w4W2Kn5yLQvo6kEH0UEQ
+2Vwo7dPhAqhN7iAPS2hMKAT88cQNBbC/QIoeP9EFDSeCudXvTx5RpDaAcT4R+syM
+tXqnOCD00HuvXGQVizAhyqbM8sWTAm/7oBtAIHluKy7MWUuIRQvjlsfMTGXJ6Kw1
+Na+iw1Vgtc8JHrdTnpMUuqMoIQj3P4r05Udx66T/cWTneDZIO02s3nmiPnOUlk5Z
+LPAq+dQEmHEHrN6uQyM6zCVLcrYt9T44SlwUFnddBpB9zblq1iveB96mSvpPlnsX
+/zsUJwYbMt+gLa9vzGSwaDg0dP+4TrQNSw==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Belnet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Belnet staff HA IdP</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.belnet.be/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Belnet Federation Technical Staff</md:GivenName>
+ <md:SurName>Belnet Federation</md:SurName>
+ <md:EmailAddress>mailto:federation@belnet.be</md:EmailAddress>
+ <md:TelephoneNumber>+32-2-7903333</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml
index a5ee6ba5..0773a9b8 100644
--- a/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpuniba.uniba.it/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpuniba.uniba.it/simplesaml/saml2/idp/metadata.php">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-20T22:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml
index 8c033b3e..50fea100 100644
--- a/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpunict.unict.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpunict.unict.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-01-27T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..53cc180b
--- /dev/null
+++ b/swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpv3.essingtoncc.co.uk/idp/shibboleth">
+ <!--
+ This is a Shibboleth IdP for Essington Computer Consultancy Limited.
+ -->
+ <Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-06T12:07:22Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essingtoncc.co.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVANxdvblrHmOwk0K/rl10Sda/mMrFMA0GCSqGSIb3DQEB
+ CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
+ NDE1NTYxNFoXDTM1MTAxNDE1NTYxNFowIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
+ dG9uY2MuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcprpG
+ G0NVw74J4JKdvg7fGAdrBVniHTIkljKuTl9h8JnseVsrTdBq+8QVH+g9eoF6HgYq
+ LgS3ejgk4lX6OmTS8welpfyvX6Rml3vU4fvFb8JPiSB6zzzlp6KmGrWBt0vNRrQ2
+ jG0TeByBHTX+4TXI9/hC+WCHv5urgC3m+i8KcLzGRhj+ULq66wzqlkiFgCTgCpfz
+ vV6cu4CFkTW+8TR8vjcjqU16f/jzafqJKOWYY4nzutoudmytSatAHym8Doosxv3d
+ ieCCGxb6O9FNHbbAY7ycB5Mm2jTmqlNU2iJsYBDqixXyIfOAscJ21RCxTjpZt9Ce
+ 5UCicxpLDLvF5rr/AgMBAAGjdTBzMB0GA1UdDgQWBBT6YZEW8mN2VfFAMqscacoG
+ ui/n5DBSBgNVHREESzBJghdpZHB2My5lc3Npbmd0b25jYy5jby51a4YuaHR0cHM6
+ Ly9pZHB2My5lc3Npbmd0b25jYy5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+ 9w0BAQsFAAOCAQEAOsSFIttIYMwgmXQD22mKCFobO4SMXYRn+1yjGc5nEP/Mz+8s
+ W23exjfS80yiLnn435T/Iq+UMd4zkITo45tiNO01G/FnN+cGpHl8RB/P2NgQcZRP
+ QID3rle+Ufzr7APC1+ACZzxVk2GtT9QuWf7JYRLUQCeQOfIptgntDeIhX4uOTfdt
+ dl0Kmt0J9yOXgBoxvFQsNT+RCKScdTO+frwyKKpjBlR7sOngO8R8JJ/YHSYzJOXc
+ DshYuafoNMzlhChAmEjZgwbU+bMtjQv6A0J49uebhyyIbd5k3UGtuafv1XQXERL+
+ LmiAYOW7xsIlMcU3oGuPig1k5E9I4mtPxgqfQw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDRzCCAi+gAwIBAgIUQ+2SQEeM841I+Pr+e1Rf1G2mWtYwDQYJKoZIhvcNAQEL
+ BQAwIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5ndG9uY2MuY28udWswHhcNMTUxMDE0
+ MTU1NjA5WhcNMzUxMDE0MTU1NjA5WjAiMSAwHgYDVQQDDBdpZHB2My5lc3Npbmd0
+ b25jYy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQaBR9n
+ APsTg0QtFRtSAn/vnJ8EWRVpml3/4BdsrNtZslJ9WMX2wRiVCKqyVAUzVvB+fZW6
+ c0G4Om9OLcMHn9NqYOVNktxmApNj5yjAe1on1Jb9vpzzfz042brEQahSMH8dP2WK
+ BNl0zsEl6B+O5LGv9R6zWRpjcWpP/Hhdv1Mt2UCubk1j0YB0yigDCSJsKtlt4ADW
+ 0zcI8e+yltSWf2m5PJ2lOVfsE9lGMw2K9HnCo4wto2cMboXgZwTUbPz/opcZ6PWr
+ zN6OgX0MteSUrjoMkzKsLUKv3cs0Xn/+JRNEAtyWQvm6/DH2Z+EV0rDSQVbXPEmw
+ G7n3UM8PrSm5HVkCAwEAAaN1MHMwHQYDVR0OBBYEFIRy38M9ievXUaGPVTs7o70A
+ nYPBMFIGA1UdEQRLMEmCF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrhi5odHRwczov
+ L2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+ DQEBCwUAA4IBAQCy6r+ejtGEvl96u4RndrDZLZ9OYtga+axs3/4YjQV0tRIKa8En
+ TJnPdRGhxp1hskOmPtmYZQ3dLH3feLjb+ux8L2QDRYa0q4ghNIiHD75DYwnme1bc
+ 3VeO0rMIvOfjZnyQVfFTdVQmhcpYdeqrnZZOXBiuTXWVFvwChaCfEmHdUV93j7Gg
+ wuv77Rq2ZfASy8bfsYvCkkOlYV4lEAcZJLg+UgYzbdUf3lg9YUGsp0IdrFozQnL5
+ Sc5v7jqZOGcVPtR9xiewWBb5p9LjWLezZPYyM2nz6bJktSea75YDiJpFYIsGX1EA
+ gtlBzrAHoC/fd8GGCq5HZ0mQyNzrF70sEXN7
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVAPzpG2xrtqp1K0RSsJJUezfEZvB1MA0GCSqGSIb3DQEB
+ CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
+ NDE1NTYxM1oXDTM1MTAxNDE1NTYxM1owIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
+ dG9uY2MuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj9KaC
+ pr5xfua5HRef7zqgmclBmTQMwduUp4KEO91NB+YGlmyyfgNm9K8xZ+72dHbLMqyJ
+ K9YqQTuJLHBi4mVH2fmqYUGhTnOfLMP1cvSGdQyhl3Yp6YpyHa0L4ZIx1YRhVP7m
+ +uh0o6XTL8KGZQf5E+O6tP5CEqyTRLPPqFJCZZyGk5g/P848zmS5y//SgWs9irSz
+ TKf1xsgiaCa1j4BKOuk/0cYwc5Vr8UJw3iQVQNyY22IkbXcwgqoAejXl1a50k1ca
+ Zdv1sJbfMMxNRaJvSgJQazE4rhluCNmmPrd5pFizMZD8Rdci1325eKs9WPR8Q2UE
+ 3Q1BcAYk/UwrhU/HAgMBAAGjdTBzMB0GA1UdDgQWBBTpb8nD6p3duvAL1ovP5W1D
+ KtOVOTBSBgNVHREESzBJghdpZHB2My5lc3Npbmd0b25jYy5jby51a4YuaHR0cHM6
+ Ly9pZHB2My5lc3Npbmd0b25jYy5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+ 9w0BAQsFAAOCAQEAdgEszQ9bhu0UXACuvCpFkIsc0+2IyhlqYYO2sNRPiM+YgLIA
+ 1YrwPxlcmHomTf+VU7q+/s4ZNfYITbRcfNP4CFiiZR5AbkWDnMLQ281guKHLN6bq
+ 5VVqsyS4YBF0nv0NFf6Jk/BuqGJJV2zmWxUKIKxRnyiWnIzEMIn4nIOFAx9M7Gse
+ /AzjpZWOIrHPQVtCWLpq8+5bzXP66/9iuzgYv517JUjZo+AfBFInuqUCHXgazl4N
+ q1Jv3WZ9N9b7LT17+KzD30WQMYlRRO++T+j7McCQB2I32ymF8xo8NkpUjKA43m+z
+ 1oHqE+W7b2W2PL9JJ7zQEP5c4qax7abevAa5yw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.essingtoncc.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.essingtoncc.co.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essingtoncc.co.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVANxdvblrHmOwk0K/rl10Sda/mMrFMA0GCSqGSIb3DQEB
+ CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
+ NDE1NTYxNFoXDTM1MTAxNDE1NTYxNFowIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
+ dG9uY2MuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcprpG
+ G0NVw74J4JKdvg7fGAdrBVniHTIkljKuTl9h8JnseVsrTdBq+8QVH+g9eoF6HgYq
+ LgS3ejgk4lX6OmTS8welpfyvX6Rml3vU4fvFb8JPiSB6zzzlp6KmGrWBt0vNRrQ2
+ jG0TeByBHTX+4TXI9/hC+WCHv5urgC3m+i8KcLzGRhj+ULq66wzqlkiFgCTgCpfz
+ vV6cu4CFkTW+8TR8vjcjqU16f/jzafqJKOWYY4nzutoudmytSatAHym8Doosxv3d
+ ieCCGxb6O9FNHbbAY7ycB5Mm2jTmqlNU2iJsYBDqixXyIfOAscJ21RCxTjpZt9Ce
+ 5UCicxpLDLvF5rr/AgMBAAGjdTBzMB0GA1UdDgQWBBT6YZEW8mN2VfFAMqscacoG
+ ui/n5DBSBgNVHREESzBJghdpZHB2My5lc3Npbmd0b25jYy5jby51a4YuaHR0cHM6
+ Ly9pZHB2My5lc3Npbmd0b25jYy5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+ 9w0BAQsFAAOCAQEAOsSFIttIYMwgmXQD22mKCFobO4SMXYRn+1yjGc5nEP/Mz+8s
+ W23exjfS80yiLnn435T/Iq+UMd4zkITo45tiNO01G/FnN+cGpHl8RB/P2NgQcZRP
+ QID3rle+Ufzr7APC1+ACZzxVk2GtT9QuWf7JYRLUQCeQOfIptgntDeIhX4uOTfdt
+ dl0Kmt0J9yOXgBoxvFQsNT+RCKScdTO+frwyKKpjBlR7sOngO8R8JJ/YHSYzJOXc
+ DshYuafoNMzlhChAmEjZgwbU+bMtjQv6A0J49uebhyyIbd5k3UGtuafv1XQXERL+
+ LmiAYOW7xsIlMcU3oGuPig1k5E9I4mtPxgqfQw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDRzCCAi+gAwIBAgIUQ+2SQEeM841I+Pr+e1Rf1G2mWtYwDQYJKoZIhvcNAQEL
+ BQAwIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5ndG9uY2MuY28udWswHhcNMTUxMDE0
+ MTU1NjA5WhcNMzUxMDE0MTU1NjA5WjAiMSAwHgYDVQQDDBdpZHB2My5lc3Npbmd0
+ b25jYy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQaBR9n
+ APsTg0QtFRtSAn/vnJ8EWRVpml3/4BdsrNtZslJ9WMX2wRiVCKqyVAUzVvB+fZW6
+ c0G4Om9OLcMHn9NqYOVNktxmApNj5yjAe1on1Jb9vpzzfz042brEQahSMH8dP2WK
+ BNl0zsEl6B+O5LGv9R6zWRpjcWpP/Hhdv1Mt2UCubk1j0YB0yigDCSJsKtlt4ADW
+ 0zcI8e+yltSWf2m5PJ2lOVfsE9lGMw2K9HnCo4wto2cMboXgZwTUbPz/opcZ6PWr
+ zN6OgX0MteSUrjoMkzKsLUKv3cs0Xn/+JRNEAtyWQvm6/DH2Z+EV0rDSQVbXPEmw
+ G7n3UM8PrSm5HVkCAwEAAaN1MHMwHQYDVR0OBBYEFIRy38M9ievXUaGPVTs7o70A
+ nYPBMFIGA1UdEQRLMEmCF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrhi5odHRwczov
+ L2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+ DQEBCwUAA4IBAQCy6r+ejtGEvl96u4RndrDZLZ9OYtga+axs3/4YjQV0tRIKa8En
+ TJnPdRGhxp1hskOmPtmYZQ3dLH3feLjb+ux8L2QDRYa0q4ghNIiHD75DYwnme1bc
+ 3VeO0rMIvOfjZnyQVfFTdVQmhcpYdeqrnZZOXBiuTXWVFvwChaCfEmHdUV93j7Gg
+ wuv77Rq2ZfASy8bfsYvCkkOlYV4lEAcZJLg+UgYzbdUf3lg9YUGsp0IdrFozQnL5
+ Sc5v7jqZOGcVPtR9xiewWBb5p9LjWLezZPYyM2nz6bJktSea75YDiJpFYIsGX1EA
+ gtlBzrAHoC/fd8GGCq5HZ0mQyNzrF70sEXN7
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIVAPzpG2xrtqp1K0RSsJJUezfEZvB1MA0GCSqGSIb3DQEB
+ CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
+ NDE1NTYxM1oXDTM1MTAxNDE1NTYxM1owIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
+ dG9uY2MuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj9KaC
+ pr5xfua5HRef7zqgmclBmTQMwduUp4KEO91NB+YGlmyyfgNm9K8xZ+72dHbLMqyJ
+ K9YqQTuJLHBi4mVH2fmqYUGhTnOfLMP1cvSGdQyhl3Yp6YpyHa0L4ZIx1YRhVP7m
+ +uh0o6XTL8KGZQf5E+O6tP5CEqyTRLPPqFJCZZyGk5g/P848zmS5y//SgWs9irSz
+ TKf1xsgiaCa1j4BKOuk/0cYwc5Vr8UJw3iQVQNyY22IkbXcwgqoAejXl1a50k1ca
+ Zdv1sJbfMMxNRaJvSgJQazE4rhluCNmmPrd5pFizMZD8Rdci1325eKs9WPR8Q2UE
+ 3Q1BcAYk/UwrhU/HAgMBAAGjdTBzMB0GA1UdDgQWBBTpb8nD6p3duvAL1ovP5W1D
+ KtOVOTBSBgNVHREESzBJghdpZHB2My5lc3Npbmd0b25jYy5jby51a4YuaHR0cHM6
+ Ly9pZHB2My5lc3Npbmd0b25jYy5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+ 9w0BAQsFAAOCAQEAdgEszQ9bhu0UXACuvCpFkIsc0+2IyhlqYYO2sNRPiM+YgLIA
+ 1YrwPxlcmHomTf+VU7q+/s4ZNfYITbRcfNP4CFiiZR5AbkWDnMLQ281guKHLN6bq
+ 5VVqsyS4YBF0nv0NFf6Jk/BuqGJJV2zmWxUKIKxRnyiWnIzEMIn4nIOFAx9M7Gse
+ /AzjpZWOIrHPQVtCWLpq8+5bzXP66/9iuzgYv517JUjZo+AfBFInuqUCHXgazl4N
+ q1Jv3WZ9N9b7LT17+KzD30WQMYlRRO++T+j7McCQB2I32ymF8xo8NkpUjKA43m+z
+ 1oHqE+W7b2W2PL9JJ7zQEP5c4qax7abevAa5yw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Essington Computer Consultancy Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Essington Computer Consultancy Ltd</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.essingtoncc.co.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Andy</GivenName>
+ <SurName>Morris</SurName>
+ <EmailAddress>mailto:andy@essingtoncc.co.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Andy</GivenName>
+ <SurName>Morris</SurName>
+ <EmailAddress>mailto:andy@essingtoncc.co.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml
index 30958104..5848fe0f 100644
--- a/swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml
@@ -8,11 +8,11 @@
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="nl">Zuyd Hogeschool (nieuw)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Zuyd University (new)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="nl">Zuyd Hogeschool</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Zuyd University</mdui:DisplayName>
<mdui:Description xml:lang="nl">Zuyd Hogeschool</mdui:Description>
<mdui:Description xml:lang="en">Zuyd University</mdui:Description>
- <mdui:Logo height="48" width="45">https://static.surfconext.nl/media/idp/hszuyd.png</mdui:Logo>
+ <mdui:Logo height="48" width="45">https://static.surfconext.nl/logos/idp/hszuyd.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Zuyd University Hogeschool HBO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Zuyd University Hogeschool HBO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..3971d6d4
--- /dev/null
+++ b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iif.iucc.ac.il/idp/module.php/saml/sp/metadata.php/default-sp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://iif.iucc.ac.il" registrationInstant="2014-11-20T10:35:34Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://iif.iucc.ac.il/wordpress/wp-content/uploads/2014/06/IIF-Policy.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Inter University Computation Center</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</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>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iif.iucc.ac.il/idp/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://iif.iucc.ac.il/idp/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://iif.iucc.ac.il/idp/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://iif.iucc.ac.il/idp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">IUCC</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">IUCC</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.iucc.ac.il</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Administrator</md:GivenName>
+ <md:EmailAddress>support@iif.iucc.ac.il</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>info@iif.iucc.ac.il</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml
index 59b4031a..d0559a55 100644
--- a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml
@@ -6,6 +6,11 @@
</mdrpi:RegistrationInfo>
</md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Inter University Computation Center</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -25,8 +30,8 @@
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iif.iucc.ac.il/idp/saml2/idp/SSOService.php"/>
</md:IDPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">Inter University Computational Center</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Inter University Computational Center</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">IUCC</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">IUCC</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.iucc.ac.il</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..06ebb4c1
--- /dev/null
+++ b/swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://imperial.sisoshibboleth.co.uk/entity">
+ <!--
+ This is a "SiSo Imperial Online Resource Booking" Shibboleth SP for TechEthika Ltd.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-23T10:28:47Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://imperial.siso.co/sso/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://imperial.siso.co/sso/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">SiSo Imperial Online Resource Booking</mdui:DisplayName>
+ <mdui:Description xml:lang="en">SiSo Imperial Online Resource Booking</mdui:Description>
+ <mdui:Logo height="64" width="64">https://shibboleth.siso.co/siso-logo64x64.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+ BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+ DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+ MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+ bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+ dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+ +VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+ 5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+ A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+ grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+ bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+ GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+ GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+ dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
+ firJubLNu96jbGctasqcpQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://imperial.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">SiSo Imperial Online Resource Booking</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Info</GivenName>
+ <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Steven</GivenName>
+ <SurName>Oates</SurName>
+ <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml
index 16667f28..226079b1 100644
--- a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://indicate-gw.consorzio-cometa.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://indicate-gw.consorzio-cometa.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
diff --git a/swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml b/swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml
index 88df57e4..885f8fba 100644
--- a/swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml
+++ b/swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">HU University of Applied Sciences Utrecht</mdui:DisplayName>
<mdui:Description xml:lang="nl">Hogeschool Utrecht</mdui:Description>
<mdui:Description xml:lang="en">Hogeschool Utrecht</mdui:Description>
- <mdui:Logo height="39" width="108">https://static.surfconext.nl/media/idp/hu.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">HU University of Applied Sciences Utrecht Hogeschool Utrecht HBO</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">HU University of Applied Sciences Utrecht Hogeschool Utrecht HBO</mdui:Keywords>
+ <mdui:Logo height="39" width="108">https://static.surfconext.nl/logos/idp/hu.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">hu university of applied sciences utrecht hogeschool utrecht hbo</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">hu university of applied sciences utrecht hogeschool utrecht hbo</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/janus.cnrs.fr-idp.xml b/swamid-interfederations-2.0/janus.cnrs.fr-idp.xml
new file mode 100644
index 00000000..fde4882c
--- /dev/null
+++ b/swamid-interfederations-2.0/janus.cnrs.fr-idp.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://janus.cnrs.fr/idp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-02T14:55:56Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnrs.fr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">CNRS (new)</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC1klEQVQ4y4WTaUjTARjGf/+5NaduqzXLWK5a1+yge2W3SZeQMfpUEF2mFB1QBBFZUQRddNIlFEIRVtBh9MGi0o6PLpOif5uFdijZGrbSTf/b3j5YRgf0fHo/PM/z4eX3KPxDq3aXnKyofjmvLRYzO3vZ6hdNH3+1eMWCg/xPe85fP4UyWnDmCVNXCrOKhOmrhcFeITNPio5cuvNnRvl5OPI3qB/Kbw5l0gwwGUGvhyQ9GPSdtngCAu/hU5C3deX5TrvlFoAOYOPRC2c+3K0Yyrgp0PgJPgbhWwQlkaDb1zZo/AwJQZdph3FZOJ2Lyh+8eL0cABExYugrq/aXiki7SPtXYetZoSog3H8hFB4SaQmLiMiwktuiVKrCkesCbgFIqg2Zzqu+plHXLhTTI3Ua6Y7eZCzOw3/jHp5Xdbybl8uuXqnoczbT7J1J8o7jxPyvwGhj3c7tVl2N/+0Ie7ab2uo66GFl3Zq9ALhSjAxITgCg2tMwKVHMz/1oWwphRBbYTVTWBGbp0oz6b8HmEFazCcdYN47cbACaox1dnw4rCu29baRUPCTpWCmsXQoGAx1tEaNuxoTh1TTUMyV7DAD+s8UEQl+Ia/HOtBbHo+jRPgYJeuej5Xgg0gFaB067tUE3e+qYO7S2Mq1wF/V3S8jdd45HBbuxqWpnweUbFJ24AslG4r5axNkXdhwA3zu8c7Kv/uBgpOB2QWMIMtIh2cCQYS48bgcXL1WBzQw9LRCJQqgFUk1Q44fWJ4oOYPaKhfdRVXD1AasJknQQj3V2mwyQ1g2iUSAB3c3wxMem/esP/0YiZAiusWBJg5gwJKs/nuH9uFhWBelmfkADzwLgcsCzy0oXiQDhcIObNw+gJQwx7VdvJAKaBtF2eOwDa0pX+C+JiBtcAplimbhE3N6NwsB8wTJZYIAsKz5R+d9FAuw9VbZlYE7B03TP4qZBc4vUgm3HTouI9V/e77ShIdcL4sPwAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE2KzAyOjAwlICcrAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMOXdJBAAAAAASUVORK5CYII=</mdui:Logo>
+ <mdui:InformationURL xml:lang="fr">http://www.dsi.cnrs.fr</mdui:InformationURL>
+ <mdui:Description xml:lang="en">CNRS IDP server</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">CNRS (new)</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Serveur IDP du CNRS</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDHzCCAgegAwIBAgIUcyCcvrPE6sFdJyVsCKfKmZg0/70wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNamFudXMuY25ycy5mcjAeFw0xNDA2MTYyMTA1MDZaFw0y
+NDA2MTYyMTA1MDZaMBgxFjAUBgNVBAMTDWphbnVzLmNucnMuZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAQ7NtsTYjE/tTo9LM8y7AUlqejU6lpiph
+dW2yR2Ii7Xcm+niy+F4sjy3OoSt83Osuu1SXb/Cp2BZ8Spw3EMzSAKI0T9sIq4/F
+ePspMLRThXW6cQLgUYekICh4H9ZQBU/luTS6ekTB3IgUPAFiiwFw8idC7KBc3OR8
+IDng0iOZSWejKahELmPWh6KeXj6SShPwdYiRMHZgCS2Sijzsv53tlQPm88nO0aQf
+6aEe5wXZqoAF1pkL6VhNo1R9pf7Wl4uiRvyiojflr09Pg3GsEOZg342J8PSIBQzJ
++do/BNT7bWRsX2yEyX0PoieFpTMNz/Y6+IVMUrhZn2+n1X2iEtOxAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWphbnVzLmNucnMuZnKGJGh0dHBzOi8vamFudXMuY25ycy5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUy/9dd6btq/teyttwa2YjbrSnQ/ow
+DQYJKoZIhvcNAQEFBQADggEBAGWm6W+fJ6dQ0cHFcg1S8haiBQnGTcdWF17YXyYG
+WuiFFBX4RXuhoRyu0aWxcw7THdHP19/K3+lAueFPBCG6K7qz9gtvf4ZWJWWLq0jQ
+z9uNdB09xLWTleRe7c4ptCaQ/nU07ZibFHVXIGT2zZOODBXIiWsiXchH56D4TN0Z
+bKQsdICU4/Q+thqPKtYHL5T3leyJKCoEQC0o7jZ2q7T2SF6j7d7kwoa58qopcMTz
+J9FdzyFEdepofr6Cj3sQu4nA28iAc91t0ZYvTbbrFu1KBby90rPH1p4+xLV42/Fy
+wPrS8Iosd99N9HZcyPWEuGXeoFyLRK8VArJPtD6f2ZHusXQ=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://janus.cnrs.fr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.cnrs.fr/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.cnrs.fr/idp/profile/Shibboleth/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">CNRS (new)</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">CNRS (new)</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>dsichangement@dsi.cnrs.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
index 2683d197..6e7f0eda 100644
--- a/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
@@ -67,7 +67,7 @@ iZxetNC82lCt7vGHOz5cXzYN2MEuqqCvAM2dTLO7rRhrSctONV0qrHlg1vZ4Vbw=
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/idp/profile/SAML2/Redirect/SSO"/>
</md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkos.cz</shibmd:Scope>
</md:Extensions>
diff --git a/swamid-interfederations-2.0/kentsso.simitive.com.xml b/swamid-interfederations-2.0/kentsso.simitive.com.xml
new file mode 100644
index 00000000..292886cc
--- /dev/null
+++ b/swamid-interfederations-2.0/kentsso.simitive.com.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kentsso.simitive.com">
+ <!--
+ This is a "Simitive" Shibboleth SP for Simitive Limited.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-22T15:17:04Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kentsso.simitive.com/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kentsso.simitive.com/Shibboleth.sso/Login" index="1"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDLTCCAhWgAwIBAgIJAPuc4ZrD2thhMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+ BAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNvbTAeFw0xNTEwMDIxNDI3MDVaFw0y
+ NTA5MjkxNDI3MDVaMCMxITAfBgNVBAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNv
+ bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOUpc8HAMCrL4BiGieJh
+ Y0kTPCmKa2dWuIZy0GjBtb3PIqRX9L90452/sjW9P5RaQYyEMfdSEdXZBw/DEYAm
+ a3WrZNkNj4vNEts/5g/mW16Y3ISY8V7Gk127liMANTcbFoLJMRvcNo5skyVz2nxp
+ J4kppKp5c9ocH+zV7cm5aWUYGwdrfDnGCy/zCX4P0IvmZzffBG57ygHG1MAbTZQG
+ cn46v65F8XAWa5xwu+ZfiYCGb5IjJTUYTNgO5+BMx4Mx1Ssd20iohgJ/hnhIlvbd
+ qtuAXjgLDULEma+6XhsNxIN7Khy3YEORw5ch8NqnllnbBhKPhTIFspbcIx247Wnu
+ IHECAwEAAaNkMGIwQQYDVR0RBDowOIIYbGl2ZS1ub2RlLTEuc2ltaXRpdmUuY29t
+ hhxodHRwczovL2tlbnRzc28uc2ltaXRpdmUuY29tMB0GA1UdDgQWBBQIVpk9cai3
+ Qu4eE+cdf+T67ttSKzANBgkqhkiG9w0BAQUFAAOCAQEAoZv+PznzhifNi0Ez9YPk
+ YNOBp9zEOIlDtQOE8bsmFdUYEnbJ1GkMcJsJwmU0bIjEV9/g56ygW4D7ZsycLHYu
+ Md/v4fyqAQM3xCmZQs92H96nm6Pkv99mRN0oMPIT3Oy2FTy5qWgX1qFBZ+C0TlNn
+ gSBq5F5D0I3BkB6oZMgXvUuWDLoU42SM1Ks8/1zL6xxy0QF+qapp6g27MenTgRYU
+ g9OevEy4MLX592kL7TWCJ3K/nbnrYF7lqPzHHkvtBFFVfTNleQzKLGdSlIifm/g2
+ NFIvl9x747DAi2Vm92ULH9Qgy4/k21c0P8sSJZD+P6nHAB5G2XecceewxYkH4s+z
+ cA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kentsso.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/Artifact"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/SOAP"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Simitive Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Simitive</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.simitive.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Chris</GivenName>
+ <SurName>Dolby</SurName>
+ <EmailAddress>mailto:chris.dolby@simitive.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Chris</GivenName>
+ <SurName>Dolby</SurName>
+ <EmailAddress>mailto:chris.dolby@simitive.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml b/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
index f11b9f47..148187b0 100644
--- a/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
@@ -56,12 +56,6 @@ wXXiBDXS3PNHXQnnpys=
<md:Company>NORDUnet</md:Company>
<md:GivenName>Leif</md:GivenName>
<md:SurName>Johansson</md:SurName>
- <md:EmailAddress>leifj@nordu.net</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:Company>NORDUnet</md:Company>
- <md:GivenName>Johan</md:GivenName>
- <md:SurName>Berggren</md:SurName>
- <md:EmailAddress>jbn@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:leifj@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml b/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml
index 26e764d6..dcc955f2 100644
--- a/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml
@@ -115,19 +115,19 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
<md:ContactPerson contactType="administrative">
<md:Company>Karolinska Institutet</md:Company>
<md:SurName>Malin Westerberg</md:SurName>
- <md:EmailAddress>malin.westerberg@ki.se</md:EmailAddress>
+ <md:EmailAddress>mailto:malin.westerberg@ki.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 524 86693</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Karolinska Institutet</md:Company>
<md:SurName>Eric Johansson</md:SurName>
- <md:EmailAddress>eric.johansson@ki.se</md:EmailAddress>
+ <md:EmailAddress>mailto:eric.johansson@ki.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Karolinska Institutet</md:Company>
<md:SurName>IT-support</md:SurName>
- <md:EmailAddress>it-support@ki.se</md:EmailAddress>
+ <md:EmailAddress>mailto:it-support@ki.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml b/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml
index cc8bb1d6..68ec3d02 100644
--- a/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml
+++ b/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lbr.csc.fi/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
- <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-09T19:28:51Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
@@ -13,18 +15,19 @@
<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">REMS Language Bank</mdui:DisplayName>
- <mdui:DisplayName xml:lang="fi">REMS Kielipankki</mdui:DisplayName>
- <mdui:Description xml:lang="fi">Aineistojen käyttövaltuuksien hallintajärjestelmä</mdui:Description>
- <mdui:Description xml:lang="en">Finnish language resources AAI system.</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="sv">https://lbr.csc.fi/fi/web/guest/privacy-policy</mdui:PrivacyStatementURL>
+ <mdui:DisplayName xml:lang="de">Language Bank Rights</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Language Bank Rights</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</mdui:Description>
+ <mdui:Description xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://lbr.csc.fi/home</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="en">https://lbr.csc.fi/en_GB/web/guest/privacy-policy</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="fi">https://lbr.csc.fi/fi/web/guest/privacy-policy</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>lbr.csc.fi</ds:KeyName>
<ds:X509Data>
+ <ds:X509SubjectName>CN=lbr.csc.fi,OU=Domain Control Validated</ds:X509SubjectName>
<ds:X509Certificate>MIIFYTCCBEmgAwIBAgIQWBOOp78lJI42EYlJleUqwDANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowODEhMB8GA1UE
@@ -53,18 +56,19 @@ MeHkFjj1AnSgzbdo/hd5AlHL01xFulXG8a5+xehfSWqTxGnQSFgcDXvdwNWx8JAV
6JwDyq06ko2V4+6Y4OeR/vaW40J4hMhfuDO56/YITUxmMkSCo1Dk44hxtCPNDmTH
qotUhjkJ+hNlRXZabFwp9LUSWiN0av0zpwMzxSHU1saTfgN0tB7KABKjYnriI7N+
0k3tNgXiJfaZ3TCGNOPYWvv8Vqj9hqIzOvLFEPnPJ+TACiFBQUArI/2ges4bol7I
-InF/qlfqDoaoTI1ZSkpyr+97qTyFYFlbC5IFJCeCjcQAzscSUA==</ds:X509Certificate>
+InF/qlfqDoaoTI1ZSkpyr+97qTyFYFlbC5IFJCeCjcQAzscSUA==
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lbr.csc.fi/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://lbr.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">REMS Kielipankki</md:ServiceName>
- <md:ServiceName xml:lang="en">REMS Language Bank</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Kieliaineistojen kayttooikeusjarjestelma.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Finnish language resources AAI system.</md:ServiceDescription>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lbr.csc.fi/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="de">Language Bank Rights</md:ServiceName>
+ <md:ServiceName xml:lang="en">Language Bank Rights</md:ServiceName>
+ <md:ServiceDescription xml:lang="de">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</md:ServiceDescription>
<md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -76,15 +80,12 @@ InF/qlfqDoaoTI1ZSkpyr+97qTyFYFlbC5IFJCeCjcQAzscSUA==</ds:X509Certificate>
</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:OrganizationName xml:lang="de">e459</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="administrative">
<md:GivenName>Martin</md:GivenName>
diff --git a/swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml b/swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
index dacbd25c..d0a07866 100644
--- a/swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
@@ -89,6 +89,6 @@ E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>Swedish Reasearch Council</md:Company>
- <md:EmailAddress>kontors-it@vr.se</md:EmailAddress>
+ <md:EmailAddress>mailto:kontors-it@vr.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml b/swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml
new file mode 100644
index 00000000..73cb67b2
--- /dev/null
+++ b/swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmet.aiwip.com/shibboleth">
+ <!--
+ This is an "Aiwip for London Metropolitan" Shibboleth SP for Aiwip Ltd.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-29T11:32:39Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lmet.aiwip.com/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Aiwip for London Metropolitan</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Free printing for London Metropolitan students</mdui:Description>
+ <mdui:Logo height="135" width="90">https://lmet.aiwip.com/static/images/logo2-dark.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDlDCCAnygAwIBAgIJAN9ls5zbDz+1MA0GCSqGSIb3DQEBCwUAMEsxCzAJBgNV
+ BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xEjAQBgNVBAoMCUFpd2lwIEx0ZDEXMBUG
+ A1UEAwwObG1ldC5haXdpcC5jb20wHhcNMTUwOTE0MTExMTA3WhcNMjUwOTExMTEx
+ MTA3WjBLMQswCQYDVQQGEwJHQjEPMA0GA1UECAwGTG9uZG9uMRIwEAYDVQQKDAlB
+ aXdpcCBMdGQxFzAVBgNVBAMMDmxtZXQuYWl3aXAuY29tMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEAv0/WfygzXE9eiyKLZZD0SuqJS6fI5oh/kkWXdqhN
+ /tyOkGz9DsjsZRt9lrVHwU0bEGRECaFqQyXgpmEGjHrhfhfzWo8ryJBrSORX4c9A
+ Ao+Oq2imyooxxzGUPgRmiAsjOmBVOWXLhiMGSzjg0SGN4b3ybU/EKBQFVOHNIPbK
+ WxXA4ZlvoS/3vcmkWDWs4LGML2XF/AE7K8Q3sQ+KoZf/NYlFLMTT+csiIxNmALcf
+ yxoY2lPisp/v1BiMi/qUlcmmRcY0XkODFmk/pwZ7sQnBWex5Br3BdC6MZ4sdB0N7
+ vbSz1OgqOrcsHiPqKuvzP6nOBODBudVMgNQ/vxzgo3EvVwIDAQABo3sweTAJBgNV
+ HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
+ Y2F0ZTAdBgNVHQ4EFgQUV9pkYjyXATU71LnpAHCworPziswwHwYDVR0jBBgwFoAU
+ V9pkYjyXATU71LnpAHCworPziswwDQYJKoZIhvcNAQELBQADggEBAI48vWrZzALl
+ BIifkeifljOBBS/BYtPQenkkLpqiNQ6mIbSJrf/vzW6vifTup+1ppJax+htrsh1d
+ iUQieasACKFX5kGOcvG5uDp7cvAn23yeTwIRu8Kf2nMOL2zjn6hV8dDDj0M/cVnK
+ bm1yYeKAMAZmPNhw2C4xRIDJDqawapwxRvQh2b+rTBTJ9JCQNbzfN8cb4NPqaFCO
+ pjUM7Hl6CnKKiMUfRbMGzvxrxN7yZo1Jvf9+PL7Cly8DYvDczN22Y4UDEEtJ5Stf
+ cEduhkrPF1g42Vc36GGScFGwHwqUHWsp3a7i5ziGsBy0nnPOVDJ0jRJA6m903JDa
+ mFPqGq9ZnxI=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmet.aiwip.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Aiwip Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Aiwip for London Metropolitan</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://lmet.aiwip.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Ruslan</GivenName>
+ <SurName>Khazarchiev</SurName>
+ <EmailAddress>mailto:ruslan@aiwip.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Ruslan</GivenName>
+ <SurName>Khazarchiev</SurName>
+ <EmailAddress>mailto:ruslan@aiwip.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
index 2510b5f1..e64ce6b9 100644
--- a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
@@ -126,6 +126,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">libertas.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lzmk.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">matica.hr</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mato.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medils.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medri.hr</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mef.hr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml
index 2f8a111a..07842368 100644
--- a/swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml
@@ -13,9 +13,9 @@
<mdui:DisplayName xml:lang="en">Avans University of Applied Sciences</mdui:DisplayName>
<mdui:Description xml:lang="nl">Avans Hogeschool</mdui:Description>
<mdui:Description xml:lang="en">Avans</mdui:Description>
- <mdui:Logo height="49" width="108">https://static.surfconext.nl/media/idp/avans.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Avans University of Applied Sciences Avans Hogeschool</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Avans Hogeschool Avans University of Applied Sciences</mdui:Keywords>
+ <mdui:Logo height="49" width="108">https://static.surfconext.nl/logos/idp/avans.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">avans university of applied sciences avans hogeschool</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">avans hogeschool avans university of applied sciences</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml b/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml
index 2ebdfb1a..56328043 100644
--- a/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml
+++ b/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml
@@ -13,31 +13,27 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEpjCCA46gAwIBAgIRAJuqvEQb2nivw9LlulsKgTUwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMTUwMDAwMDBaFw0xNTExMTUyMzU5NTlaMH8xCzAJBgNV
- BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEyMDAGA1UE
- ChQpQnJpdGlzaCBVbml2ZXJzaXRpZXMgRmlsbSAmIFZpZGVvIENvdW5jaWwxGjAY
- BgNVBAMTEWxvZ2luLmJ1ZnZjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
- MIIBCgKCAQEA5h2PqOMzg3Y08haJK077LpqFTNbDklYS9e5vqDeUhSa9M+ugGPuT
- 0Y8CLiqX8/eJHHRNd8h0cFFLuEgT8ERasWhVYMCrHRSglwJvm+5IXGrGjhmaLZy1
- 5q+pr7mERLXzdlvBsMTpYrizh9lW3fSMVl8bM3EjqG8NLDQzRfp53gJ1O9pjjr26
- 484VfYdaxgUvuitfq5RH5h8OeeyTBm3S3D0R7ruwn3c7Nyzhq5IlGIx7stVQ4Ydi
- k1W95HwPQKvnMZUTgtv5LRLeSbZdZpePXYOiQUwkSsj8aVsp4klmJB/hzfWaVFKK
- J8/1OQKJRFKN9wh2NDQm7TatDmXd1QC0JwIDAQABo4IBZDCCAWAwHwYDVR0jBBgw
- FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGVB6NEoch0GDSTWKrA4
- f2KZQ+6+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
- CCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoG
- A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
- U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
- dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
- dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWxvZ2luLmJ1ZnZj
- LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBCj+si/OAXKczTJ1Zssfnf4ovLzFVU
- +KqUWRBYYCb2GQRz4BbhyTPbWhBZnBj0Uge8/z9Sfn9GN4IWGXMTuLGrAQPJvDBB
- WYo7C0/TE7MZL7apTfsQ7SM45VE0qD1doCxyqcYd0L1CDQnwzR+BJ1z7OZoy3jau
- Hm8Suozr2gMsWn7mu4ZIzXd2sKx7nVnoQPchMSVef9T8ZWrUR2qkBnB14yPdNWoA
- 9PbWT7R0kyF2cAxF6tw8SiYAiYXG4EbKZsV/4B7O9aPBN2pWHFNAySuneWFDdTSB
- oQfF2ly+fZDgA4A2ONfvSehmCoqARP9BO8oWbigQqF3J7vI3MfNsgIRl
+ MIID1zCCAr+gAwIBAgIJAM+d/l59FkocMA0GCSqGSIb3DQEBBQUAMFAxMjAwBgNV
+ BAoMKUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0gJiBWaWRlbyBDb3VuY2lsMRow
+ GAYDVQQDExFsb2dpbi5idWZ2Yy5hYy51azAeFw0xNTExMTEwOTQ5NThaFw0yNTEx
+ MDgwOTQ5NThaMFAxMjAwBgNVBAoMKUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0g
+ JiBWaWRlbyBDb3VuY2lsMRowGAYDVQQDExFsb2dpbi5idWZ2Yy5hYy51azCCASIw
+ DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJwY8KMdcCNyfsz4ExfMpWVOyDzL
+ hMprH4+aTLxB1B7hRyo4drx7T7TzrRAAqj0a66vaGMJlBotesOntW07rHxm+8odV
+ 3cLaTqO/xHqHEZCg1ykYfr2/9o0ODN1iJ8qZPo0DkHOYnj0IvxWB0SzXCU1hsIqn
+ fpogesglv5qnvlasl5hjNuAOyPVkkaz1oZ4czxernqubwZJRFIo9N8jIQ02wXy2B
+ jU38AdSPCnGEadWg8hRYYaBkRCnzpWJxPQjox4d37jMB7NfN+z/7oAP2Dl94l9Mo
+ pWYQYTRJUn9PE2jdyxCNse3dCf2Ay15LWpzbChjy8cyya9JQkaVI5hFAY40CAwEA
+ AaOBszCBsDAdBgNVHQ4EFgQUZe1GO9KeRN6sbAvL6jcwaWtnNb8wgYAGA1UdIwR5
+ MHeAFGXtRjvSnkTerGwLy+o3MGlrZzW/oVSkUjBQMTIwMAYDVQQKDClCcml0aXNo
+ IFVuaXZlcnNpdGllcyBGaWxtICYgVmlkZW8gQ291bmNpbDEaMBgGA1UEAxMRbG9n
+ aW4uYnVmdmMuYWMudWuCCQDPnf5efRZKHDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
+ DQEBBQUAA4IBAQCL75HmsnvOATOdYEfLREjSEi+WseRYvMI7CKnkiTAJJsW135v6
+ 943DxxYvM90Q9mkgVZP7znzatMtelYCRR52G+BQr3sm1ABdPKCmPGvQ60fS+LWIP
+ n9sdfrh2Pva30OAJrI4NXCJMYcJh2BmfJSIHkvqWGDsF9mJk6pkWOCQfXat2SfPJ
+ LfQ8qfh62IT01FoxNk85Y7Mc+5di8HOzw6G1F1eha6l6/WE55jxOYiPr/4XQrKwq
+ r+2/Ralwp6eyn60NKcP1MZlrne/KA9Sa/QKuYGZYoz36AlU5lU9tCxL99nqNe4qq
+ phTjYEg3bCrvDWUfGuj2BC1Uoo0OAO8Y7FLC
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml b/swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml
index fe909584..6d2de2c8 100644
--- a/swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml
@@ -5,6 +5,11 @@
<mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
@@ -78,6 +83,7 @@ hRxCQz6wGPVqxk8HY4ChZNjrhu4EKpQ=
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/POST/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/SOAP/ECP"/>
</md:IDPSSODescriptor>
<md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
diff --git a/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
index b6926e19..0699d2a0 100644
--- a/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
@@ -104,19 +104,19 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
<md:ContactPerson contactType="administrative">
<md:Company>Dalarna University</md:Company>
<md:SurName>IT-avdelningen</md:SurName>
- <md:EmailAddress>shib-admin@du.se</md:EmailAddress>
+ <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
<md:TelephoneNumber>+46 23 778891</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Dalarna University</md:Company>
<md:SurName>IT-avdelningen</md:SurName>
- <md:EmailAddress>shib-admin@du.se</md:EmailAddress>
+ <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
<md:TelephoneNumber>+46 23 778891</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Dalarna University</md:Company>
<md:SurName>Högskolan Dalarna Support</md:SurName>
- <md:EmailAddress>support@du.se</md:EmailAddress>
+ <md:EmailAddress>mailto:support@du.se</md:EmailAddress>
<md:TelephoneNumber>+46 23 778888</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml
index dd06a6cd..21b7ee5b 100644
--- a/swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">Energieonderzoek Centrum Nederland</mdui:DisplayName>
<mdui:Description xml:lang="nl">Energieonderzoek Centrum Nederland</mdui:Description>
<mdui:Description xml:lang="en">Energieonderzoek Centrum Nederland</mdui:Description>
- <mdui:Logo height="35" width="108">https://static.surfconext.nl/media/idp/ecn.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Energieonderzoek Centrum Nederland ECN</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Energieonderzoek Centrum Nederland ECN</mdui:Keywords>
+ <mdui:Logo height="35" width="108">https://static.surfconext.nl/logos/idp/ecn.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Energieonderzoek Centrum Nederland ecn</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">Energieonderzoek Centrum Nederland ecn</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
@@ -31,7 +31,7 @@
<md:Organization>
<md:OrganizationName xml:lang="en">Energieonderzoek Centrum Nederland</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Energieonderzoek Centrum Nederland</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.surffederatie.nl</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.ecn.nl</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="administrative">
<md:GivenName>SURFconext support</md:GivenName>
diff --git a/swamid-interfederations-2.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml b/swamid-interfederations-2.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml
new file mode 100644
index 00000000..c955fedb
--- /dev/null
+++ b/swamid-interfederations-2.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.exammonitor.dk/module.php/saml/sp/metadata.php/login">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-12-02T09:44:48Z" registrationAuthority="https://www.wayf.dk">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+ <mdui:Description xml:lang="da">Formålet er at brugerne får adgang til at starte et system som overvåger deres digitale eksamen.</mdui:Description>
+ <mdui:Description xml:lang="en">The purpose is to enable users to start a system that will monitor their digital exam.</mdui:Description>
+ <mdui:DisplayName xml:lang="da">Exam Monitor</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Exam Monitor</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIID7TCCAtWgAwIBAgIJAOCFGMmv3N1CMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYDVQQGEwJESzEMMAoGA1UECAwDRnluMQ8wDQYDVQQHDAZPZGVuc2UxHTAbBgNVBAoMFFN5ZGRhbnNrIFVuaXZlcnNpdGV0MSAwHgYDVQQLDBdJVC1zZXJ2aWNlLCBFeGFtbW9uaXRvcjEdMBsGA1UEAwwUbG9naW4uZXhhbW1vbml0b3IuZGswHhcNMTUxMTI1MDkzMzIxWhcNMjUxMTI0MDkzMzIxWjCBjDELMAkGA1UEBhMCREsxDDAKBgNVBAgMA0Z5bjEPMA0GA1UEBwwGT2RlbnNlMR0wGwYDVQQKDBRTeWRkYW5zayBVbml2ZXJzaXRldDEgMB4GA1UECwwXSVQtc2VydmljZSwgRXhhbW1vbml0b3IxHTAbBgNVBAMMFGxvZ2luLmV4YW1tb25pdG9yLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ZzCSgMEAeIP1sZa/imvZR6tYN78mZuIazkexv3Zhsd/KRTCPfbhtk/J0jicZ6JsqiEd9q2cOf/XKjCw8ejaqJrYqFPWyRLyWs2xgf3lGMTWaxhhJpbnPY6uyFLGKnNkNP9xLpPqB6JkvUiQ1eCSG493ZhWhWQIrMf629U3EEPnwhhbAQa0UYw005BYqK6/MhFB50M6PFZ9O57USna9zBwtv4durotcol6fjgOAQ5Crr2vema4Swd5j56lgftmhLo9VsD5Yqd5SLZaAWWV2U3GvpsJawix7RSkt8jt3Bv6EFgu4ClojhwMB7uJhsHrPbzujhoioPt/Audp27x+zr8wIDAQABo1AwTjAdBgNVHQ4EFgQUqzCIMzUSSz10ICvF8aUDSBacbgUwHwYDVR0jBBgwFoAUqzCIMzUSSz10ICvF8aUDSBacbgUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA4JBwcUBfByuoQBa4DVI/iwroNUlKcft6tXS4315MB7QRJRpT3EL3JKI9XVN52ygiQ7okMxQIHQJjpOEq5k1czPe5WnicO02np9mNnJVK6VVJ/GXi2C/Ucp8UniwG0dVQanFIrajoz93xa/1nvVpVNztSGEm2A7tSc2Ch78XyCUFjbVN/OYm3I+sK2rzKvLTzbpG0W7YzZxUkdsa9trYFnX/1wELsqrYgFQGisJ+cMXU6m5lKOSuxcgPZgcWab7JkqTiW91GwbdlKwpvHsFlr1O352KVG8OtY5fNFjodsqAQ/BCZ2ZhSlDJUK23aRbc1ntTl6USfXH7gEI/6pKbKqLw==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.exammonitor.dk/module.php/saml/sp/saml2-logout.php/login"/>
+ <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://login.exammonitor.dk/module.php/saml/sp/saml2-acs.php/login" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.exammonitor.dk/module.php/saml/sp/saml1-acs.php/login" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.exammonitor.dk/module.php/saml/sp/saml2-acs.php/login" index="2"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="da">Exam Monitor</md:ServiceName>
+ <md:ServiceName xml:lang="en">Exam Monitor</md:ServiceName>
+ <md:ServiceDescription xml:lang="da">Formålet er at brugerne får adgang til at starte et system som overvåger deres digitale eksamen.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">The purpose is to enable users to start a system that will monitor their digital exam.</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="da">Syddansk Universitet</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University of Southern Denmark</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="da">Syddansk Universitet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Southern Denmark</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.sdu.dk</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Lasse Birnbaum Jensen</md:GivenName>
+ <md:EmailAddress>lasse@sdu.dk</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml
index 41006b20..f905738b 100644
--- a/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.fmach.eu/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.fmach.eu/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-01-03T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
index 91c70f4b..5cf76618 100644
--- a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
@@ -15,8 +15,8 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">helsinki.fi</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">University of Helsinki</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">Helsingfors universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Helsingin yliopisto</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Helsingfors universitet</mdui:DisplayName>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml
index 98f59c0e..ae41f1a5 100644
--- a/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml
+++ b/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml
@@ -15,8 +15,8 @@
<mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
<mdui:InformationURL xml:lang="sv">https://www.eduid.se</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">https://www.eduid.se</mdui:InformationURL>
- <mdui:Logo height="146" width="144" xml:lang="sv">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
- <mdui:Logo height="146" width="144" xml:lang="en">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
+ <mdui:Logo height="120" width="320" xml:lang="sv">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
+ <mdui:Logo height="120" width="320" xml:lang="en">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
<mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
<mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
@@ -91,17 +91,17 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
<md:ContactPerson contactType="administrative">
<md:Company>eduID</md:Company>
<md:SurName>Valter Nordh</md:SurName>
- <md:EmailAddress>valter@sunet.se</md:EmailAddress>
+ <md:EmailAddress>mailto:valter@sunet.se</md:EmailAddress>
<md:TelephoneNumber>+46707884742</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>eduID</md:Company>
<md:SurName>SUNET eduID team</md:SurName>
- <md:EmailAddress>eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
+ <md:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>eduID</md:Company>
<md:SurName>eduID Support</md:SurName>
- <md:EmailAddress>support@eduid.se</md:EmailAddress>
+ <md:EmailAddress>mailto:support@eduid.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml
index f16aebbf..b43ae321 100644
--- a/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml
@@ -95,6 +95,6 @@ UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certifi
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>Handelshögskolan i Stockholm</md:Company>
- <md:EmailAddress>itsupport@hhs.se</md:EmailAddress>
+ <md:EmailAddress>mailto:itsupport@hhs.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.justis.com.xml b/swamid-interfederations-2.0/login.justis.com.xml
index bbb61cfa..b5ad0216 100644
--- a/swamid-interfederations-2.0/login.justis.com.xml
+++ b/swamid-interfederations-2.0/login.justis.com.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.justis.com">
<!--
- This is an SP for Justis Publishing Limited.
+ This is an OpenAthens SP for Justis Publishing Limited.
-->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
@@ -49,6 +49,14 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.justis.com/oa/auth/rcv/shib/art" index="10"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.justis.com/oa/auth/rcv/saml2/post" index="11"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.justis.com/oa/auth/rcv/saml2/art" index="12"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">Justis Publishing</ServiceName>
+ <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <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"/>
+ </AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Justis Publishing Limited</OrganizationName>
diff --git a/swamid-interfederations-2.0/login.ki.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ki.se-idp-shibboleth.xml
new file mode 100644
index 00000000..d25b1f60
--- /dev/null
+++ b/swamid-interfederations-2.0/login.ki.se-idp-shibboleth.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ki.se/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Karolinska Institutet (endast nya Ladok)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Karolinska Institutet (only new Ladok)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description>
+ <mdui:Logo height="146" width="292">https://login.ki.se/images/ki_logo_292x146.png</mdui:Logo>
+ <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>ki.se</mdui:DomainHint>
+ <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
+ <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
+ <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
+ <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
+ <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
+ <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
+ <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
+ <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
+ <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
+ <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
+ <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUSr91KhOWgx1LLaoQAw69hE2zxN8wDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ+xNQGjVs6rbJym13yai5iPGLhcXcDFhs2dcckk
+9SnhS0oEhHEPdwn9iwtkXbDaQCdlPzKw1lAQ4PFeqeynh3bM/GNz5RLQp3Fiac1b
+n2MiUEK6Xj2T+5XZklJHwsXnAP5FrPfsXLJ8kbDU7cS7aQ9b+8xqs+YNjIzZzEAx
+OGQp7/zwHTFejWc0GfxrARc+L5xwlXyQGRFjGQAs8Ka+WlV5MhyZFnHV81+/O4Xu
+gztzKuC2i0QKt46S1hep2Za8KxmWfN1pzWG8hnJHFWYOtRuKmTs4tF6ln03c72zF
+0wZ0zv5VKsplRd7ZGozJ275i0gntt233X9RoBM9rGYVBkaMCAwEAAaNdMFswHQYD
+VR0OBBYEFBqgkKxTUPlSShbr1NxOyLvrWkljMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQAB7enC9iTTTfKZXUFtdXPEEJte/x3VembkSftwr+sK1EtDezIB
+R8LUsMqovpC771JmJbhkEVNtErfG9cwyKC3g0oWRY5U02jGxuxcq7yEh6/bTIZ0R
+nx88SX0+V9jMDfQKBFhljKCuozq70dGtApXm8bmuvBPe5gQ9+NaSKWkniOPv+zOS
+wOUUvi/8r6AE7PtCXn6uydqUcEo/oh8OMZOVx0siApLrG6NwZpGUz6l8mqH00zd5
+Lslkb6jUsVBP2o/ORnwRlgY0I4491wMALYaplSMa1LUZPyB7Iv5IuHkybBEYy+mY
+GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUQnJmXS4G/tbR42ca8QG480l3MMEwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJA5FGj3sWcneuNuMoqgT9nQ07FAXKdSnDtfASMq
+0ZyaxyLJbOlKyRRzy8okbWTAhuI98JvuvGsSjg2dXCvRFKI/fF5pXn70enux0Svk
+NUvZdnr38noCyEVpTUpSMjDrHF9V1FDAloJ65zbRepdHU4Sv9di5Vy9ppAo4VrLw
+iR2AXS7EFQ39aIm37xPIQz2M0HXBERVCQHOg51LrwNnMCVE1I70s28qYzI3wo/0p
+HfD9qWqnqIz8Fr1UHCDGArJN1YhQJZbWlN2KBndl3Ike4obeDxQFnS707l8B1Hnh
+ceV8ohgtK82bASKSVCJ1Z7w+CAGAhABqc8DCJ599mTDzm78CAwEAAaNdMFswHQYD
+VR0OBBYEFDrrD9A+XOKI8btkdBaO8hvc/vyMMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQBhpdosfvuPTuvAoK0jokVl7gqDW53KrRTD+BrJRoOGPBQ2DXVF
+TvQdmS/zymbrFghQr0XOzYLRa+fP6lfoNusBWKfL0Fyto8skicSNswYDG1zgF6HI
+03eHqhB5ma6u4rh3gAMwVcpyYCcrrJ2hbTI8BWXzZFaxXM9JaK7u2J8k5tGAccK1
+247NSR8LEai46HkZpovuKPjD9zwunV6mQeOXQeo3WtoPW0twB9h01sfqV0iMvaXg
+Tu4iUPkcwpIeauNAjJ4KXpl5OxehsBnz9rrb6smtz2bfWBBNiPHaHhT6XIqon5X1
+kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
+ </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>
+MIIDFzCCAf+gAwIBAgIUEEr81svYHmizs6DjzN0FCQ1IlLkwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMIJsWHFr/fc/26Dfv0WOBhspXfyRVGSHMu5IeRs
+reQGRKbrdW4KOOrKQkqZnyQVe8eZt/GZKSzy+9VnAJo3ypaUt2y0LsTqibcg7oNO
+RcC2yDKlEN8CCSX3OQrQ1kWRxHpMSaHx1TeWAPI9kB0CykeG6FmVYXG9arY9u9pn
+ZvdPCXg7SkFbTCa1zJdbxBCumq/nAKGiEct6GQHMeYOb9YBI+WYYByfseLdf5dNC
+i1fXuRYbxK9dcFIVlGuZRea99TklSZZR3BxFLHgcECjp1ZtoT0Byl2yxmm0nGJE2
+HKh+LsxAUz3ouG3qItUJPYzBS1RHQVWYz8N4T8z+w+1jEY0CAwEAAaNdMFswHQYD
+VR0OBBYEFKf0zzGixtPS531/l3z2Vc04g1seMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQA4PPWZd96F0l40muNxqPzVNzTq/D+ndRhEcPOxk8SraEXaFlkm
+xqELKuLnuj7MAx+y/SJssIs9acDm8CBxp60z9hSTkokVjVAfyWiTU+KuTGvwWWnP
+T25PheKwMPl+W45PhXfbK0F1nDXvNf2L59gxuBIJEcqojx6BHlLfz1tbQUCsezV4
+fv98gre6OoWeN5TSiWgtl7Gsb1cjFRcfiYNwDo9pWqNnLOioncMs4SOyEKrTxrU7
+rmABcIrDyPLSecdGrJBUBiYy1tTm72SEGK9npcZ8QPuXkkSf7zskTenf4tFszUnq
+BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ki.se/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ki.se/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ki.se/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUSr91KhOWgx1LLaoQAw69hE2zxN8wDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ+xNQGjVs6rbJym13yai5iPGLhcXcDFhs2dcckk
+9SnhS0oEhHEPdwn9iwtkXbDaQCdlPzKw1lAQ4PFeqeynh3bM/GNz5RLQp3Fiac1b
+n2MiUEK6Xj2T+5XZklJHwsXnAP5FrPfsXLJ8kbDU7cS7aQ9b+8xqs+YNjIzZzEAx
+OGQp7/zwHTFejWc0GfxrARc+L5xwlXyQGRFjGQAs8Ka+WlV5MhyZFnHV81+/O4Xu
+gztzKuC2i0QKt46S1hep2Za8KxmWfN1pzWG8hnJHFWYOtRuKmTs4tF6ln03c72zF
+0wZ0zv5VKsplRd7ZGozJ275i0gntt233X9RoBM9rGYVBkaMCAwEAAaNdMFswHQYD
+VR0OBBYEFBqgkKxTUPlSShbr1NxOyLvrWkljMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQAB7enC9iTTTfKZXUFtdXPEEJte/x3VembkSftwr+sK1EtDezIB
+R8LUsMqovpC771JmJbhkEVNtErfG9cwyKC3g0oWRY5U02jGxuxcq7yEh6/bTIZ0R
+nx88SX0+V9jMDfQKBFhljKCuozq70dGtApXm8bmuvBPe5gQ9+NaSKWkniOPv+zOS
+wOUUvi/8r6AE7PtCXn6uydqUcEo/oh8OMZOVx0siApLrG6NwZpGUz6l8mqH00zd5
+Lslkb6jUsVBP2o/ORnwRlgY0I4491wMALYaplSMa1LUZPyB7Iv5IuHkybBEYy+mY
+GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUQnJmXS4G/tbR42ca8QG480l3MMEwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJA5FGj3sWcneuNuMoqgT9nQ07FAXKdSnDtfASMq
+0ZyaxyLJbOlKyRRzy8okbWTAhuI98JvuvGsSjg2dXCvRFKI/fF5pXn70enux0Svk
+NUvZdnr38noCyEVpTUpSMjDrHF9V1FDAloJ65zbRepdHU4Sv9di5Vy9ppAo4VrLw
+iR2AXS7EFQ39aIm37xPIQz2M0HXBERVCQHOg51LrwNnMCVE1I70s28qYzI3wo/0p
+HfD9qWqnqIz8Fr1UHCDGArJN1YhQJZbWlN2KBndl3Ike4obeDxQFnS707l8B1Hnh
+ceV8ohgtK82bASKSVCJ1Z7w+CAGAhABqc8DCJ599mTDzm78CAwEAAaNdMFswHQYD
+VR0OBBYEFDrrD9A+XOKI8btkdBaO8hvc/vyMMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQBhpdosfvuPTuvAoK0jokVl7gqDW53KrRTD+BrJRoOGPBQ2DXVF
+TvQdmS/zymbrFghQr0XOzYLRa+fP6lfoNusBWKfL0Fyto8skicSNswYDG1zgF6HI
+03eHqhB5ma6u4rh3gAMwVcpyYCcrrJ2hbTI8BWXzZFaxXM9JaK7u2J8k5tGAccK1
+247NSR8LEai46HkZpovuKPjD9zwunV6mQeOXQeo3WtoPW0twB9h01sfqV0iMvaXg
+Tu4iUPkcwpIeauNAjJ4KXpl5OxehsBnz9rrb6smtz2bfWBBNiPHaHhT6XIqon5X1
+kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
+ </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>
+MIIDFzCCAf+gAwIBAgIUEEr81svYHmizs6DjzN0FCQ1IlLkwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMIJsWHFr/fc/26Dfv0WOBhspXfyRVGSHMu5IeRs
+reQGRKbrdW4KOOrKQkqZnyQVe8eZt/GZKSzy+9VnAJo3ypaUt2y0LsTqibcg7oNO
+RcC2yDKlEN8CCSX3OQrQ1kWRxHpMSaHx1TeWAPI9kB0CykeG6FmVYXG9arY9u9pn
+ZvdPCXg7SkFbTCa1zJdbxBCumq/nAKGiEct6GQHMeYOb9YBI+WYYByfseLdf5dNC
+i1fXuRYbxK9dcFIVlGuZRea99TklSZZR3BxFLHgcECjp1ZtoT0Byl2yxmm0nGJE2
+HKh+LsxAUz3ouG3qItUJPYzBS1RHQVWYz8N4T8z+w+1jEY0CAwEAAaNdMFswHQYD
+VR0OBBYEFKf0zzGixtPS531/l3z2Vc04g1seMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQA4PPWZd96F0l40muNxqPzVNzTq/D+ndRhEcPOxk8SraEXaFlkm
+xqELKuLnuj7MAx+y/SJssIs9acDm8CBxp60z9hSTkokVjVAfyWiTU+KuTGvwWWnP
+T25PheKwMPl+W45PhXfbK0F1nDXvNf2L59gxuBIJEcqojx6BHlLfz1tbQUCsezV4
+fv98gre6OoWeN5TSiWgtl7Gsb1cjFRcfiYNwDo9pWqNnLOioncMs4SOyEKrTxrU7
+rmABcIrDyPLSecdGrJBUBiYy1tTm72SEGK9npcZ8QPuXkkSf7zskTenf4tFszUnq
+BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>operations@swamid.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
index 09399066..fd98f37f 100644
--- a/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
@@ -109,17 +109,17 @@ dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
<md:ContactPerson contactType="administrative">
<md:Company>Linköping University</md:Company>
<md:SurName>LiU-IT SAML admins</md:SurName>
- <md:EmailAddress>saml-admins@it.liu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Linköping University</md:Company>
<md:SurName>LiU-IT SAML admins</md:SurName>
- <md:EmailAddress>saml-admins@it.liu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Linköping University</md:Company>
<md:SurName>LiU-IT Helpdesk</md:SurName>
- <md:EmailAddress>helpdesk@liu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@liu.se</md:EmailAddress>
<md:TelephoneNumber>+46 13 282828</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml
new file mode 100644
index 00000000..23d4ef57
--- /dev/null
+++ b/swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://login.nki.nl/adfs/services/trust">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-10-26T17:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="nl">Antoni van Leeuwenhoek - Nederlands Kanker Instituut</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</mdui:DisplayName>
+ <mdui:Description xml:lang="nl">Antoni van Leeuwenhoek - Nederlands Kanker Instituut</mdui:Description>
+ <mdui:Description xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</mdui:Description>
+ <mdui:Logo height="109" width="213">https://static.surfconext.nl/logos/idp/nki.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Netherlands Cancer Institute Antoni van Leeuwenhoek Huis nki avl</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">Nederlands Kanker Instituut Antoni van Leeuwenhoek Huis nki avl</mdui:Keywords>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/91bd4d327f9cc83bcac7882b9b69e26d"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="nl">Antoni van Leeuwenhoek – Nederlands Kanker Instituut</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="nl">Antoni van Leeuwenhoek – Nederlands Kanker Instituut</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="nl">http://www.nki.nl/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.nki.nl/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>SURFconext support</md:GivenName>
+ <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml
index c71b81c9..159cdc99 100644
--- a/swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml
@@ -17,36 +17,33 @@
<mdui:Logo height="58" width="110">https://login.northumbria.ac.uk/idp/images/northumbria-logo.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIE2TCCA8GgAwIBAgIQGudxojDeqfulg/H1pHAxSzANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMTEwNTAwMDAwMFoXDTE1MTEwNTIzNTk1OVowgawxCzAJBgNV
- BAYTAkdCMRYwFAYDVQQIEw1UeW5lIGFuZCBXZWFyMRwwGgYDVQQHExNOZXdjYXN0
- bGUgdXBvbiBUeW5lMS8wLQYDVQQKEyZVbml2ZXJzaXR5IG9mIE5vcnRodW1icmlh
- IGF0IE5ld2Nhc3RsZTEUMBIGA1UECxMLSVQgU2VydmljZXMxIDAeBgNVBAMTF2xv
- Z2luLm5vcnRodW1icmlhLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAqc9f4NtBjhi29ZKRccCyzF3iB+35p3py/klIgY4QQBE7FHFueLXPcxmm
- pUd+V0xkzQdZaOhT71Z+cRQxwvImtJjdJ090cwoTLUVhGYksVf+7DBnZ3netcnxO
- UcJEYDwFnRbuftjypYFG6TxnAQr+NUMxNM2CCK+4rKOMjfv8xZBo+TLAYJc5+WEz
- yRhmAXe94oEohAgbiWX9Lt0sf8XRj9p7bBbMSZwZN6CQy2SxZMbojS+ZQZJ3W3Qs
- e6rzW57Jj/dlGwhSinQoemsYw5j2IEDnqcoZK0G5DgowVRnfmprTWSrFXjHtZETL
- T2uHyUZ06Me85fAODtp0a34v55EpKQIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAU
- DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFFNs8KCvp7u4egtbbZRM0Q3p
- eceOMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
- AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
- HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
- Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
- Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
- Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF2xvZ2luLm5vcnRodW1i
- cmlhLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBAKCRPdKKl96slQq2xAxKQg4k8
- Elb1NlN6reI5BK161a4paiuRRB2cvqgcweuIs3ixuQ2jFKvfJ/zvp9ypRLAzst6b
- zhBFuwr+5ndv+MknYu3zyA718wsd1KNojFtkDPTmG5oSwLZQAGATFkiyrpTKrMnU
- 8AWfyiFkRW5hVmFNHMfrguFgCukxHd6XpKSNMPer17k3YrYJhUecYn2/UvW7Fc0b
- s9brte9lyJUe7fju3PqSm+0xKInyL5Z1KkA0Sikn3hhHQ9yxya0CVoWovZUot1c4
- r25Y4ksJ8/yqZPWuks/qIP+Ba5XJieaK24iMjG1RbWOpqhOToldEnV9Omxxs
+ MIIEODCCAyCgAwIBAgIJAMiLIz7trK3/MA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD
+ VQQGEwJHQjEWMBQGA1UECAwNVHluZSBhbmQgV2VhcjEcMBoGA1UEBwwTTmV3Y2Fz
+ dGxlIHVwb24gVHluZTEfMB0GA1UECgwWTm9ydGh1bWJyaWEgVW5pdmVyc2l0eTEU
+ MBIGA1UECwwLSVQgU2VydmljZXMxIDAeBgNVBAMMF2xvZ2luLm5vcnRodW1icmlh
+ LmFjLnVrMB4XDTE1MDkyOTA5NDAzNFoXDTI1MDkyNjA5NDAzNFowgZwxCzAJBgNV
+ BAYTAkdCMRYwFAYDVQQIDA1UeW5lIGFuZCBXZWFyMRwwGgYDVQQHDBNOZXdjYXN0
+ bGUgdXBvbiBUeW5lMR8wHQYDVQQKDBZOb3J0aHVtYnJpYSBVbml2ZXJzaXR5MRQw
+ EgYDVQQLDAtJVCBTZXJ2aWNlczEgMB4GA1UEAwwXbG9naW4ubm9ydGh1bWJyaWEu
+ YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDG5ycTOP3wR+Ev
+ NAiB2rQIB7DEKe8E06FJBU0Jdf0kZj6f/TzVSR8pFP69wTdKxIeOD0Rs3ouo1+Af
+ 7FNjyikcS9J4mbewSJwI1jU/65JyI9qEPGj12sRKD4XHE7nxe8Ai+FnUG2wSQ3gw
+ BWqyvEQ2AXs9m8qSoJt8vND2paBS4DZXNxB4NbtRZfHH25fjZ4D5ZuGi2jbSpUKK
+ tHjTFmxxk4Nn3Gqg2I/tXRKLBNrwUH0aKU3kqVEdvYN1vcku/Khqfk9XIfK5paUZ
+ xho/5iOXkMtPU1YdE3FCLBwNfXSa8+n7luRrNrfpMPme3NrYT6r7lT8nERrS1XSq
+ X5BDmYDBAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+ U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRgrGADB79pGyCbdE2M
+ VnFszgMZGTAfBgNVHSMEGDAWgBRgrGADB79pGyCbdE2MVnFszgMZGTANBgkqhkiG
+ 9w0BAQsFAAOCAQEAZVWBX7n4lZfwRAAzJP1HRHTvCfsXp8MkeVs0MgkExrpm2r4H
+ xWX27/U1ojsQLJzTfnUL0/pqXYpip/vSY1zvo7wmxfqtkEUK0no9fljPvIxbu7Nt
+ WdHo7Ss07rUqkYXGiTcD2NA/71+tL3PTBmc/xPnT46vhChoVVEkhf5alG9HGrJ3E
+ uoy+45CpSWH9AEPCec7dU5GT/N46Yx4Gjhz99SkAP5KhIuE9dxnoS+OlolTiC/O8
+ XfWC7iSUlskXezVj2v8H2lhUrDTra4v76z9Ssi+LX6ZdyMk3UqL9tWqjwTliLD4a
+ SoDqiIcSreJigbWSnrQkhl2xthJ3c+25U3G0QA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -64,36 +61,33 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northumbria.ac.uk</shibmd:Scope>
</Extensions>
- <KeyDescriptor use="signing">
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIE2TCCA8GgAwIBAgIQGudxojDeqfulg/H1pHAxSzANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMTEwNTAwMDAwMFoXDTE1MTEwNTIzNTk1OVowgawxCzAJBgNV
- BAYTAkdCMRYwFAYDVQQIEw1UeW5lIGFuZCBXZWFyMRwwGgYDVQQHExNOZXdjYXN0
- bGUgdXBvbiBUeW5lMS8wLQYDVQQKEyZVbml2ZXJzaXR5IG9mIE5vcnRodW1icmlh
- IGF0IE5ld2Nhc3RsZTEUMBIGA1UECxMLSVQgU2VydmljZXMxIDAeBgNVBAMTF2xv
- Z2luLm5vcnRodW1icmlhLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAqc9f4NtBjhi29ZKRccCyzF3iB+35p3py/klIgY4QQBE7FHFueLXPcxmm
- pUd+V0xkzQdZaOhT71Z+cRQxwvImtJjdJ090cwoTLUVhGYksVf+7DBnZ3netcnxO
- UcJEYDwFnRbuftjypYFG6TxnAQr+NUMxNM2CCK+4rKOMjfv8xZBo+TLAYJc5+WEz
- yRhmAXe94oEohAgbiWX9Lt0sf8XRj9p7bBbMSZwZN6CQy2SxZMbojS+ZQZJ3W3Qs
- e6rzW57Jj/dlGwhSinQoemsYw5j2IEDnqcoZK0G5DgowVRnfmprTWSrFXjHtZETL
- T2uHyUZ06Me85fAODtp0a34v55EpKQIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAU
- DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFFNs8KCvp7u4egtbbZRM0Q3p
- eceOMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
- AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
- HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
- Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
- Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
- Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF2xvZ2luLm5vcnRodW1i
- cmlhLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBAKCRPdKKl96slQq2xAxKQg4k8
- Elb1NlN6reI5BK161a4paiuRRB2cvqgcweuIs3ixuQ2jFKvfJ/zvp9ypRLAzst6b
- zhBFuwr+5ndv+MknYu3zyA718wsd1KNojFtkDPTmG5oSwLZQAGATFkiyrpTKrMnU
- 8AWfyiFkRW5hVmFNHMfrguFgCukxHd6XpKSNMPer17k3YrYJhUecYn2/UvW7Fc0b
- s9brte9lyJUe7fju3PqSm+0xKInyL5Z1KkA0Sikn3hhHQ9yxya0CVoWovZUot1c4
- r25Y4ksJ8/yqZPWuks/qIP+Ba5XJieaK24iMjG1RbWOpqhOToldEnV9Omxxs
+ MIIEODCCAyCgAwIBAgIJAMiLIz7trK3/MA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD
+ VQQGEwJHQjEWMBQGA1UECAwNVHluZSBhbmQgV2VhcjEcMBoGA1UEBwwTTmV3Y2Fz
+ dGxlIHVwb24gVHluZTEfMB0GA1UECgwWTm9ydGh1bWJyaWEgVW5pdmVyc2l0eTEU
+ MBIGA1UECwwLSVQgU2VydmljZXMxIDAeBgNVBAMMF2xvZ2luLm5vcnRodW1icmlh
+ LmFjLnVrMB4XDTE1MDkyOTA5NDAzNFoXDTI1MDkyNjA5NDAzNFowgZwxCzAJBgNV
+ BAYTAkdCMRYwFAYDVQQIDA1UeW5lIGFuZCBXZWFyMRwwGgYDVQQHDBNOZXdjYXN0
+ bGUgdXBvbiBUeW5lMR8wHQYDVQQKDBZOb3J0aHVtYnJpYSBVbml2ZXJzaXR5MRQw
+ EgYDVQQLDAtJVCBTZXJ2aWNlczEgMB4GA1UEAwwXbG9naW4ubm9ydGh1bWJyaWEu
+ YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDG5ycTOP3wR+Ev
+ NAiB2rQIB7DEKe8E06FJBU0Jdf0kZj6f/TzVSR8pFP69wTdKxIeOD0Rs3ouo1+Af
+ 7FNjyikcS9J4mbewSJwI1jU/65JyI9qEPGj12sRKD4XHE7nxe8Ai+FnUG2wSQ3gw
+ BWqyvEQ2AXs9m8qSoJt8vND2paBS4DZXNxB4NbtRZfHH25fjZ4D5ZuGi2jbSpUKK
+ tHjTFmxxk4Nn3Gqg2I/tXRKLBNrwUH0aKU3kqVEdvYN1vcku/Khqfk9XIfK5paUZ
+ xho/5iOXkMtPU1YdE3FCLBwNfXSa8+n7luRrNrfpMPme3NrYT6r7lT8nERrS1XSq
+ X5BDmYDBAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+ U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRgrGADB79pGyCbdE2M
+ VnFszgMZGTAfBgNVHSMEGDAWgBRgrGADB79pGyCbdE2MVnFszgMZGTANBgkqhkiG
+ 9w0BAQsFAAOCAQEAZVWBX7n4lZfwRAAzJP1HRHTvCfsXp8MkeVs0MgkExrpm2r4H
+ xWX27/U1ojsQLJzTfnUL0/pqXYpip/vSY1zvo7wmxfqtkEUK0no9fljPvIxbu7Nt
+ WdHo7Ss07rUqkYXGiTcD2NA/71+tL3PTBmc/xPnT46vhChoVVEkhf5alG9HGrJ3E
+ uoy+45CpSWH9AEPCec7dU5GT/N46Yx4Gjhz99SkAP5KhIuE9dxnoS+OlolTiC/O8
+ XfWC7iSUlskXezVj2v8H2lhUrDTra4v76z9Ssi+LX6ZdyMk3UqL9tWqjwTliLD4a
+ SoDqiIcSreJigbWSnrQkhl2xthJ3c+25U3G0QA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml b/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml
index 9edc788b..bbaab7c9 100644
--- a/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">Nuclear Research and Consultancy Group</mdui:DisplayName>
<mdui:Description xml:lang="nl">Nuclear Research and Consultancy Group</mdui:Description>
<mdui:Description xml:lang="en">Nuclear Research and Consultancy Group</mdui:Description>
- <mdui:Logo height="87" width="108">https://static.surfconext.nl/media/idp/nrg.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Nuclear Research and Consultancy Group NRG</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Nuclear Research and Consultancy Group NRG</mdui:Keywords>
+ <mdui:Logo height="87" width="108">https://static.surfconext.nl/logos/idp/nrg.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Nuclear Research and Consultancy Group nrg</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">Nuclear Research and Consultancy Group nrg</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
@@ -31,7 +31,7 @@
<md:Organization>
<md:OrganizationName xml:lang="en">Nuclear Research and Consultancy Group</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Nuclear Research and Consultancy Group</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.surffederatie.nl</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.nrg.eu</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="administrative">
<md:GivenName>SURFconext support</md:GivenName>
diff --git a/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
index 55cadbda..8f478f02 100644
--- a/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
@@ -14,16 +14,17 @@
<mdui:DisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</mdui:DisplayName>
<mdui:Description xml:lang="en">National Technical University of Athens Identity Provider</mdui:Description>
<mdui:Description xml:lang="el">Υπηρεσία Ταυτότητας του Εθνικού Μετσόβιου Πολυτεχνείου</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.noc.ntua.gr/login</mdui:InformationURL>
- <mdui:InformationURL xml:lang="el">http://www.noc.ntua.gr/login</mdui:InformationURL>
- <mdui:Logo width="300" height="302">http://www.ntua.gr/images/logo/pyrforos300.png</mdui:Logo>
- <mdui:Logo width="150" height="151">http://www.ntua.gr/images/logo/pyrforos150.png</mdui:Logo>
- <mdui:Logo width="50" height="50">http://www.ntua.gr/images/logo/pyrforos50.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">https://login.ntua.gr</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="el">https://login.ntua.gr</mdui:InformationURL>
+ <mdui:Logo height="302" width="300">https://login.ntua.gr/images/pyrforos300.png</mdui:Logo>
+ <mdui:Logo height="151" width="150">https://login.ntua.gr/images/pyrforos150.png</mdui:Logo>
+ <mdui:Logo height="50" width="50">https://login.ntua.gr/images/pyrforos50.png</mdui:Logo>
</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:GeolocationHint>geo:37.977413,23.782694</mdui:GeolocationHint>
</mdui:DiscoHints>
</md:Extensions>
<md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/login.ou.nl-oam-fed.xml b/swamid-interfederations-2.0/login.ou.nl-oam-fed.xml
index 9052f5ee..ed7c0733 100644
--- a/swamid-interfederations-2.0/login.ou.nl-oam-fed.xml
+++ b/swamid-interfederations-2.0/login.ou.nl-oam-fed.xml
@@ -14,7 +14,7 @@
<mdui:DisplayName xml:lang="en">Open Universiteit</mdui:DisplayName>
<mdui:Description xml:lang="nl">Open Universiteit</mdui:Description>
<mdui:Description xml:lang="en">Open Universiteit in the Netherlands</mdui:Description>
- <mdui:Logo height="48" width="24">https://static.surfconext.nl/media/idp/ou.png</mdui:Logo>
+ <mdui:Logo height="48" width="24">https://static.surfconext.nl/logos/idp/ou.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Open Universiteit in the Netherlands OU Heerlen</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Open Universiteit in the Netherlands OU Heerlen</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml
index 38fc2907..f955333b 100644
--- a/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml
@@ -14,9 +14,9 @@
<mdui:DisplayName xml:lang="en">TERENA Secretariat</mdui:DisplayName>
<mdui:Description xml:lang="nl">TERENA Secretariat</mdui:Description>
<mdui:Description xml:lang="en">TERENA</mdui:Description>
- <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/terena.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">TERENA Secretariat Trans-European Research and Education Networking Association</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">TERENA Secretariat Trans-European Research and Education Networking Association</mdui:Keywords>
+ <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/terena.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">terena secretariat trans-european research and education networking association</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">terena secretariat trans-european research and education networking association</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..7dc2a0da
--- /dev/null
+++ b/swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ucs.ac.uk/saml2/idp/metadata.php">
+ <!--
+ This is a "(Test)" SimpleSAMLphp IdP for University Campus Suffolk.
+ -->
+ <Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-06T09:23:15Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.ac.uk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University Campus Suffolk (Test)</mdui:DisplayName>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMTCCAhmgAwIBAgIJAM1dFRKkRxYPMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
+ BAYTAlVLMQwwCgYDVQQKDANVU0MxEjAQBgNVBAMMCXVjcy5hYy51azAeFw0xNTA5
+ MDgxMTUwNDVaFw0yNTA5MDcxMTUwNDVaMC8xCzAJBgNVBAYTAlVLMQwwCgYDVQQK
+ DANVU0MxEjAQBgNVBAMMCXVjcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ ADCCAQoCggEBAODHsZgmS0t5w52jSee9vyzTrurdN1gqj9QEHkbOpj6r5c1yzy1m
+ W+XCGEft7OzEm9Y62UzceEFwkqYoqPyL7CbAGtC6jYqV7FzW8Oo1LgVYRMQhHMoE
+ J0Qu3s05uxhY5LKfNX0IYqTFYag9a6QQ3AQsR09EHfJ9Irv4ZYO3kDDblfKuvuhC
+ ObOeF3wu1xZFvj6hn17yPIw/RaVI9fqOm8JlE9pDl4GiAD4wrtmnTbVLASdtkr5A
+ WbmLhtdn7iBeWEbZb77ovAcZ4OALjlUknb2fVN9Pd5WU8QCADLMGhNFrEcQdOT3C
+ I8Ym/a5CZcmpDxR0ObM83CFqABrqKf5dI8cCAwEAAaNQME4wHQYDVR0OBBYEFG1T
+ KnfCPsTsa6qpP/P1em2nSYT8MB8GA1UdIwQYMBaAFG1TKnfCPsTsa6qpP/P1em2n
+ SYT8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAERHkWhKP0UdJl6r
+ MYSrrFmT9ZMF/Ypt1HYrqdv88HWW+doZIKwl/VMC0zHCavCQLYz51VH6nRm7Ybbg
+ gdZEPy/aUng1vJUE4ip8ElZz69c6oZF+qCl6CPskKOSNb986XkFUR3uC8sa9pBz1
+ fy59K2k98yz1dW4x1DPD8Q3v3F+uz1biNE47orYzjoFdY3WaDFQlliYuVf0MN2LP
+ YuRRHTgeuViKKrYxUr9FdFJs3mitDyxhmyPM/igJ5k+5MkHP1QLP9ImOklcsKkRn
+ fm75tfGWz9Tsg9nNILbKPkiZTW1XE+CMKunVcCR3UuICNX+YUK6dCEAmQZIH4YUk
+ GHQqIQc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMTCCAhmgAwIBAgIJAM1dFRKkRxYPMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
+ BAYTAlVLMQwwCgYDVQQKDANVU0MxEjAQBgNVBAMMCXVjcy5hYy51azAeFw0xNTA5
+ MDgxMTUwNDVaFw0yNTA5MDcxMTUwNDVaMC8xCzAJBgNVBAYTAlVLMQwwCgYDVQQK
+ DANVU0MxEjAQBgNVBAMMCXVjcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ ADCCAQoCggEBAODHsZgmS0t5w52jSee9vyzTrurdN1gqj9QEHkbOpj6r5c1yzy1m
+ W+XCGEft7OzEm9Y62UzceEFwkqYoqPyL7CbAGtC6jYqV7FzW8Oo1LgVYRMQhHMoE
+ J0Qu3s05uxhY5LKfNX0IYqTFYag9a6QQ3AQsR09EHfJ9Irv4ZYO3kDDblfKuvuhC
+ ObOeF3wu1xZFvj6hn17yPIw/RaVI9fqOm8JlE9pDl4GiAD4wrtmnTbVLASdtkr5A
+ WbmLhtdn7iBeWEbZb77ovAcZ4OALjlUknb2fVN9Pd5WU8QCADLMGhNFrEcQdOT3C
+ I8Ym/a5CZcmpDxR0ObM83CFqABrqKf5dI8cCAwEAAaNQME4wHQYDVR0OBBYEFG1T
+ KnfCPsTsa6qpP/P1em2nSYT8MB8GA1UdIwQYMBaAFG1TKnfCPsTsa6qpP/P1em2n
+ SYT8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAERHkWhKP0UdJl6r
+ MYSrrFmT9ZMF/Ypt1HYrqdv88HWW+doZIKwl/VMC0zHCavCQLYz51VH6nRm7Ybbg
+ gdZEPy/aUng1vJUE4ip8ElZz69c6oZF+qCl6CPskKOSNb986XkFUR3uC8sa9pBz1
+ fy59K2k98yz1dW4x1DPD8Q3v3F+uz1biNE47orYzjoFdY3WaDFQlliYuVf0MN2LP
+ YuRRHTgeuViKKrYxUr9FdFJs3mitDyxhmyPM/igJ5k+5MkHP1QLP9ImOklcsKkRn
+ fm75tfGWz9Tsg9nNILbKPkiZTW1XE+CMKunVcCR3UuICNX+YUK6dCEAmQZIH4YUk
+ GHQqIQc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ucs.ac.uk/saml2/idp/SingleLogoutService.php"/>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ucs.ac.uk/saml2/idp/SSOService.php"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University Campus Suffolk</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University Campus Suffolk (Test)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ucs.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IT Helpdesk</GivenName>
+ <EmailAddress>mailto:ithelpdesk@ucs.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Will</GivenName>
+ <SurName>Liebow</SurName>
+ <EmailAddress>mailto:w.liebow@ucs.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
index c06a056c..6d9ff57a 100644
--- a/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
@@ -1,16 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://logout.uwasa.fi/idp/shibboleth">
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
- <md:Extensions>
- <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
- <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
- <saml:Attribute Name="tags">
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
- <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://logout.uwasa.fi/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
</saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.uwasa.fi</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwasa.fi</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="fi">Vaasan yliopisto</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Vasa Universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Vaasa</mdui:DisplayName>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>uwasa.fi</mdui:DomainHint>
+ </mdui:DiscoHints>
</md:Extensions>
<md:KeyDescriptor>
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
@@ -48,11 +62,11 @@ yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
</md:IDPSSODescriptor>
<md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
- <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
- <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.uwasa.fi</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwasa.fi</shibmd:Scope>
</md:Extensions>
<md:KeyDescriptor>
- <ds:KeyInfo>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
diff --git a/swamid-interfederations-2.0/manage.federations.renam.md.xml b/swamid-interfederations-2.0/manage.federations.renam.md.xml
new file mode 100644
index 00000000..ddbe696c
--- /dev/null
+++ b/swamid-interfederations-2.0/manage.federations.renam.md.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://manage.federations.renam.md">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-12-01T08:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://federations.renam.md</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Federation Management Board</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="ro">Sistem de Management al Federatiei</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="ru">Приложение для менеджмента Федерации</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Federation Management Board - used to manage federation entitites and generate metadata</mdui:Description>
+ <mdui:Description xml:lang="ro">Sistem de Management al Federatiei - necesara pentru managementul entitatilor federative si generarea metadatelor</mdui:Description>
+ <mdui:Description xml:lang="ru">Приложение для менеджмента Федерации - неодходимо для управления федеративными сервисами и генерации мата-данных</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://manage.federations.renam.md</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="ro">https://manage.federations.renam.md</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="ru">https://manage.federations.renam.md</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIE6zCCA9OgAwIBAgICANMwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
+ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
+IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
+cmlkIENBMB4XDTE1MTEyNTA4MzEyNFoXDTI1MTEyMjA4MzEyNFowYDESMBAGCgmS
+JomT8ixkARkWAk1EMRowGAYKCZImiZPyLGQBGRYKRmVkZXJhdGlvbjEOMAwGA1UE
+ChMFUkVOQU0xHjAcBgNVBAMTFU1hbmFnZVNlcnZpY2VNZXRhU2lnbjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0ctV8e4QOli52mhR6sc4MImsPDodie
+he/uqVoAfhsxumuf6vR5oHvgy4QQGC/zJxEfWbI2hKlCCkH9tRBerYgu90vMMCZe
+d+INTGvskp28hDXki1Luj5DnzcTjuF9M7M8PRfa/nmYp5e33+Kh87UX6Jo9ekWMr
+pEKMEgR2UeJt+2vzQGDCYrI2NhDX1u20eZfVBP+gJNkxFSLH+cXICMe2P3z8vy5g
+L22wdJC+ep7XCqPPpRn50qKJF2nT0aopMggY7cCBxo0QAkt9t3qCvwTnHasMU+Ov
+9I0+TLJ2exn8/vBA1nicToanXyZNlYjD1kJHsw0gWh+a+1wHG/kkfe8CAwEAAaOC
+AZkwggGVMB0GA1UdDgQWBBRgFwRz+fla6Dkajz7A+0RDKvolTjAfBgNVHSMEGDAW
+gBQHQ26bo1u5q+z02L86Gw2jKbg1YjA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUH
+MAKGHmh0dHA6Ly9jYS5ncmlkLm1kL2ZpbGVzL2NhLmNydDAzBgNVHR8ELDAqMCig
+JqAkhiJodHRwOi8vY2EuZ3JpZC5tZC9maWxlcy9jcmwtdjIuY3JsMCkGA1UdEgQi
+MCCBC2NhQHJlbmFtLm1khhFodHRwOi8vY2EuZ3JpZC5tZDCBtgYDVR0gBIGuMIGr
+MA4GDCsGAQQBgfNaCgEBBDCBmAYKKoZIhvdMBQICATCBiTA2BggrBgEFBQcCARYq
+aHR0cDovL2NhLmdyaWQubWQvZmlsZXMvTUQtR3JpZC1DUC1DUFMucGRmME8GCCsG
+AQUFBwICMEMaQUxpbWl0ZWQgTGlhYmlsaXR5LCBzZWUgaHR0cDovL2NhLmdyaWQu
+bWQvZmlsZXMvTUQtR3JpZC1DUC1DUFMucGRmMA0GCSqGSIb3DQEBCwUAA4IBAQC6
+KJuZeroALfPd32ft7vDVrU2olrWlK83Xvgjy6BRbd9ksBxuFUCAYbZxYWhWiNCUG
+2xn7nKLWjs51sSeDqFPVzNsAaU/MGr3TvFcxH1gyaIZQNkXVZcRbi93SdVfmnl9Z
+1R86aJxShVN6wOTAWyMSkzh3VGVGK9IeA57WoDAGuxvDVgxURO+lpkY0QztOMK9m
+DOFfR5TiqEahO0z7zUInQbg7LEgwDazK7BuDbirKdQhncGYCVG1dg3Qq09vJdSS4
+UgVNSVjlMzKBjhjGa9KhyOQZozleonKnk1o/cblzPGClGgcZeqElC6YXDpJzlSqt
+QDG9g0AnMyza3V7kLiDz
+</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>
+MIIE6zCCA9OgAwIBAgICANMwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
+ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
+IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
+cmlkIENBMB4XDTE1MTEyNTA4MzEyNFoXDTI1MTEyMjA4MzEyNFowYDESMBAGCgmS
+JomT8ixkARkWAk1EMRowGAYKCZImiZPyLGQBGRYKRmVkZXJhdGlvbjEOMAwGA1UE
+ChMFUkVOQU0xHjAcBgNVBAMTFU1hbmFnZVNlcnZpY2VNZXRhU2lnbjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0ctV8e4QOli52mhR6sc4MImsPDodie
+he/uqVoAfhsxumuf6vR5oHvgy4QQGC/zJxEfWbI2hKlCCkH9tRBerYgu90vMMCZe
+d+INTGvskp28hDXki1Luj5DnzcTjuF9M7M8PRfa/nmYp5e33+Kh87UX6Jo9ekWMr
+pEKMEgR2UeJt+2vzQGDCYrI2NhDX1u20eZfVBP+gJNkxFSLH+cXICMe2P3z8vy5g
+L22wdJC+ep7XCqPPpRn50qKJF2nT0aopMggY7cCBxo0QAkt9t3qCvwTnHasMU+Ov
+9I0+TLJ2exn8/vBA1nicToanXyZNlYjD1kJHsw0gWh+a+1wHG/kkfe8CAwEAAaOC
+AZkwggGVMB0GA1UdDgQWBBRgFwRz+fla6Dkajz7A+0RDKvolTjAfBgNVHSMEGDAW
+gBQHQ26bo1u5q+z02L86Gw2jKbg1YjA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUH
+MAKGHmh0dHA6Ly9jYS5ncmlkLm1kL2ZpbGVzL2NhLmNydDAzBgNVHR8ELDAqMCig
+JqAkhiJodHRwOi8vY2EuZ3JpZC5tZC9maWxlcy9jcmwtdjIuY3JsMCkGA1UdEgQi
+MCCBC2NhQHJlbmFtLm1khhFodHRwOi8vY2EuZ3JpZC5tZDCBtgYDVR0gBIGuMIGr
+MA4GDCsGAQQBgfNaCgEBBDCBmAYKKoZIhvdMBQICATCBiTA2BggrBgEFBQcCARYq
+aHR0cDovL2NhLmdyaWQubWQvZmlsZXMvTUQtR3JpZC1DUC1DUFMucGRmME8GCCsG
+AQUFBwICMEMaQUxpbWl0ZWQgTGlhYmlsaXR5LCBzZWUgaHR0cDovL2NhLmdyaWQu
+bWQvZmlsZXMvTUQtR3JpZC1DUC1DUFMucGRmMA0GCSqGSIb3DQEBCwUAA4IBAQC6
+KJuZeroALfPd32ft7vDVrU2olrWlK83Xvgjy6BRbd9ksBxuFUCAYbZxYWhWiNCUG
+2xn7nKLWjs51sSeDqFPVzNsAaU/MGr3TvFcxH1gyaIZQNkXVZcRbi93SdVfmnl9Z
+1R86aJxShVN6wOTAWyMSkzh3VGVGK9IeA57WoDAGuxvDVgxURO+lpkY0QztOMK9m
+DOFfR5TiqEahO0z7zUInQbg7LEgwDazK7BuDbirKdQhncGYCVG1dg3Qq09vJdSS4
+UgVNSVjlMzKBjhjGa9KhyOQZozleonKnk1o/cblzPGClGgcZeqElC6YXDpJzlSqt
+QDG9g0AnMyza3V7kLiDz
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://manage.federations.renam.md/ssphp/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://manage.federations.renam.md/ssphp/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://manage.federations.renam.md/ssphp/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://manage.federations.renam.md/ssphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">Federation Management Board</md:ServiceName>
+ <md:ServiceName xml:lang="ro">Sistem de Management al Federatiei</md:ServiceName>
+ <md:ServiceName xml:lang="ru">Приложение для менеджмента Федерации</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Federation Management Board - used to manage federation entitites and generate metadata</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="ro">Sistem de Management al Federatiei - necesara pentru managementul entitatilor federative si generarea metadatelor</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="ru">Приложение для менеджмента Федерации - неодходимо для управления федеративными сервисами и генерации мата-данных</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="ro">RENAM</md:OrganizationName>
+ <md:OrganizationName xml:lang="ru">RENAM</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">RENAM</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="ro">RENAM</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="ru">RENAM</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">RENAM</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="ro">http://renam.md</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="ru">http://renam.md</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://renam.md</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Valentin</md:GivenName>
+ <md:SurName>Pocotilenco</md:SurName>
+ <md:EmailAddress>mailto:leaf@renam.md</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml
index d80d976b..fcb57548 100644
--- a/swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Zeeuwse Bibliotheek</mdui:DisplayName>
<mdui:Description xml:lang="nl">Zeeuwse Bibliotheek</mdui:Description>
<mdui:Description xml:lang="en">Zeeuwse Bibliotheek</mdui:Description>
- <mdui:Logo height="48" width="76">https://static.surfconext.nl/media/idp/zeeuwsebibliotheek.png</mdui:Logo>
+ <mdui:Logo height="48" width="76">https://static.surfconext.nl/logos/idp/zeeuwsebibliotheek.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Bibliotheek Zeeland Zeeuwse ZEBI</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Bibliotheek Zeeland Zeeuwse ZEBI</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml b/swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml
index b41469a2..1b002d7b 100644
--- a/swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml
+++ b/swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://met.refeds.org/saml2/metadata/">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://met.refeds.org/saml2/metadata/">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-30T13:30:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml
index c2519d7e..56ebc74a 100644
--- a/swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://minosse.unime.it/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://minosse.unime.it/simplesaml/saml2/idp/metadata.php">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-05-25T10:40:44Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml b/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml
new file mode 100644
index 00000000..bcaec26a
--- /dev/null
+++ b/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mp.uu.se/Shibboleth.sso">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
+ <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mp.uu.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala university</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Medarbetarportalen är ett intranät för anställda vid Uppsala universitet, men är även åtkomlig för studenter och externa användare</mdui:Description>
+ <mdui:Description xml:lang="en">The Staff Portal (Medarbetarportalen) is an intranet for employees at Uppsala University, but it's also available for students and external users</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://mp.uu.se/web/support/om-mp</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://mp.uu.se/web/support/om-mp</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIC3zCCAcegAwIBAgIJAKpDmQ/flLdVMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+BAMTCG1wLnV1LnNlMB4XDTEyMTAxMTE0NTAyOFoXDTIyMTAwOTE0NTAyOFowEzER
+MA8GA1UEAxMIbXAudXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCvr+kBJ2UuNB0YitaXHig2ksWqvlio4e3zfQpQUVM97ING6GwaLtHFBVuOyKgI
+UD5VbxE0f3ex33z1v4tOZrDzsHN+btVImK6hRs08jl1iWsvPgrxM5sT0l0HHdP11
+NnksCj3/P6FwApPMu/hPGsMiDUuzUGIsKer2gZkcuR5VudY6D3xjEzxqcNu77rjg
+oXLFr8Khl6W1qSC2/6DofcyAzdukK/Pj28xmZ9iWMVGAiDC1G5EMDa71CaOhAAlF
+pKBOeo85ctSHdWJxZcx37EdJ7YB7W0E5bMeHpUAMcgsCsaqrYhXopMqo2CySol9i
+wUqTzgHB0yM6ZrqyKoZ/O7SnAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG1wLnV1LnNl
+MB0GA1UdDgQWBBR3asu+pkmaby5q/Gu+oVaWIzRoWDANBgkqhkiG9w0BAQUFAAOC
+AQEAC7DqIlOLe7BHTLteri038WO0MqGgQ1RHXhginDAEx+UekwD1P5UIxZaqnkQf
+isCyOw10y5ZhSoc5FCNYA1EDRUKHAabivcRBbrL6GXi14KUTOORnUmMLzUgeuAlq
+w7f1NHlFokb1v7FvN/WKxf37z8Cy49Sfg9Hg6lv+jNobb5lSBjwnTICfCl+ffdFu
+xHXT67mQsDSoiBiExsGPjtqxbrVy2v9WV1Oup6UjXIgOacpaDNErD1XzAkQP6LD4
+t9uEzq8Qiu8ImRG9SyPDd76umF5tLtg53EHaK1o2LnSU4CyjsnUX5Np1l13rMKaR
+Ohr8KLKt6tC/JZ059e8ENxrN7g==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mp.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mp.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mp.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</md:ServiceName>
+ <md:ServiceName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala university</md:ServiceName>
+ <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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn: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:ContactPerson contactType="support">
+ <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>mailto:liferay-datordrift@its.uu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml
index 1fda5cc1..7d3c3d5d 100644
--- a/swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml
@@ -14,9 +14,9 @@
<mdui:DisplayName xml:lang="en">Universiteit Utrecht</mdui:DisplayName>
<mdui:Description xml:lang="nl">Universiteit Utrecht</mdui:Description>
<mdui:Description xml:lang="en">Universiteit Utrecht (NetIQ)</mdui:Description>
- <mdui:Logo height="36" width="108">https://static.surfconext.nl/media/idp/uu.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Utrecht University UU</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Universiteit Utrecht UU</mdui:Keywords>
+ <mdui:Logo height="36" width="108">https://static.surfconext.nl/logos/idp/uu.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">utrecht university uu</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">utrecht university uu</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml b/swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml
index d572e2b7..f56fecf4 100644
--- a/swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml
+++ b/swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml
@@ -27,6 +27,10 @@
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-naming.ja.net/Shibboleth.sso/WAYF"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-naming.ja.net/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bcp-naming.ja.net/Shibboleth.sso/Login" index="1"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -70,6 +74,12 @@
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/POST"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/Redirect"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/SOAP"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
diff --git a/swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml b/swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml
index c71507aa..a7e03d78 100644
--- a/swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml
+++ b/swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml
@@ -27,6 +27,15 @@
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming.ja.net/Shibboleth.sso/WAYF"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming.ja.net/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://naming.ja.net/Shibboleth.sso/Login" index="1"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Jisc Domain Registration Service</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Jisc Domain Registration Service</mdui:Description>
+ <mdui:Logo height="72" width="350">https://domainregistry.jisc.ac.uk/dns/Images/federation-sp-logo.png</mdui:Logo>
+ </mdui:UIInfo>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -70,6 +79,12 @@
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/NIM/POST"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming.ja.net/Shibboleth.sso/NIM/Redirect"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming.ja.net/Shibboleth.sso/NIM/SOAP"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naming.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naming.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
diff --git a/swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml b/swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml
index 14c3aa87..3c88621a 100644
--- a/swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml
+++ b/swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml
@@ -26,7 +26,16 @@
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:Logo height="72" width="350">https://domainregistry-test.jisc.ac.uk/dns-test/Images/federation-sp-logo.png</mdui:Logo>
+ <mdui:DisplayName xml:lang="en">JISC Domain Registration Service</mdui:DisplayName>
+ <mdui:Description xml:lang="en">JISC Domain Registration Service</mdui:Description>
+ </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://naming-test.ja.net/Shibboleth.sso/WAYF"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming-test.ja.net/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://naming-test.ja.net/Shibboleth.sso/Login" index="1"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -70,6 +79,12 @@
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/POST"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/Redirect"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/SOAP"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naming-test.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naming-test.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
diff --git a/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml b/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml
index c79bacda..b58c0dec 100644
--- a/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml
@@ -14,32 +14,31 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEzzCCA7egAwIBAgIQIgup9AQXq2/mAIVLgDo0IjANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMTExNDAwMDAwMFoXDTE1MTExNDIzNTk1OVowgZsxCzAJBgNV
- BAYTAkdCMRkwFwYDVQQIExBOb3J0aGFtcHRvbnNoaXJlMRQwEgYDVQQHEwtOb3J0
- aGFtcHRvbjEcMBoGA1UEChMTTm9ydGhhbXB0b24gQ29sbGVnZTEUMBIGA1UECxML
- SUNUIFN1cHBvcnQxJzAlBgNVBAMTHm5jaWRwLm5vcnRoYW1wdG9uY29sbGVnZS5h
- Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeeFbVvv17/P6HO
- wOY8GirpA+GhEw2GzXC1vlg8eRB7GGxq1/71Sgkh7FnoRpjoosJhPB4gf4Y8ei5w
- OWuasHOnSweOInxPiE+mA40PFEfbuiTLbAHIGNlkSDwXJlaNYGdqdUBcyk0QCZUa
- bikvr1bKiKokbmwfMTEi44m6LrzroVKRYq2FdShi2fnw4QigZjhqT9PQ1iyhu8cP
- 1u7bPskuxK3Wx18MkcM9QEubG5zNr/+2LrgbLTUQ/hqR//wyvgdb6oE83dVhb8jG
- 2O539NdKzOBYWEYYPijsBP7TYZ7T5JDYT/XHskkdXaF3D0GD1F15FEEvm4diLZGv
- Z+ag3okCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
- 47ntMB0GA1UdDgQWBBQRoCcXSYYU2EYCVk+2uoXCPVXPlzAOBgNVHQ8BAf8EBAMC
- BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
- GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
- Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
- AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
- RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
- Lm9yZzApBgNVHREEIjAggh5uY2lkcC5ub3J0aGFtcHRvbmNvbGxlZ2UuYWMudWsw
- DQYJKoZIhvcNAQEFBQADggEBALVvySVz7NtJnZ89cwkf8ta+IzoAx5GMf80lASMs
- DSmIH0OMGiH9h6Zu6F9sQPyNTc2LgLCm8E24HQGd712DZe3CJK0lRuE6st5AG5J4
- K0eYQuX5N+sE0e4VDCYRGX8p+aCHl+DqCw/Szn3EhyJX4JHqJwQNljuiepH8NkCE
- CqNCKt6m8aXV4T43wtxQg9NxDdAXpWLLMBkUJE1PLay38GzuL/pYTZEsBkH6UmgZ
- qhUWeOqVzacp7woehhN0eaRV3nnAw1LoqSlJrOZn7I0UmNaaJp2sfN4Xfaa6E666
- nPxMI3FEofI4DVsiFacYByziNu2TwI98djtN8Z+o0+N0j9k=
+ MIIEoDCCA4igAwIBAgIJAOT4d4eEJbV+MA0GCSqGSIb3DQEBCwUAMIHQMQswCQYD
+ VQQGEwJHQjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEUMBIGA1UEBxMLTm9y
+ dGhhbXB0b24xHDAaBgNVBAoTE05vcnRoYW1wdG9uIENvbGxlZ2UxFTATBgNVBAsT
+ DElDVCBTZXJ2aWNlczEnMCUGA1UEAxMebmNpZHAubm9ydGhhbXB0b25jb2xsZWdl
+ LmFjLnVrMTIwMAYJKoZIhvcNAQkBFiNqYW1lcy5wdXR0QG5vcnRoYW1wdG9uY29s
+ bGVnZS5hYy51azAeFw0xNTEwMTMxNDExNDVaFw0yNTEwMTAxNDExNDVaMIHQMQsw
+ CQYDVQQGEwJHQjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEUMBIGA1UEBxML
+ Tm9ydGhhbXB0b24xHDAaBgNVBAoTE05vcnRoYW1wdG9uIENvbGxlZ2UxFTATBgNV
+ BAsTDElDVCBTZXJ2aWNlczEnMCUGA1UEAxMebmNpZHAubm9ydGhhbXB0b25jb2xs
+ ZWdlLmFjLnVrMTIwMAYJKoZIhvcNAQkBFiNqYW1lcy5wdXR0QG5vcnRoYW1wdG9u
+ Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANbu
+ caFPJVOxagi79pEbQd3g1Sllcz/RkvQ0c9nNIo0q0ot/wJBuI7Saed3n8K9JN88p
+ IFUMDKm4ab6/Qew0jlLQ9z6sGaqS+5Xo/ygfhGLVHjz44u39/BdH32f7WdlK/xUY
+ XZ6VKyrKd9FkuCETN9lDjIL8WxP/S75SMDktV2CtBEduPeDUJHddGTZkLNv2Teap
+ +O77BNTc12ANm9tFUGhbcGfL1wy4sF6Vf8UB0zeVF+i0RW32+MzxwHyk2vlDucEm
+ SauXGf4T0AfxImX+vmGGPThYlNZ/AG4kQVOiam1mrfmul4jBHFzqM7yKYvNRB6qx
+ ODSfbhDMioJBY7NrD8UCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
+ HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFHZdedyK
+ 6163lDdT27eFFX+Uh6LLMB8GA1UdIwQYMBaAFHZdedyK6163lDdT27eFFX+Uh6LL
+ MA0GCSqGSIb3DQEBCwUAA4IBAQALfGtb9Y7VF0SvOtzXEJgYCj7thHke6Gm/DUZg
+ rQZMpjapBfQR03gA6ZI97QyXSi3/oLbkHyZ0Am29FfEkhA413QyM7GUxSc686qPR
+ qzwnMfMSdHHYmD/qDBw1Q1PgqUAG9gopI3vVrmiziJb6C+DOfmQsBOSbiuYf0uQn
+ eX6JQkh13433cjVu8J1J/PWuAeiAOMs2rtQIYjmzG3loSdZQZydLjVccfXq6WNxG
+ vwbKJVEkvsYuI45d1pFmPe1x/UVFTl5EmqFEVkU8S+bpv3vM6WiY/UGkT+9IeFhV
+ hhpHWzv4wbV80Eh9ixIti4pfMo8IxIQReLGddhW/H9A7dwK5
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -61,32 +60,31 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEzzCCA7egAwIBAgIQIgup9AQXq2/mAIVLgDo0IjANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMTExNDAwMDAwMFoXDTE1MTExNDIzNTk1OVowgZsxCzAJBgNV
- BAYTAkdCMRkwFwYDVQQIExBOb3J0aGFtcHRvbnNoaXJlMRQwEgYDVQQHEwtOb3J0
- aGFtcHRvbjEcMBoGA1UEChMTTm9ydGhhbXB0b24gQ29sbGVnZTEUMBIGA1UECxML
- SUNUIFN1cHBvcnQxJzAlBgNVBAMTHm5jaWRwLm5vcnRoYW1wdG9uY29sbGVnZS5h
- Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeeFbVvv17/P6HO
- wOY8GirpA+GhEw2GzXC1vlg8eRB7GGxq1/71Sgkh7FnoRpjoosJhPB4gf4Y8ei5w
- OWuasHOnSweOInxPiE+mA40PFEfbuiTLbAHIGNlkSDwXJlaNYGdqdUBcyk0QCZUa
- bikvr1bKiKokbmwfMTEi44m6LrzroVKRYq2FdShi2fnw4QigZjhqT9PQ1iyhu8cP
- 1u7bPskuxK3Wx18MkcM9QEubG5zNr/+2LrgbLTUQ/hqR//wyvgdb6oE83dVhb8jG
- 2O539NdKzOBYWEYYPijsBP7TYZ7T5JDYT/XHskkdXaF3D0GD1F15FEEvm4diLZGv
- Z+ag3okCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
- 47ntMB0GA1UdDgQWBBQRoCcXSYYU2EYCVk+2uoXCPVXPlzAOBgNVHQ8BAf8EBAMC
- BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
- GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
- Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
- AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
- RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
- Lm9yZzApBgNVHREEIjAggh5uY2lkcC5ub3J0aGFtcHRvbmNvbGxlZ2UuYWMudWsw
- DQYJKoZIhvcNAQEFBQADggEBALVvySVz7NtJnZ89cwkf8ta+IzoAx5GMf80lASMs
- DSmIH0OMGiH9h6Zu6F9sQPyNTc2LgLCm8E24HQGd712DZe3CJK0lRuE6st5AG5J4
- K0eYQuX5N+sE0e4VDCYRGX8p+aCHl+DqCw/Szn3EhyJX4JHqJwQNljuiepH8NkCE
- CqNCKt6m8aXV4T43wtxQg9NxDdAXpWLLMBkUJE1PLay38GzuL/pYTZEsBkH6UmgZ
- qhUWeOqVzacp7woehhN0eaRV3nnAw1LoqSlJrOZn7I0UmNaaJp2sfN4Xfaa6E666
- nPxMI3FEofI4DVsiFacYByziNu2TwI98djtN8Z+o0+N0j9k=
+ MIIEoDCCA4igAwIBAgIJAOT4d4eEJbV+MA0GCSqGSIb3DQEBCwUAMIHQMQswCQYD
+ VQQGEwJHQjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEUMBIGA1UEBxMLTm9y
+ dGhhbXB0b24xHDAaBgNVBAoTE05vcnRoYW1wdG9uIENvbGxlZ2UxFTATBgNVBAsT
+ DElDVCBTZXJ2aWNlczEnMCUGA1UEAxMebmNpZHAubm9ydGhhbXB0b25jb2xsZWdl
+ LmFjLnVrMTIwMAYJKoZIhvcNAQkBFiNqYW1lcy5wdXR0QG5vcnRoYW1wdG9uY29s
+ bGVnZS5hYy51azAeFw0xNTEwMTMxNDExNDVaFw0yNTEwMTAxNDExNDVaMIHQMQsw
+ CQYDVQQGEwJHQjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEUMBIGA1UEBxML
+ Tm9ydGhhbXB0b24xHDAaBgNVBAoTE05vcnRoYW1wdG9uIENvbGxlZ2UxFTATBgNV
+ BAsTDElDVCBTZXJ2aWNlczEnMCUGA1UEAxMebmNpZHAubm9ydGhhbXB0b25jb2xs
+ ZWdlLmFjLnVrMTIwMAYJKoZIhvcNAQkBFiNqYW1lcy5wdXR0QG5vcnRoYW1wdG9u
+ Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANbu
+ caFPJVOxagi79pEbQd3g1Sllcz/RkvQ0c9nNIo0q0ot/wJBuI7Saed3n8K9JN88p
+ IFUMDKm4ab6/Qew0jlLQ9z6sGaqS+5Xo/ygfhGLVHjz44u39/BdH32f7WdlK/xUY
+ XZ6VKyrKd9FkuCETN9lDjIL8WxP/S75SMDktV2CtBEduPeDUJHddGTZkLNv2Teap
+ +O77BNTc12ANm9tFUGhbcGfL1wy4sF6Vf8UB0zeVF+i0RW32+MzxwHyk2vlDucEm
+ SauXGf4T0AfxImX+vmGGPThYlNZ/AG4kQVOiam1mrfmul4jBHFzqM7yKYvNRB6qx
+ ODSfbhDMioJBY7NrD8UCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
+ HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFHZdedyK
+ 6163lDdT27eFFX+Uh6LLMB8GA1UdIwQYMBaAFHZdedyK6163lDdT27eFFX+Uh6LL
+ MA0GCSqGSIb3DQEBCwUAA4IBAQALfGtb9Y7VF0SvOtzXEJgYCj7thHke6Gm/DUZg
+ rQZMpjapBfQR03gA6ZI97QyXSi3/oLbkHyZ0Am29FfEkhA413QyM7GUxSc686qPR
+ qzwnMfMSdHHYmD/qDBw1Q1PgqUAG9gopI3vVrmiziJb6C+DOfmQsBOSbiuYf0uQn
+ eX6JQkh13433cjVu8J1J/PWuAeiAOMs2rtQIYjmzG3loSdZQZydLjVccfXq6WNxG
+ vwbKJVEkvsYuI45d1pFmPe1x/UVFTl5EmqFEVkU8S+bpv3vM6WiY/UGkT+9IeFhV
+ hhpHWzv4wbV80Eh9ixIti4pfMo8IxIQReLGddhW/H9A7dwK5
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..3dcab200
--- /dev/null
+++ b/swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://netlogin.strath.ac.uk/shibboleth">
+ <!--
+ This is an IdP for the University of Strathclyde.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-04T11:48:02Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strath.ac.uk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of Strathclyde</mdui:DisplayName>
+ <mdui:Logo height="60" width="82">https://netlogin.strath.ac.uk/img/strath_logo_82x60.png</mdui:Logo>
+ <mdui:Logo height="12" width="16">https://netlogin.strath.ac.uk/img/strath_logo_16x12.png</mdui:Logo>
+ <mdui:Logo height="16" width="22">https://netlogin.strath.ac.uk/img/strath_logo_22x16.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
+ BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
+ MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
+ ZXYuc3RyYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ n5KFxtDXYrp4ChYev6BWlmqRZWRKiGVKqukVMC9qEkRiDWkwCUU5IgPkKH3IwJfW
+ AO1xGZ+s+kZ2hwjgCVXCYMmlwk5RlRKkcCTTjqHjSZ7ZNKA2hEWOaBJF3F9lFbwk
+ AyvMUi4qn7f+mDybZHr9pbl4phANo8Fs3gnPr+yAp+G6F0EyL3At5SKpnanQ/lRy
+ dTCuXMTukeI1TDtvptr7jV2HjpO4KmEILiCsqDvnjNMT2YEFlgxa8bX+YGXG/8cH
+ 6LKIQOtvSsg0D3xZvmazOWo6xg9XMAgKh6J+tE0HUr6Js16g/GxXghxfQA/rXmh+
+ lK0bYueUgkjyXSclGQe9uwIDAQABo3kwdzAdBgNVHQ4EFgQUHCmyxQT1A5E7uqal
+ xfUiaDHwCgowVgYDVR0RBE8wTYIZbmV0bG9naW4tZGV2LnN0cmF0aC5hYy51a4Yw
+ aHR0cHM6Ly9uZXRsb2dpbi1kZXYuc3RyYXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBBQUAA4IBAQCbAbHeCjRT5CzbWDX9I1VLo3Y0hEjlmiwCvAZX
+ yKPZ5FO5fJVCtI2aqOToFbF2BVOe3/mYV8sC6dsoS38Sarwhzbh6GRRE3FywuPbp
+ UkQGTeAmB7jZ7kXLRS/tgVJbWzChljeVqofhwXjW4PfPugSuslpC+elp9PoTj/BP
+ OrfOIm9jSMG2/HPbaVR9VynfXThx+mYa261FIVQuaha6K+s4Y3vGU3qgyTtnyNYv
+ pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
+ AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://netlogin-dev.strath.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strath.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
+ BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
+ MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
+ ZXYuc3RyYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ n5KFxtDXYrp4ChYev6BWlmqRZWRKiGVKqukVMC9qEkRiDWkwCUU5IgPkKH3IwJfW
+ AO1xGZ+s+kZ2hwjgCVXCYMmlwk5RlRKkcCTTjqHjSZ7ZNKA2hEWOaBJF3F9lFbwk
+ AyvMUi4qn7f+mDybZHr9pbl4phANo8Fs3gnPr+yAp+G6F0EyL3At5SKpnanQ/lRy
+ dTCuXMTukeI1TDtvptr7jV2HjpO4KmEILiCsqDvnjNMT2YEFlgxa8bX+YGXG/8cH
+ 6LKIQOtvSsg0D3xZvmazOWo6xg9XMAgKh6J+tE0HUr6Js16g/GxXghxfQA/rXmh+
+ lK0bYueUgkjyXSclGQe9uwIDAQABo3kwdzAdBgNVHQ4EFgQUHCmyxQT1A5E7uqal
+ xfUiaDHwCgowVgYDVR0RBE8wTYIZbmV0bG9naW4tZGV2LnN0cmF0aC5hYy51a4Yw
+ aHR0cHM6Ly9uZXRsb2dpbi1kZXYuc3RyYXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBBQUAA4IBAQCbAbHeCjRT5CzbWDX9I1VLo3Y0hEjlmiwCvAZX
+ yKPZ5FO5fJVCtI2aqOToFbF2BVOe3/mYV8sC6dsoS38Sarwhzbh6GRRE3FywuPbp
+ UkQGTeAmB7jZ7kXLRS/tgVJbWzChljeVqofhwXjW4PfPugSuslpC+elp9PoTj/BP
+ OrfOIm9jSMG2/HPbaVR9VynfXThx+mYa261FIVQuaha6K+s4Y3vGU3qgyTtnyNYv
+ pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
+ AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Strathclyde</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University of Strathclyde</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.strath.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Support</GivenName>
+ <EmailAddress>mailto:ukfed-support@strath.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Technical</GivenName>
+ <EmailAddress>mailto:ukfed-tech@strath.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml
new file mode 100644
index 00000000..a1fc747e
--- /dev/null
+++ b/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://noec.aai.niif.hu/shibboleth">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>href-test</saml:AttributeValue>
+ <saml:AttributeValue>href-edugain</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+ <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">SP for eduGAIN attribute release checker - no encat</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SP for eduGAIN attribute release checker - no encat</mdui:DisplayName>
+ <mdui:Description xml:lang="hu">SP for eduGAIN attribute release checker - no encat</mdui:Description>
+ <mdui:Description xml:lang="en">SP for eduGAIN attribute release checker - no encat</mdui:Description>
+ <mdui:InformationURL xml:lang="hu">https://earc.eduid.hu/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="hu">https://earc.eduid.hu/privacy</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIICwjCCAiugAwIBAgIJAPqTsvGnOWExMA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGTAXBgNVBAMTEG5vZWMuYWFpLm5paWYuaHUwHhcNMTUxMTAzMTkwODIwWhcNMjUxMDMxMTkwODIwWjBLMQswCQYDVQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxDjAMBgNVBAoTBU5JSUZJMRkwFwYDVQQDExBub2VjLmFhaS5uaWlmLmh1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnlBput7ADIvXu+WzjxmkUKzi8fYXwkBY9pziZ0Ah+JG8sHhe31F8wd5NKPESARoW9SzNjaxttsLKnaWFZ5Ter8zD6eAzKDUWUOlEnADL2J+xvxXhfzdkY8Z/o/pFK8o64RJ5gcS25g0a/3GVlwFuo/YZRKm2yy0arjSWvZkI1swIDAQABo4GtMIGqMB0GA1UdDgQWBBT2E4QkQqkl8IyD5KnL3qSx1PPTjjB7BgNVHSMEdDBygBT2E4QkQqkl8IyD5KnL3qSx1PPTjqFPpE0wSzELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MQ4wDAYDVQQKEwVOSUlGSTEZMBcGA1UEAxMQbm9lYy5hYWkubmlpZi5odYIJAPqTsvGnOWExMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAiD3Gv7yUgsTLa87IAUT1XcvoSK2ez4FJ9C6jD57MZIeZx++SkpoRLrU2/zDYqlF+7Qp1wkO+6qssTOYI/sD8Njy75A4bAlbu79T4PzaoBJx0okhc7svi382hSv4Qyg+Na0wOOFKZ/rEfBK4T+Sgk3PI0ZjM5PlJwj8r6OaC4WRA=</ds:X509Certificate>
+ </ds:X509Data>
+ <ds:KeyName>noec.aai.niif.hu</ds:KeyName>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/ECP" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="hu">SP for eduGAIN attribute release checker - no encat</md:ServiceName>
+ <md:ServiceName xml:lang="en">SP for eduGAIN attribute release checker - no encat</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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <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="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml b/swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml
new file mode 100644
index 00000000..ee58946d
--- /dev/null
+++ b/swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala.leedsbeckett.ac.uk/oala">
+ <!--
+ This is an OpenAthens LA IdP for Leeds Beckett University.
+ -->
+ <Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-03T09:51:22Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">leedsbeckett.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDXDCCAkSgAwIBAgIIY3NQ4sTPsKQwDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
+ CgwYTGVlZHMgQmVja2V0dCBVbml2ZXJzaXR5MSAwHgYDVQQDDBdvYWxhLmxlZWRz
+ YmVja2V0dC5hYy51azAeFw0xNTEwMjcxNzA1MzBaFw0yNTEwMjcxNzA1MzBaMEUx
+ ITAfBgNVBAoMGExlZWRzIEJlY2tldHQgVW5pdmVyc2l0eTEgMB4GA1UEAwwXb2Fs
+ YS5sZWVkc2JlY2tldHQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+ AoIBAQCVFC46kUWSe1tcRlZUevYSOtQkNz9u3WMwwRE5tOtegpEQB8bVen1mLosc
+ vs9xuot9/VZlK6I9dTB0zSfM4KqIyEgcjEbsvprxXAKFRR6pPNVxOofjVSfbJlHD
+ PZwT2xPsm3tZNhhTxRaKmRYSSXAyg9YMHytFeR4RebgBrbbNsmLeOucvzOiyaRhQ
+ f3k9yRIhWsawlgbId47GHl0AyaxBLoHISijYpVeU6AztbKFeQue4IQLpnOL5wbfR
+ eP365fhVoCA52A+9Ad8RBJam51LvKBEtXQwT1N1aff//qN6Xt9ka1/gZItf2puJz
+ MijPqUOkiC/C43TzHM3o+GtOV/j/AgMBAAGjUDBOMB0GA1UdDgQWBBRslIEX55jy
+ 2+BX3F7pC3w3QQmyZTAfBgNVHSMEGDAWgBRslIEX55jy2+BX3F7pC3w3QQmyZTAM
+ BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAVLJ7unff9MIjkJcDlLEax
+ +izPFMJvCic7VptKLhffLm4m6MZaG+U1vtjIfSlZ+mzFonOjugiyW41aP1/0CXBo
+ DIl64e4VgIDkpD7rBThmH2G1zNxJzQzmeUJ9TZJs9s7V8KhqfIBioBNVbht2ySOK
+ DzmRleXBM2MNuwPjWDtKoaaX7av404JdSBZ0wUAoP5j015F8EIqQuHkrV0z8c+ba
+ eYX1IgrdpIyr2KogrjxVzojw1sfFR+z4YTm2vt9G1wkQAaXb7GJIWbJDmEtmowWx
+ oJOY4tpZB0ZjsOTUNnvwopX3H3B8ZSvgjmh3YMVvVrUEi+hcmpa3pmK3ZyNcojea
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDXDCCAkSgAwIBAgIIY3NQ4sTPsKQwDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
+ CgwYTGVlZHMgQmVja2V0dCBVbml2ZXJzaXR5MSAwHgYDVQQDDBdvYWxhLmxlZWRz
+ YmVja2V0dC5hYy51azAeFw0xNTEwMjcxNzA1MzBaFw0yNTEwMjcxNzA1MzBaMEUx
+ ITAfBgNVBAoMGExlZWRzIEJlY2tldHQgVW5pdmVyc2l0eTEgMB4GA1UEAwwXb2Fs
+ YS5sZWVkc2JlY2tldHQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+ AoIBAQCVFC46kUWSe1tcRlZUevYSOtQkNz9u3WMwwRE5tOtegpEQB8bVen1mLosc
+ vs9xuot9/VZlK6I9dTB0zSfM4KqIyEgcjEbsvprxXAKFRR6pPNVxOofjVSfbJlHD
+ PZwT2xPsm3tZNhhTxRaKmRYSSXAyg9YMHytFeR4RebgBrbbNsmLeOucvzOiyaRhQ
+ f3k9yRIhWsawlgbId47GHl0AyaxBLoHISijYpVeU6AztbKFeQue4IQLpnOL5wbfR
+ eP365fhVoCA52A+9Ad8RBJam51LvKBEtXQwT1N1aff//qN6Xt9ka1/gZItf2puJz
+ MijPqUOkiC/C43TzHM3o+GtOV/j/AgMBAAGjUDBOMB0GA1UdDgQWBBRslIEX55jy
+ 2+BX3F7pC3w3QQmyZTAfBgNVHSMEGDAWgBRslIEX55jy2+BX3F7pC3w3QQmyZTAM
+ BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAVLJ7unff9MIjkJcDlLEax
+ +izPFMJvCic7VptKLhffLm4m6MZaG+U1vtjIfSlZ+mzFonOjugiyW41aP1/0CXBo
+ DIl64e4VgIDkpD7rBThmH2G1zNxJzQzmeUJ9TZJs9s7V8KhqfIBioBNVbht2ySOK
+ DzmRleXBM2MNuwPjWDtKoaaX7av404JdSBZ0wUAoP5j015F8EIqQuHkrV0z8c+ba
+ eYX1IgrdpIyr2KogrjxVzojw1sfFR+z4YTm2vt9G1wkQAaXb7GJIWbJDmEtmowWx
+ oJOY4tpZB0ZjsOTUNnvwopX3H3B8ZSvgjmh3YMVvVrUEi+hcmpa3pmK3ZyNcojea
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.leedsbeckett.ac.uk/oala/sso"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.leedsbeckett.ac.uk/oala/sso"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Leeds Beckett University</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Leeds Beckett University (New)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.leedsbeckett.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IT Service Desk</GivenName>
+ <EmailAddress>mailto:ITServiceDesk@leedsbeckett.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>David</GivenName>
+ <SurName>Taylor</SurName>
+ <EmailAddress>mailto:d.v.taylor@leedsbeckett.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml b/swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml
new file mode 100644
index 00000000..211e4c10
--- /dev/null
+++ b/swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oar.sci-gaia.eu/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-09-23T10:56:28Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://oar.sci-gaia.eu/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://oar.sci-gaia.eu/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Sci-GaIA project Open Access Repository</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">Sci-GaIA project Open Access Repository</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Sci-GaIA project Open Access Repository</mdui:Description>
+ <mdui:Description xml:lang="it">Sci-GaIA project Open Access Repository</mdui:Description>
+ <mdui:Description xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://oar.sci-gaia.eu/?ln=en</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="fr">https://oar.sci-gaia.eu/ln=fr</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://oar.sci-gaia.eu/help/privacy-policy</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFnjCCBIagAwIBAgIRAM3ckvEIEzZuZULXK4R98qkwDQYJKoZIhvcNAQELBQAw
+gZYxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTwwOgYD
+VQQDEzNDT01PRE8gUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBT
+ZXJ2ZXIgQ0EwHhcNMTUwOTE3MDAwMDAwWhcNMTgwOTE2MjM1OTU5WjCBoDELMAkG
+A1UEBhMCSVQxDjAMBgNVBBETBTk1MTIzMRAwDgYDVQQIEwdDYXRhbmlhMRAwDgYD
+VQQHEwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy4gU29maWEsIDY0MRIwEAYDVQQK
+EwlVTklDVC1EUEExFDASBgNVBAsTC1BsYXRpbnVtU1NMMRgwFgYDVQQDEw9vYXIu
+c2NpLWdhaWEuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmdNsc
+6ZOGij3jDmsiaQ01gKUT3F7QCxUn/LLsMZJO5Q+wr913AxwcIrN90KUdtFwcpofU
+KK6c3/kVjBPcqizubV3KyGP2GhgO9srj6sJv07lKPOSM3zujuQM0L00uI2Q0t4wd
+v126+qd1pt3z7yjt5fIIjST2vk6tZd/o0G4ouuXlTi/qNaOBMhYDmfmysZojtuZp
+2pxwBNNAJYJg0ubt/hpQt0eBgoPITbp8WrGDw9TAz2pc8stcOK+ibvDANsQBuOI8
+E/Hlm+GAAk86T13IUSo8HWdcFAy+Ou2xaQZCdpUg58hdUb58ffl2UAUhseINH+Eq
+7YoBGH2AzTc2+kZRAgMBAAGjggHZMIIB1TAfBgNVHSMEGDAWgBSa8yvaz61Pti+7
+KkhIKhK3G0LBJDAdBgNVHQ4EFgQUZrSR5oipbEqnS0ssSvdbpzExFOswDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMFAGA1UdIARJMEcwOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEW
+HWh0dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECAjBaBgNVHR8E
+UzBRME+gTaBLhklodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FPcmdh
+bml6YXRpb25WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGLBggrBgEFBQcB
+AQR/MH0wVQYIKwYBBQUHMAKGSWh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9E
+T1JTQU9yZ2FuaXphdGlvblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTAaBgNVHREEEzARgg9v
+YXIuc2NpLWdhaWEuZXUwDQYJKoZIhvcNAQELBQADggEBAFvYiOoqoFdN43X4PPUj
+Zs1dKveKKj2nUr9L8LgLl9ff2FkR9B6gF7kgTC8x1dq5JbG8s0bC3dgh8gh9kUXB
+1+PWZ9+WKoq2W/RfCBEoUSMrcQVGW0lkoHJjuEyh5lty43g5HhgTKLypwD1a/glL
+9l/sH/XOu1VEoAU0ocbrkwMB9t7LkNBEegEyx3d2TcarCywhJ43WFoCeORHKHKPk
+sKwrSiI3l4S1BlRq1GQJElZl9/oKpBYQ8UzjOXuTgDN6U6lwyj/uSj75BQ3jwbCF
+VDSqlLDi9y84jexFwiY+/ulPUc7WQPtD8QxeemcFbLvP/gnosW9YxY3/TZvQQ68y
+InI=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oar.sci-gaia.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">Sci-GaIA project Open Access Repository</md:ServiceName>
+ <md:ServiceName xml:lang="it">Sci-GaIA project Open Access Repository</md:ServiceName>
+ <md:ServiceName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Sci-GaIA project Open Access Repository</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="it">Sci-GaIA project Open Access Repository</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <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:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="it">Università degli Studi Catania</md:OrganizationName>
+ <md:OrganizationName xml:lang="fr">Università degli Studi Catania</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University of Catania</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="it">Open Access Repository del progetto Sci-GaIA erogato dall'Università degli Studi di Catania</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA délivré par l'Università degli Studi di Catania</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Sci-GaIA Open Access Repository provided by the University of Catania</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="it">http://www.unict.it/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.unict.it/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.unict.it/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Marco</md:GivenName>
+ <md:SurName>Fargetta</md:SurName>
+ <md:EmailAddress>mailto:admin@sci-gaia.eu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Roberto</md:GivenName>
+ <md:SurName>Barbera</md:SurName>
+ <md:EmailAddress>mailto:admin@sci-gaia.eu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
index daf27ae8..7c8a61c6 100644
--- a/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
@@ -18,7 +18,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="de">OpenSKOS | Meertens</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">OpenSKOS | Meertens</mdui:DisplayName>
- <mdui:Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf Simple Knowledge Organisation System Repository des Meertens Institut</mdui:Description>
+ <mdui:Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das Simple Knowledge Organisation System Repository des Meertens Instituts</mdui:Description>
<mdui:Description xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</mdui:Description>
<mdui:Logo height="44" width="64">https://openskos.meertens.knaw.nl/assets/images/logo-open-skos.png</mdui:Logo>
<mdui:InformationURL xml:lang="en">https://openskos.meertens.knaw.nl</mdui:InformationURL>
@@ -65,10 +65,10 @@ M+dr9RBlPlv+0rJq07ZbkNJqfxu4tigKOP/+sJiMuORso9uk4Ak+0cX+yb/48zqE
<md:AttributeConsumingService index="1">
<md:ServiceName xml:lang="de">OpenSKOS | Meertens</md:ServiceName>
<md:ServiceName xml:lang="en">OpenSKOS | Meertens</md:ServiceName>
- <md:ServiceDescription xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf Simple Knowledge Organisation System Repository des Meertens Institut</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das Simple Knowledge Organisation System Repository des Meertens Instituts</md:ServiceDescription>
<md:ServiceDescription xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</md:ServiceDescription>
- <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml b/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml
index 74509a23..ece4af53 100644
--- a/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml
@@ -5,6 +5,11 @@
<mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
<mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
@@ -15,10 +20,10 @@
<mdui:Description xml:lang="en">GWDG ownCloud is a service for synchronizing and sharing data.</mdui:Description>
<mdui:Logo height="34" width="86">https://owncloud.gwdg.de/themes/gwdg/core/img/logo-icon.png</mdui:Logo>
<mdui:Logo height="121" width="250">https://owncloud.gwdg.de/themes/gwdg/core/img/logo.png</mdui:Logo>
- <mdui:InformationURL xml:lang="de">http://www.gwdg.de/index.php?id=owncloud</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">http://www.gwdg.de/index.php?id=owncloud</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="de">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
+ <mdui:InformationURL xml:lang="de">https://www.gwdg.de/storage-services/gwdg-owncloud</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.gwdg.de/en/storage-services/gwdg-owncloud</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="de">https://owncloud.gwdg.de/coc.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://owncloud.gwdg.de/coc.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/perfsonarui.geant.org.xml b/swamid-interfederations-2.0/perfsonarui.geant.org.xml
new file mode 100644
index 00000000..3e2aefc3
--- /dev/null
+++ b/swamid-interfederations-2.0/perfsonarui.geant.org.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://perfsonarui.geant.org">
+ <!--
+ This is a 'GÉANT perfSONAR UI' SP for GÉANT Limited.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-24T12:03:05Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">GÉANT perfSONAR UI</mdui:DisplayName>
+ <mdui:Description xml:lang="en">GÉANT perfSONAR UI - Operations instance</mdui:Description>
+ <mdui:Logo height="31" width="167" xml:lang="en">https://psui.geant.net/perfsonar-ui/images/PerfSONAR_logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIFdTCCBF2gAwIBAgIQBruZHycalTIckX3CWVlozDANBgkqhkiG9w0BAQsFADBk
+ MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+ Q0EgMzAeFw0xNTEwMTMwMDAwMDBaFw0xODEwMTcxMjAwMDBaMIGDMQswCQYDVQQG
+ EwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFt
+ MRswGQYDVQQKDBJHw4lBTlQgQXNzb2NpYXRpb24xCzAJBgNVBAsTAklUMR4wHAYD
+ VQQDExVwZXJmc29uYXJ1aS5nZWFudC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+ DwAwggEKAoIBAQDDyMMDtxnR01PgCmtr3WpujJjW9F1GZYOlDfqsTDuZOLuPKOHi
+ lcC+9ILMCAyv87oxqxV/m3dtlYUVgzRNqE47sE1JDHCAtitDKwR4wlIKJrTSfU6o
+ dY3qnW8Pe6UO3rxPkqMwuMs9/FP3VVbcIeeAyuFfCnwgqljKSp2mgaS3qAc2Raox
+ JOKVEAQTO5f4BHI0DdkDct/7Azq+vDpr/nZGmcoG9FLSNHWoAfeP7IQdxpgUeHB/
+ JUh12S7lEtDSlMcK1yd/xLrw3Bdyai1FotqpNpoEHV6/AjOy7Hxpf8TYRRc0OYst
+ 3POtpZBBSKkcH0L07le9gpHYUMYUD94qai/5AgMBAAGjggIBMIIB/TAfBgNVHSME
+ GDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUYyZTMUgTRszC2INE
+ gJ9GdhuKuqYwUwYDVR0RBEwwSoIVcGVyZnNvbmFydWkuZ2VhbnQub3Jnghh0ZXN0
+ LXBlcmZzb25hci5nZWFudC5vcmeCF3VhdC1wZXJmc29uYXIuZ2VhbnQub3JnMA4G
+ A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwawYD
+ VR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVOQVNT
+ TENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJFTkFT
+ U0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUHAgEW
+ HGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsGAQUF
+ BwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgG
+ CCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NM
+ Q0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCNKlpHE86m
+ c8nQ+WLe4jfoX+cm0j+Fyff7q/qEIl2g7i23FsYzgEwqziX8+a/u6KU7BJ+k0eMq
+ dfenP2+86zrRXjd2clSUmkzowGRs3a5Xrl357+904BgXvxLwV7aJU8rk4Oqm3C4j
+ K6m3yuZqjshzRmWkJefVq31C8luP4YN9DNM6WLAXSL3adxxsDUZvs/lvPr9DZ0eX
+ ktYLRFuIll3n55K0KcGvnPxl/u/pjcYovDvKdbmpoZjumDBBx6DK1xa1bojrVQOu
+ ESh9mXQAx0OxLyzZVgxntpNQ2qVirQ0TJhTPBY4RDC5xw56vwB18W79l1Ic13noD
+ Yn/y2E+4DRWc
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIFdTCCBF2gAwIBAgIQBruZHycalTIckX3CWVlozDANBgkqhkiG9w0BAQsFADBk
+ MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+ Q0EgMzAeFw0xNTEwMTMwMDAwMDBaFw0xODEwMTcxMjAwMDBaMIGDMQswCQYDVQQG
+ EwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFt
+ MRswGQYDVQQKDBJHw4lBTlQgQXNzb2NpYXRpb24xCzAJBgNVBAsTAklUMR4wHAYD
+ VQQDExVwZXJmc29uYXJ1aS5nZWFudC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+ DwAwggEKAoIBAQDDyMMDtxnR01PgCmtr3WpujJjW9F1GZYOlDfqsTDuZOLuPKOHi
+ lcC+9ILMCAyv87oxqxV/m3dtlYUVgzRNqE47sE1JDHCAtitDKwR4wlIKJrTSfU6o
+ dY3qnW8Pe6UO3rxPkqMwuMs9/FP3VVbcIeeAyuFfCnwgqljKSp2mgaS3qAc2Raox
+ JOKVEAQTO5f4BHI0DdkDct/7Azq+vDpr/nZGmcoG9FLSNHWoAfeP7IQdxpgUeHB/
+ JUh12S7lEtDSlMcK1yd/xLrw3Bdyai1FotqpNpoEHV6/AjOy7Hxpf8TYRRc0OYst
+ 3POtpZBBSKkcH0L07le9gpHYUMYUD94qai/5AgMBAAGjggIBMIIB/TAfBgNVHSME
+ GDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUYyZTMUgTRszC2INE
+ gJ9GdhuKuqYwUwYDVR0RBEwwSoIVcGVyZnNvbmFydWkuZ2VhbnQub3Jnghh0ZXN0
+ LXBlcmZzb25hci5nZWFudC5vcmeCF3VhdC1wZXJmc29uYXIuZ2VhbnQub3JnMA4G
+ A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwawYD
+ VR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVOQVNT
+ TENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJFTkFT
+ U0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUHAgEW
+ HGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsGAQUF
+ BwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgG
+ CCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NM
+ Q0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCNKlpHE86m
+ c8nQ+WLe4jfoX+cm0j+Fyff7q/qEIl2g7i23FsYzgEwqziX8+a/u6KU7BJ+k0eMq
+ dfenP2+86zrRXjd2clSUmkzowGRs3a5Xrl357+904BgXvxLwV7aJU8rk4Oqm3C4j
+ K6m3yuZqjshzRmWkJefVq31C8luP4YN9DNM6WLAXSL3adxxsDUZvs/lvPr9DZ0eX
+ ktYLRFuIll3n55K0KcGvnPxl/u/pjcYovDvKdbmpoZjumDBBx6DK1xa1bojrVQOu
+ ESh9mXQAx0OxLyzZVgxntpNQ2qVirQ0TJhTPBY4RDC5xw56vwB18W79l1Ic13noD
+ Yn/y2E+4DRWc
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceSOAP"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perfsonar.geant.org/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://perfsonar.geant.org/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
+ <AttributeConsumingService index="0" isDefault="true">
+ <ServiceName xml:lang="en">GÉANT perfSONAR UI</ServiceName>
+ <ServiceDescription xml:lang="en">GÉANT perfSONAR UI - Operations instance</ServiceDescription>
+ <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <RequestedAttribute FriendlyName="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"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">GÉANT Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">GÉANT</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.geant.org/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Ivan</GivenName>
+ <SurName>Garnizov</SurName>
+ <EmailAddress>mailto:ivan.garnizov@fau.de</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Ivan</GivenName>
+ <SurName>Garnizov</SurName>
+ <EmailAddress>mailto:ivan.garnizov@fau.de</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml b/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml
index d34e330b..1fd5c498 100644
--- a/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml
@@ -81,13 +81,13 @@
<OrganizationURL xml:lang="en">http://www.a-n.co.uk/about_an/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Jennifer</GivenName>
- <SurName>Picken</SurName>
- <EmailAddress>mailto:jennifer.picken@a-n.co.uk</EmailAddress>
+ <GivenName>Eleonora</GivenName>
+ <SurName>Schinella</SurName>
+ <EmailAddress>mailto:Eleonora.Schinella@a-n.co.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Richard</GivenName>
- <SurName>Padwick</SurName>
- <EmailAddress>mailto:richard.padwick@a-n.co.uk</EmailAddress>
+ <GivenName>Eleonora</GivenName>
+ <SurName>Schinella</SurName>
+ <EmailAddress>mailto:Eleonora.Schinella@a-n.co.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml b/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
index 04e45b4b..5a1535d7 100644
--- a/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
@@ -23,29 +23,27 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEJDCCAwwCAQAwDQYJKoZIhvcNAQEFBQAwgdcxLzAtBgNVBAoUJlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIE1hcmFuaMOjby9VRk1BMTIwMAYDVQQLFClOw7pjbGVv
-IGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvL05USTEcMBoGCSqGSIb3DQEJ
-ARYNcmVkZXNAdWZtYS5icjETMBEGA1UEBxQKU8OjbyBMdcOtczESMBAGA1UECBQJ
-TWFyYW5ow6NvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZt
-YS5icjAeFw0xNDAzMTgxNTI5MTRaFw0xNzAzMTcxNTI5MTRaMIHXMS8wLQYDVQQK
-FCZVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmjDo28vVUZNQTEyMDAGA1UE
-CxQpTsO6Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Ojby9OVEkxHDAa
-BgkqhkiG9w0BCQEWDXJlZGVzQHVmbWEuYnIxEzARBgNVBAcUClPDo28gTHXDrXMx
-EjAQBgNVBAgUCU1hcmFuaMOjbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3BvcnRv
-ZnJhbmNvLnVmbWEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDn
-+fvGMOGQgGgI1pferSixirhZIU56t7zGZuExYh7xj6SpoJJOAKi9ytBC0LXYC8Hj
-2ewc5oYSdqTkp1pIo56yZoeOqxyaXE7oW3qrOYoN+5lcqpzsYlDYvANXPoL4A0Pq
-j5neYufrWnhnDjwcx+Dvsf3eqpc7uMAhqOu0bxhxiUKs+o4VXGl9N72YHyGawRC5
-nEpfbX5kT8kwSxEjLqyevqbIlFVkIo1wFyHBOvy2zyHZTg3ZUPi2royE1EE6S7sW
-A16T+HWBCqVRrWvmW4tota0FAZ6rgyowUrmQabqF/CoRJcOA0BpbPsv2U4ZTV6wW
-c7EJ8R89ba0iyA3Se3tRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJNLZTZn91Wx
-CfYam6xq2A9JnzfL60U3/gsu6tf8Oi6Wpgn1+AXA7Fp4vDKlJGXzxS/jmontDzv3
-P/y18eZOdKcfrUg6EygCFN42Sp7oBzqawCWhJuxoDdBxQXOgW09MLwmzigZ1mTLh
-SS7tAfEZcPLNxBnlu2gyyGTU/tc+RK3eM233qiYsgROUsV8PYaK9AUVYug7xTNms
-xtsGHLRz0ZKG891/D/g5DHMCUekGMfNmH+TmQJZx8eK7kRIVGK1oVj3CMRzHgZQw
-2xytvGMY5mdxYdj8MXhqLRuWXSzLwESsl8rxdYZ8jeUXUniYOqoCuB8IhYSVNgc4
-3Z5X6IYvXaw=
+ MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxMDAuBgNVBAoTJ1VGTUEgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmhhbzEMMAoGA1UECxMDTlRJMSEw
+HwYJKoZIhvcNAQkBFhJkaWVnby5sdWlzQHVmbWEuYnIxETAPBgNVBAcTCFNhbyBM
+dWlzMREwDwYDVQQIEwhNYXJhbmhhbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3Bv
+cnRvZnJhbmNvLnVmbWEuYnIwHhcNMTUxMTA5MjA0MTAyWhcNMTgxMTA4MjA0MTAy
+WjCBtDEwMC4GA1UEChMnVUZNQSAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIE1h
+cmFuaGFvMQwwCgYDVQQLEwNOVEkxITAfBgkqhkiG9w0BCQEWEmRpZWdvLmx1aXNA
+dWZtYS5icjERMA8GA1UEBxMIU2FvIEx1aXMxETAPBgNVBAgTCE1hcmFuaGFvMQsw
+CQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZtYS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ8qhiylWVK+Op8tJPWa5HtGHUwgdTCk
+ihewKun6bvySKb+9A4iMXgYehtIty9lV23IaHlxDKbgGRcXjWInEwextjGToXyZB
+wRz+e4Y2joCVKw/iLOt6r5lKPEENlbYczz0+XfK3egibfibt1EbLr8Yyj/QW/6zY
+y1prsXNwGYe2vFDEMHwcrBr3Z7IpFsJGJ/9xw9UmobmwQhdny2xVq+tmYgWtFDDY
+bkc8FYk/I628ObZuKCOvaakJJkNvoFJkyZDwvOcs0tFL4560nztuRsdglbqjSl8N
+WzQ5JTM/vtIshIkYMBAjuCT5QxGDG3DwnVB0dj85dTibudQlZarD53sCAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEATOK9hSMoC68PEsh4oeG81ZLpp97dwe9yNeuGq4Ly
+lYF2ikH0SIRCnj9GQ2+MyoEzbonA/ludt7ZAJfkKz0Kt+V0OL4NIF1z3D25PDlDb
+eSvL3M2EC8Dn2s7dr+cFvt2KACbRa3yRz3TmBoSHBlX1nUB33jVMIOHyKpLAKyVz
+WskJDJaGkQHHnzgWFBByR/hnx2+78lh0b65fN71yNvIurLmyCU5pPktvBpCIGB6e
+q75Pgfria4aDAF9QLVPkjsGH9v67hyUm6UVG3wWVQIPDr8yPJuyjpBQMsQjh0joV
+KppwAy5eNWAi4mWRFM4cGIz4BEG+BogTKBTVyF1/sNjC6Q==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -68,30 +66,28 @@ xtsGHLRz0ZKG891/D/g5DHMCUekGMfNmH+TmQJZx8eK7kRIVGK1oVj3CMRzHgZQw
<ds:X509Data>
<ds:X509Certificate>
-MIIEJDCCAwwCAQAwDQYJKoZIhvcNAQEFBQAwgdcxLzAtBgNVBAoUJlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIE1hcmFuaMOjby9VRk1BMTIwMAYDVQQLFClOw7pjbGVv
-IGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvL05USTEcMBoGCSqGSIb3DQEJ
-ARYNcmVkZXNAdWZtYS5icjETMBEGA1UEBxQKU8OjbyBMdcOtczESMBAGA1UECBQJ
-TWFyYW5ow6NvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZt
-YS5icjAeFw0xNDAzMTgxNTI5MTRaFw0xNzAzMTcxNTI5MTRaMIHXMS8wLQYDVQQK
-FCZVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmjDo28vVUZNQTEyMDAGA1UE
-CxQpTsO6Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Ojby9OVEkxHDAa
-BgkqhkiG9w0BCQEWDXJlZGVzQHVmbWEuYnIxEzARBgNVBAcUClPDo28gTHXDrXMx
-EjAQBgNVBAgUCU1hcmFuaMOjbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3BvcnRv
-ZnJhbmNvLnVmbWEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDn
-+fvGMOGQgGgI1pferSixirhZIU56t7zGZuExYh7xj6SpoJJOAKi9ytBC0LXYC8Hj
-2ewc5oYSdqTkp1pIo56yZoeOqxyaXE7oW3qrOYoN+5lcqpzsYlDYvANXPoL4A0Pq
-j5neYufrWnhnDjwcx+Dvsf3eqpc7uMAhqOu0bxhxiUKs+o4VXGl9N72YHyGawRC5
-nEpfbX5kT8kwSxEjLqyevqbIlFVkIo1wFyHBOvy2zyHZTg3ZUPi2royE1EE6S7sW
-A16T+HWBCqVRrWvmW4tota0FAZ6rgyowUrmQabqF/CoRJcOA0BpbPsv2U4ZTV6wW
-c7EJ8R89ba0iyA3Se3tRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJNLZTZn91Wx
-CfYam6xq2A9JnzfL60U3/gsu6tf8Oi6Wpgn1+AXA7Fp4vDKlJGXzxS/jmontDzv3
-P/y18eZOdKcfrUg6EygCFN42Sp7oBzqawCWhJuxoDdBxQXOgW09MLwmzigZ1mTLh
-SS7tAfEZcPLNxBnlu2gyyGTU/tc+RK3eM233qiYsgROUsV8PYaK9AUVYug7xTNms
-xtsGHLRz0ZKG891/D/g5DHMCUekGMfNmH+TmQJZx8eK7kRIVGK1oVj3CMRzHgZQw
-2xytvGMY5mdxYdj8MXhqLRuWXSzLwESsl8rxdYZ8jeUXUniYOqoCuB8IhYSVNgc4
-3Z5X6IYvXaw=
-
+MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxMDAuBgNVBAoTJ1VGTUEgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmhhbzEMMAoGA1UECxMDTlRJMSEw
+HwYJKoZIhvcNAQkBFhJkaWVnby5sdWlzQHVmbWEuYnIxETAPBgNVBAcTCFNhbyBM
+dWlzMREwDwYDVQQIEwhNYXJhbmhhbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3Bv
+cnRvZnJhbmNvLnVmbWEuYnIwHhcNMTUxMTA5MjA0MTAyWhcNMTgxMTA4MjA0MTAy
+WjCBtDEwMC4GA1UEChMnVUZNQSAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIE1h
+cmFuaGFvMQwwCgYDVQQLEwNOVEkxITAfBgkqhkiG9w0BCQEWEmRpZWdvLmx1aXNA
+dWZtYS5icjERMA8GA1UEBxMIU2FvIEx1aXMxETAPBgNVBAgTCE1hcmFuaGFvMQsw
+CQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZtYS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ8qhiylWVK+Op8tJPWa5HtGHUwgdTCk
+ihewKun6bvySKb+9A4iMXgYehtIty9lV23IaHlxDKbgGRcXjWInEwextjGToXyZB
+wRz+e4Y2joCVKw/iLOt6r5lKPEENlbYczz0+XfK3egibfibt1EbLr8Yyj/QW/6zY
+y1prsXNwGYe2vFDEMHwcrBr3Z7IpFsJGJ/9xw9UmobmwQhdny2xVq+tmYgWtFDDY
+bkc8FYk/I628ObZuKCOvaakJJkNvoFJkyZDwvOcs0tFL4560nztuRsdglbqjSl8N
+WzQ5JTM/vtIshIkYMBAjuCT5QxGDG3DwnVB0dj85dTibudQlZarD53sCAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEATOK9hSMoC68PEsh4oeG81ZLpp97dwe9yNeuGq4Ly
+lYF2ikH0SIRCnj9GQ2+MyoEzbonA/ludt7ZAJfkKz0Kt+V0OL4NIF1z3D25PDlDb
+eSvL3M2EC8Dn2s7dr+cFvt2KACbRa3yRz3TmBoSHBlX1nUB33jVMIOHyKpLAKyVz
+WskJDJaGkQHHnzgWFBByR/hnx2+78lh0b65fN71yNvIurLmyCU5pPktvBpCIGB6e
+q75Pgfria4aDAF9QLVPkjsGH9v67hyUm6UVG3wWVQIPDr8yPJuyjpBQMsQjh0joV
+KppwAy5eNWAi4mWRFM4cGIz4BEG+BogTKBTVyF1/sNjC6Q==
+
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -110,7 +106,7 @@ xtsGHLRz0ZKG891/D/g5DHMCUekGMfNmH+TmQJZx8eK7kRIVGK1oVj3CMRzHgZQw
<md:OrganizationURL xml:lang="pt-br">http://www.ufma.br/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Roscio Brito</md:SurName>
- <md:EmailAddress>roscio.brito@ufma.br</md:EmailAddress>
+ <md:SurName>Diego Figueiredo</md:SurName>
+ <md:EmailAddress>diego.luis@ufma.br</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml b/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
index b8957a6a..2f3b5980 100644
--- a/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
@@ -96,7 +96,7 @@ v2pL4O5/2DnqrGVffjSIqLB2
<md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Médard Sébastien</md:SurName>
- <md:EmailAddress>sebastien.medard@renater.fr</md:EmailAddress>
+ <md:SurName>Sami Honein</md:SurName>
+ <md:EmailAddress>sami.honein@renater.fr</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml b/swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml
new file mode 100644
index 00000000..9a304afa
--- /dev/null
+++ b/swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://projets-webent.univ-lille1.fr/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-12-13T20:21:34Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+ <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Université of Lille 1 - projets-webent</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="fr">https://projets-webent.univ-lille1.fr/</mdui:InformationURL>
+ <mdui:DisplayName xml:lang="fr">Université de Lille 1 - projets-webent</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Cette plate-forme permet faire de la gestion de projets inter-établissements.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDHjCCAgagAwIBAgIJANuKP33h+ACZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+BAMTHXByb2pldHMtd2ViZW50LnVuaXYtbGlsbGUxLmZyMB4XDTE0MTAzMTIwMTkz
+NloXDTI0MTAyODIwMTkzNlowKDEmMCQGA1UEAxMdcHJvamV0cy13ZWJlbnQudW5p
+di1saWxsZTEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3ahHB
+ITQNVrQ3DtL06800VBbSg5jrG4ZhCayO1dGJKNV4Emt07FVG2Z1zB0hRoVIes8lN
+JYorBcx/Yq58ndOoC2YUXyl5Dw2pFE2D+IeQ8dazLjrP5dgUvgZBn1X8/NYjZR9R
+oWzUDqpBSViMsmV9GdRhL/dQMID2wAG9XnLmv81UZQE55U62o8712yIryrshOUoN
+Nd/NzlHJWD9emh17BSISI8prU6Po+rtJ+dZlydRRNVGNVASMkbj4UvptPcmY6OIQ
+GbHz7cXCjxZuDgdM36SYBz/IWlyg8F5vpv/VbZYTPM0y7ipZDX0H8SbFi+qo+gFd
+2zW8BgCJpRPjWvqTAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXByb2pldHMtd2ViZW50
+LnVuaXYtbGlsbGUxLmZyMB0GA1UdDgQWBBRsXy4YirWGf4b8wtEVd61o5xc0hTAN
+BgkqhkiG9w0BAQUFAAOCAQEAMBFk5MKCWfJpPnVXlabonKnkSeKSHc6zSnoT0yUq
+s73y86na8++jcAzQVUVnyvkmDNRTmdCXqTHrMAZ5uPz8MpTmhk1duJJSI9C/PjJK
+lOe5wvHFaMw0ShsSXCLKLOSfmWwOrikw71G8ErbD5mgF05qu/neiwPsoEtYZes7N
+iHvbEQrYZkHXCJfubSWDTRGW1QN8kbWPQ1B2JplKVlcrB39KzDqnhGQM7xnVJ1op
+J2AcE45AwuM2i0eK9IR+/f4JCJh4R/ikJii2S/HiDn1DZu4M5hexcBxk16tC7nMR
+y2eIDhGMnEJp23NcEvLJPGEHx+9XwZcSkn8aNI8r7LwaXA==
+
+ </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>
+ MIIDHjCCAgagAwIBAgIJANuKP33h+ACZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+BAMTHXByb2pldHMtd2ViZW50LnVuaXYtbGlsbGUxLmZyMB4XDTE0MTAzMTIwMTkz
+NloXDTI0MTAyODIwMTkzNlowKDEmMCQGA1UEAxMdcHJvamV0cy13ZWJlbnQudW5p
+di1saWxsZTEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3ahHB
+ITQNVrQ3DtL06800VBbSg5jrG4ZhCayO1dGJKNV4Emt07FVG2Z1zB0hRoVIes8lN
+JYorBcx/Yq58ndOoC2YUXyl5Dw2pFE2D+IeQ8dazLjrP5dgUvgZBn1X8/NYjZR9R
+oWzUDqpBSViMsmV9GdRhL/dQMID2wAG9XnLmv81UZQE55U62o8712yIryrshOUoN
+Nd/NzlHJWD9emh17BSISI8prU6Po+rtJ+dZlydRRNVGNVASMkbj4UvptPcmY6OIQ
+GbHz7cXCjxZuDgdM36SYBz/IWlyg8F5vpv/VbZYTPM0y7ipZDX0H8SbFi+qo+gFd
+2zW8BgCJpRPjWvqTAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXByb2pldHMtd2ViZW50
+LnVuaXYtbGlsbGUxLmZyMB0GA1UdDgQWBBRsXy4YirWGf4b8wtEVd61o5xc0hTAN
+BgkqhkiG9w0BAQUFAAOCAQEAMBFk5MKCWfJpPnVXlabonKnkSeKSHc6zSnoT0yUq
+s73y86na8++jcAzQVUVnyvkmDNRTmdCXqTHrMAZ5uPz8MpTmhk1duJJSI9C/PjJK
+lOe5wvHFaMw0ShsSXCLKLOSfmWwOrikw71G8ErbD5mgF05qu/neiwPsoEtYZes7N
+iHvbEQrYZkHXCJfubSWDTRGW1QN8kbWPQ1B2JplKVlcrB39KzDqnhGQM7xnVJ1op
+J2AcE45AwuM2i0eK9IR+/f4JCJh4R/ikJii2S/HiDn1DZu4M5hexcBxk16tC7nMR
+y2eIDhGMnEJp23NcEvLJPGEHx+9XwZcSkn8aNI8r7LwaXA==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://projets-webent.univ-lille1.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://projets-webent.univ-lille1.fr/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="fr">Université de Lille 1 - projets-webent</md:ServiceName>
+ <md:ServiceName xml:lang="en">Université of Lille 1 - projets-webent</md:ServiceName>
+ <md:ServiceDescription xml:lang="fr">Cette plate-forme permet faire de la gestion de projets inter-établissements.</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" 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é des Sciences Techniques de Lille 1</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>WALLON Ines</md:SurName>
+ <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml
index add4dbf6..944c26c0 100644
--- a/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml
@@ -2,6 +2,10 @@
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://randevu.lab.vvc.niif.hu/shibboleth">
<md:Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>href</saml:AttributeValue>
<saml:AttributeValue>href-edugain</saml:AttributeValue>
@@ -20,6 +24,7 @@
<mdui:Description xml:lang="en">Jitsi-meet</mdui:Description>
<mdui:InformationURL xml:lang="hu">https://randevu.lab.vvc.niif.hu</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="hu">https://randevu.lab.vvc.niif.hu/privacy.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://randevu.lab.vvc.niif.hu/privacy.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -30,10 +35,10 @@
<ds:KeyName>randevu.lab.vvc.niif.hu</ds:KeyName>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/POST"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/Artifact"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/POST"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/ECP" index="3"/>
diff --git a/swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml
new file mode 100644
index 00000000..85590597
--- /dev/null
+++ b/swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rcafe01s.inmetro.gov.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inmetro.gov.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:Description>
+ <mdui:Description xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.inmetro.gov.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.inmetro.gov.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDZjCCAk4CAQAwDQYJKoZIhvcNAQEFBQAweTEOMAwGA1UEChMFQUJSRVYxDjAM
+BgNVBAsTBUFCUkVWMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEPMA0GA1UECBMG
+QnJhc2lsMQswCQYDVQQGEwJCUjEgMB4GA1UEAxMXcmNhZmUwMXMuaW5tZXRyby5n
+b3YuYnIwHhcNMTUwNjI2MTkzNDU1WhcNMTgwNjI1MTkzNDU1WjB5MQ4wDAYDVQQK
+EwVBQlJFVjEOMAwGA1UECxMFQUJSRVYxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJv
+MQ8wDQYDVQQIEwZCcmFzaWwxCzAJBgNVBAYTAkJSMSAwHgYDVQQDExdyY2FmZTAx
+cy5pbm1ldHJvLmdvdi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN972dKeEYk5VuNNf6hN89M2bKgtWi7U8DWhPlS56DExdeI1F8bm2di7G/xhV7wR
+mecGFFeNqp1NgVDo7b9/+QjdBWKBEkhwXJ87KlPp4XSOLLiwsa1SaGbg6550bWWx
+OROhpokqeVBs5V/BjYsSdiX1/H+7mgu5ReLyci+LDYxlJf1fcu5vXLoCvuT0gaKD
+GNig6MWo5R2WSS7xMNuMcvo5Yls++tDGnLndvJPQN17shRwDqavYwGk6Ibw0RVBD
+0af2mmZc/gtlFIiSvhxZ1BxUGBMGk/eMwArdxe+nlSAYwEwhTgzA35c5QAlHbO44
+HIaocNjEOspYssy2NtBPbFcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAawtjlVTA
+lOtQ7VmcGeqc3rRcjUNAQqYcqtgsJBkkYPhreNZAXHARnNQTcQ/0V5VyIHr7B+cg
+HZW7IOrz+hTfApHx/DA4qB6FKZJtLmf27VstlMRlqZlIuiHmOpqz6x2dkz5248CV
+ayM+EzuUquRiyGFPQlGSd8CW2qJLrRR64PGvf/k+ciRyP3EY4LxTrgDYRgyEy1W4
+chSF0Vug5F1YTTmJka1DT7l7IjWHeH7AT/rWqjTnWzCkc3PvvK1hWQUXlKaIoKVF
+yUIWfdWTP1qbpv2/D1hS9Ye/4vokTjCzku85qQDYQRzH4NT+GofYlcaQ2FuJRXZk
+czNaGjGLlb2Y0Q==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rcafe01s.inmetro.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rcafe01s.inmetro.gov.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rcafe01s.inmetro.gov.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rcafe01s.inmetro.gov.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inmetro.gov.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIDZjCCAk4CAQAwDQYJKoZIhvcNAQEFBQAweTEOMAwGA1UEChMFQUJSRVYxDjAM
+BgNVBAsTBUFCUkVWMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEPMA0GA1UECBMG
+QnJhc2lsMQswCQYDVQQGEwJCUjEgMB4GA1UEAxMXcmNhZmUwMXMuaW5tZXRyby5n
+b3YuYnIwHhcNMTUwNjI2MTkzNDU1WhcNMTgwNjI1MTkzNDU1WjB5MQ4wDAYDVQQK
+EwVBQlJFVjEOMAwGA1UECxMFQUJSRVYxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJv
+MQ8wDQYDVQQIEwZCcmFzaWwxCzAJBgNVBAYTAkJSMSAwHgYDVQQDExdyY2FmZTAx
+cy5pbm1ldHJvLmdvdi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN972dKeEYk5VuNNf6hN89M2bKgtWi7U8DWhPlS56DExdeI1F8bm2di7G/xhV7wR
+mecGFFeNqp1NgVDo7b9/+QjdBWKBEkhwXJ87KlPp4XSOLLiwsa1SaGbg6550bWWx
+OROhpokqeVBs5V/BjYsSdiX1/H+7mgu5ReLyci+LDYxlJf1fcu5vXLoCvuT0gaKD
+GNig6MWo5R2WSS7xMNuMcvo5Yls++tDGnLndvJPQN17shRwDqavYwGk6Ibw0RVBD
+0af2mmZc/gtlFIiSvhxZ1BxUGBMGk/eMwArdxe+nlSAYwEwhTgzA35c5QAlHbO44
+HIaocNjEOspYssy2NtBPbFcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAawtjlVTA
+lOtQ7VmcGeqc3rRcjUNAQqYcqtgsJBkkYPhreNZAXHARnNQTcQ/0V5VyIHr7B+cg
+HZW7IOrz+hTfApHx/DA4qB6FKZJtLmf27VstlMRlqZlIuiHmOpqz6x2dkz5248CV
+ayM+EzuUquRiyGFPQlGSd8CW2qJLrRR64PGvf/k+ciRyP3EY4LxTrgDYRgyEy1W4
+chSF0Vug5F1YTTmJka1DT7l7IjWHeH7AT/rWqjTnWzCkc3PvvK1hWQUXlKaIoKVF
+yUIWfdWTP1qbpv2/D1hS9Ye/4vokTjCzku85qQDYQRzH4NT+GofYlcaQ2FuJRXZk
+czNaGjGLlb2Y0Q==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.inmetro.gov.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.inmetro.gov.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Fabio Fischer Barros</md:SurName>
+ <md:EmailAddress>ffbarros@inmetro.gov.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml b/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml
index 0037fe47..4f8b5a2c 100644
--- a/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml
@@ -85,8 +85,8 @@ zj16Ew8OQzC0oKfgorVh3LhhSqykgsmo4gLR6t3EKTtjWjjZ+tP9pVaN6vINj4lw
<md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Franck Rupin</md:SurName>
- <md:EmailAddress>franck.rupin@renater.fr</md:EmailAddress>
+ <md:SurName>Sami Honein</md:SurName>
+ <md:EmailAddress>sami.honein@renater.fr</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:SurName>Pawel Domas</md:SurName>
diff --git a/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml b/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml
new file mode 100644
index 00000000..2d15dde1
--- /dev/null
+++ b/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repo.clarino.uib.no/shibboleth/sp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-11-19T14:56:48Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol 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://repo.clarino.uib.no/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">CLARINO Bergen Langzeitarchiv</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">CLARINO Bergen Repository</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</mdui:Description>
+ <mdui:Description xml:lang="en">The CLARINO Bergen Repository for language resources at the University of Bergen</mdui:Description>
+ <mdui:Logo height="16" width="16">https://repo.clarino.uib.no/xmlui/themes/CLARINO/images/favicon.ico</mdui:Logo>
+ <mdui:Logo height="64" width="180">https://clarino.uib.no/images/clarino_duo-180.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">https://repo.clarino.uib.no/xmlui/page/about</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://repo.clarino.uib.no/xmlui/privacypolicy.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>repo.clarino.uib.no</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=repo.clarino.uib.no</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAP5/Ri7rxa/LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3JlcG8uY2xhcmluby51aWIubm8wHhcNMTQxMjE4MDkwNTE1WhcNMjQxMjE1
+MDkwNTE1WjAeMRwwGgYDVQQDExNyZXBvLmNsYXJpbm8udWliLm5vMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2OVEwzYCig35Ii37Buky/t7KWlNUEkGP
+E2WbfBiSPM2Iw+FIYGrpZ8KIt6qloN19vKwy8m53Asbba477R8CEx0zNQEHPfq35
+vPDxDj2xLN+xvRuk6s6KbZ2eKvV6Vov2vDtOt7kw8gDFUOJd+SdOe+ROdiuV/DbO
+jpwsW68GdDpLWHmKSqXqk8fwCdoc0Imwic5sSfc2LPjAqu95aIb7CiAh8sOg26XK
+ik6Fjibj48l3aVxtIMGJf30JtS1SqnKgqmQoO6opBGnaCF4huNa44JYUSF5CQZ3c
+4nRxupv2tp696H7lLH3XOI81dsrAVXEwt1q2D8FzNlT+U0AeFaRhbwIDAQABo0Ew
+PzAeBgNVHREEFzAVghNyZXBvLmNsYXJpbm8udWliLm5vMB0GA1UdDgQWBBQaN4I1
+A6h9Jlo90nhGCWfw3EpT4jANBgkqhkiG9w0BAQUFAAOCAQEADsJ1zgUqZqgnq4gU
+z/z3N+5bieEYEZUJnaQ78a3erdYYLETE/PBrN0QUIGR3M2DhjCi0s00QuVFa1JqX
+IK3dR4ndo5Yv4hV/fVhDIZ4mVIUQPBcTRk1om9/gl1fdmRD+YpvhUSzvheLRBsQO
+yz2syxGRIPwu6LexWb8YbZtcvtWU4ZGwm91KXDerV8J05m4X5rv4HZi0MAS349Vz
+tNRgm6CrMBfiQUxQw5Gqsiuyf3rpzQLslEWEmP4AuoiUvlXiWqW+fDKhDhj2vlc8
+0jOCrQaG00xvCbXSg91K+Xxj1kXjArfX4R7aB1TquBqLoFbPo0lNooYBECv+bN2q
+rYzidg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/Artifact"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="de">CLARINO Bergen Langzeitarchiv</md:ServiceName>
+ <md:ServiceName xml:lang="en">CLARINO Bergen Repository</md:ServiceName>
+ <md:ServiceDescription xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">The CLARINO Bergen Repository for language resources at the University of Bergen</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md: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="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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Oyvind Liland</md:GivenName>
+ <md:SurName>Gjesdal</md:SurName>
+ <md:EmailAddress>mailto:oyvind.gjesdal@uib.no</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Koenraad</md:GivenName>
+ <md:SurName>de Smedt</md:SurName>
+ <md:EmailAddress>mailto:clarino@uib.no</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Hemed</md:GivenName>
+ <md:SurName>Al Ruwehy</md:SurName>
+ <md:EmailAddress>mailto:hemed.ruwehy@uib.no</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml
index 04f46ac3..112a01eb 100644
--- a/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ricevi.ct.infn.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ricevi.ct.infn.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-03T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
diff --git a/swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.xml
new file mode 100644
index 00000000..addfa75a
--- /dev/null
+++ b/swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rns.aai.niif.hu/shibboleth">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </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="hu">SP for eduGAIN attribute release checker - r&amp;s</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</mdui:DisplayName>
+ <mdui:Description xml:lang="hu">SP for eduGAIN attribute release checker - r&amp;s</mdui:Description>
+ <mdui:Description xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</mdui:Description>
+ <mdui:InformationURL xml:lang="hu">https://earc.eduid.hu/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://earc.eduid.hu/privacy</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIICvzCCAiigAwIBAgIJAKmmMNNLfw5PMA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odTAeFw0xNTExMDMxOTA4MjBaFw0yNTEwMzExOTA4MjBaMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxTKyp+PbB4vBlzgPVQsBETA/x+dyTLXqt9F34ujVMj8pHwwyLYBSguTi+sKHBZ4gkeW93BIWAJhX+e1er6oHcjlnwgqEGWOmX+oWKjfqJb7sqlnKTKrBUMTwGsdciXk1QIAXsvEYOJ1Ais8YavgrVqZYkn2tOfAFbNXdmOJTgFkCAwEAAaOBrDCBqTAdBgNVHQ4EFgQUalaXcVa41eu3N4yq1cu/p1yQCM0wegYDVR0jBHMwcYAUalaXcVa41eu3N4yq1cu/p1yQCM2hTqRMMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odYIJAKmmMNNLfw5PMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMHBYCNkUPAf1R14pd2fiOHyTs84ejnGAKghumXqVffUO3AxERutI8AZtaH6ZSt5cfcsGqb+KsHbAb38JrRlrxGr0wxbuTr7gpwessPvECxWGUj6kkKOnQg35Xyd5EQzhsKrjUL2EC7OM5bMwok9TeUkDta4frQW8/RGZIYJq5aQ=</ds:X509Certificate>
+ </ds:X509Data>
+ <ds:KeyName>rns.aai.niif.hu</ds:KeyName>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/Artifact"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/POST"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="hu">SP for eduGAIN attribute release checker - r&amp;s</md:ServiceName>
+ <md:ServiceName xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:SurName>NIIFI AAI</md:SurName>
+ <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml b/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
index 393df42d..435685f8 100644
--- a/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
@@ -11,10 +11,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">impa.br</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:DisplayName>
- <mdui:Description xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:Description>
- <mdui:Description xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:Description>
+ <mdui:DisplayName xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.impa.br/</mdui:InformationURL>
<mdui:InformationURL xml:lang="pt-br">http://www.impa.br/</mdui:InformationURL>
</mdui:UIInfo>
@@ -94,10 +94,10 @@ qwTl09UClG9hVUE5fDKSwyKE6DCq8Whg3Zb1EdVjTOncky3d7DkzttgD8YDqmA==
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.impa.br/</md:OrganizationURL>
<md:OrganizationURL xml:lang="pt-br">http://www.impa.br/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml b/swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml
index d29dded3..e9dd4e62 100644
--- a/swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml
@@ -15,8 +15,8 @@
<mdui:DisplayName xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:DisplayName>
<mdui:Description xml:lang="en">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:Description>
<mdui:Description xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.ipen.br</mdui:InformationURL>
- <mdui:InformationURL xml:lang="pt-br">http://www.ipen.br</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.ipen.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ipen.br/</mdui:InformationURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -104,8 +104,8 @@ Ma65UunXAIA=
<md:OrganizationName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ipen.br</md:OrganizationURL>
- <md:OrganizationURL xml:lang="pt-br">http://www.ipen.br</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.ipen.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.ipen.br/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
<md:SurName>Dorival A. Nunes</md:SurName>
diff --git a/swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml
index 2e7fd4b9..92386638 100644
--- a/swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">The Hague University</mdui:DisplayName>
<mdui:Description xml:lang="nl">Haagse Hogeschool</mdui:Description>
<mdui:Description xml:lang="en">Haagse Hogeschool</mdui:Description>
- <mdui:Logo height="22" width="108">https://static.surfconext.nl/media/idp/hhs.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Haagse Hogeschool HHS Hague</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Haagse Hogeschool HHS Hague</mdui:Keywords>
+ <mdui:Logo height="22" width="108">https://static.surfconext.nl/logos/idp/hhs.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Haagse Hogeschool hhs Hague</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">Haagse Hogeschool hhs Hague</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml
index 4ad81212..d7bc2309 100644
--- a/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -4,11 +4,6 @@
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
</md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
@@ -130,19 +125,19 @@ x7JUFw==</ds:X509Certificate>
<md:ContactPerson contactType="administrative">
<md:Company>KTH Royal Institute of Technology</md:Company>
<md:SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</md:SurName>
- <md:EmailAddress>ita-infra-saml-contact@kth.se</md:EmailAddress>
+ <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>KTH Royal Institute of Technology</md:Company>
<md:SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</md:SurName>
- <md:EmailAddress>ita-infra-saml-contact@kth.se</md:EmailAddress>
+ <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>KTH Royal Institute of Technology</md:Company>
<md:SurName>KTH IT-Support</md:SurName>
- <md:EmailAddress>it-support@kth.se</md:EmailAddress>
+ <md:EmailAddress>mailto:it-support@kth.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 790 6600</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml
index c8c5085d..eb19f80b 100644
--- a/swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Tilburg University</mdui:DisplayName>
<mdui:Description xml:lang="nl">Universiteit van Tilburg</mdui:Description>
<mdui:Description xml:lang="en">Tilburg University</mdui:Description>
- <mdui:Logo height="44" width="108">https://static.surfconext.nl/media/idp/uvt.png</mdui:Logo>
+ <mdui:Logo height="44" width="108">https://static.surfconext.nl/logos/idp/uvt.png</mdui:Logo>
<mdui:Keywords xml:lang="en">universiteit tilburg van university uvt tiu kub kht tias nimbas tiasnimbas</mdui:Keywords>
<mdui:Keywords xml:lang="nl">universiteit tilburg van university uvt tiu kub kht tias nimbas tiasnimbas</mdui:Keywords>
</mdui:UIInfo>
@@ -31,7 +31,7 @@
<md:Organization>
<md:OrganizationName xml:lang="en">Tilburg University</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Tilburg University</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.tilburguniversity.edu/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">https://www.tilburguniversity.edu</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="administrative">
<md:GivenName>SURFconext support</md:GivenName>
diff --git a/swamid-interfederations-2.0/sarvik.taat.edu.ee-module.php-saml-sp-metadata.php-TAAT.xml b/swamid-interfederations-2.0/sarvik.taat.edu.ee-module.php-saml-sp-metadata.php-TAAT.xml
index 0a83f35e..595056af 100644
--- a/swamid-interfederations-2.0/sarvik.taat.edu.ee-module.php-saml-sp-metadata.php-TAAT.xml
+++ b/swamid-interfederations-2.0/sarvik.taat.edu.ee-module.php-saml-sp-metadata.php-TAAT.xml
@@ -3,10 +3,9 @@
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
<mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
- <mdrpi:RegistrationPolicy xml:lang="et">http://taat.edu.ee/main/dokumendid</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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -28,7 +27,8 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sarvik.taat.edu.ee/module.php/saml/sp/saml1-acs.php/TAAT/artifact" index="3"/>
</md:SPSSODescriptor>
<md:ContactPerson contactType="technical">
- <md:GivenName>Administrator</md:GivenName>
+ <md:GivenName>TAAT</md:GivenName>
+ <md:SurName>Operations</md:SurName>
<md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..43c751de
--- /dev/null
+++ b/swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sb.nemji.cz/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-11-03T10:24:02Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://eduid.cz/uri/idp-group/hospital</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nemji.cz</shibmd:Scope>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Hospital Jihlava</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Nemocnice Jihlava, p.o.</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for staff of Hospital Jihlava</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance Nemocnice Jihlava, p.o.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.nemji.cz/en/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://www.nemji.cz</mdui:InformationURL>
+ <mdui:Logo height="100" width="92">https://sb.nemji.cz/idp/images/logo_nemji.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAKZp9gwp4ueLeX2+eB2CvUUrnDkkMA0GCSqGSIb3DQEB
+CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1N1oXDTM1
+MDkyODIwMjY1N1owFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCxEbAEO17PWjk7G9OzJCz6FoEyGF6wdBerSeHS
+oX+Seoj79HKldam3D1FaWfyvrbSATJtgdBeVkGKAL/YQ/I6t6W7XSkFsOfuJBPLu
+StWLVCIIJokaeNUMf1Hvj/C1vbl0X7ooRtR9Bw37BEAMY2Z4iEf1Os72q5RMpheG
+vSWHewbobbz9jJ8ztjvaoODvzC8QsldWA6WaFz71uvFTDQbT2CrmTKB59vPCpMAO
+O2UllJeZYm6XfCWQKc4yswfKUz7T+LsuN3rNXIVNAbInPtguqKzThzLmrXRdEVwK
+lezivULBZcl6F3y7VT9bUCEwmAmxPdtlcfpCfKgMwyR/koPZAgMBAAGjXTBbMB0G
+A1UdDgQWBBQWvRy9bMJ66wgZUWbx7GkUHDxZ6zA6BgNVHREEMzAxggtzYi5uZW1q
+aS5jeoYiaHR0cHM6Ly9zYi5uZW1qaS5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAQEALC7n4vEu4XHlUdwts5szUfOXRv9J1cBRfFfkhv4XZpmaK6sj
+y4ATddyBMH7qRkuIQtpgSNuUFXaeDPYaWl14S8UcDXvPJRiuESFcNAVwfhA50BYo
+WhSRu859mA8oiDf+vS8w5MsSFp0ypBRAfc7gDZlHNxSb0JjL8rDv2lb/xtyIcBeP
+xRTQTJkWnQl6/yFldSIS1vjyq4gRDeSAbEamdB9kZYXpso/6+Xci56RGkF2jqhYG
+jBnhOQm9pZ5ExPvfJg8t0uM2JkUPFWXPemvekrOsruK03/aI5fSi1xpDPXagFeTX
+duJQgq77OjeYG4HDOE+/Q1Mc78ihrQGiMt1mQA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAKPyelTVA+LxLwVx00WMBX1JLVLrMA0GCSqGSIb3DQEB
+CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1NloXDTM1
+MDkyODIwMjY1NlowFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC/boFss3wDxrlwMYgyZqe4vaMxxCzlIbHFRMTI
+F5V3x4aPqwmEzPlgI5DwrMZCPZRMllzL15yjKx3aKbPSuwUjVBeS1licKD3TUqeQ
+OOeihaGQB5LMfB+pUeknOp5IDQqSc0FhRD9RBd0HQ0RQmrguzfmvFQUgnJSivwG4
+QxdVBTOoAtjlmEDC6eI01cRlRnw/NgsHj+P3r2123O7G9FQEzuu61BVU7RBBPzbm
+jVW+o3SbgAJn8Sk5mOVKTpqq0LP4XADpL26U08wMUTri7wO27qkRH3ARda55ubhV
+ybexhPPFFHz3FXAr56xgaQbr+p66ktvdJ4u/h4M/7qfd58tnAgMBAAGjXTBbMB0G
+A1UdDgQWBBST/dnWs3qZybPk3IUtEIfUujodWzA6BgNVHREEMzAxggtzYi5uZW1q
+aS5jeoYiaHR0cHM6Ly9zYi5uZW1qaS5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAQEAYNb4VPXPlVhJVygSeVl3D2cc413M5icp+1y3tL7VTcRKp0/B
+8c5j1iJR9QcnEUZwe7zrAaXT18BNNb1DMZT470BEhYNfO13tqJMA5/07gzUN/cOH
+5FkT+/cUCDXYTVS2GCnGmeOPNgzbuF/oUEQEcsyZ2Lg6TFWcQ6SoCyQpzCiruGuW
+XtGqoecT2BBbSIpCBnIeffIW4Lri+DSVxE1zDpnbE80VcAF+A5TP2qRNN+KHMbro
+mbbg8OPDJqbEV4TpRiTv1dMW/7Bl3gwslK+RRYC612P8EZxFnjsLBkVzmWXv/Uje
+/5e/14K2hCSYVIQY8/gqbfJYMErJJ8XsW+0SqQ==
+ </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>
+MIIDFzCCAf+gAwIBAgIUVFD+QoaYzxD5W4xBkA9MJtVvnREwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLc2IubmVtamkuY3owHhcNMTUwOTI4MjAyNjU2WhcNMzUw
+OTI4MjAyNjU2WjAWMRQwEgYDVQQDDAtzYi5uZW1qaS5jejCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAIGmupHI9HsQgayLrbTRTrbEDGZDVHQ0ruefPbhJ
+rTDVcg+30Y31w01s+pkE8JgQY8pY2I2vHpWc15aiqc8bOkPLv8aRO/d4AzJcipY8
+2A9SKeAgQwDldUj2l4d05JjxS81ZTRO4Zz8/CVsn5u2HBoX4DXexiXcnmiuZayET
+K0RJ3pt20tOITKecV5l7nZqPifkflLg+v0g0KsJLVIb4u1UyJcGNX0Y9G622Xoe0
+UP3ffB376fPXKxeDJTl6HQCT/cauTUnWcOKDWsExF0pMO4b3JAmZub+03EgwgXrr
+TxBmw9ngbPimD5NFppaMKqygXJ/nYB7NXdMFPPsihYPevGkCAwEAAaNdMFswHQYD
+VR0OBBYEFKxXcto1nYeWQ4ghK/SWd20gxuBkMDoGA1UdEQQzMDGCC3NiLm5lbWpp
+LmN6hiJodHRwczovL3NiLm5lbWppLmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQARxvTSjMwUgaX7z0uKrsYykwoXW6ZHLQAooYsTZrRoFR4s8DY5
+u5WbcM8jkFdqxbvDBdkZ//5XQyf45X7t9m3gFzojvNwu5Ms6AzOwNDLKEqFIn2gO
+b0J0ahHtxEvwZ5OO5C+U/A5y56D9VpGkvdKyW102m+pTGuBI1PChyXqtbZOPW2oe
+GS4qzsVOlYnXW8FZgftgaPqNwu/+EtSlkRtvYQdNSjs6oVXnHgO+5JYTMDgvf0xS
+Pq2qFEC0TqaooIgKbPI9IKAg7WhwSuakyV2FIRtLpbRSZfcwSmzWnYcsmkxTGVnI
+gP5HZMJJz+FjDqHEOLAg0b82EJgLbqzVuBXy
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sb.nemji.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sb.nemji.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sb.nemji.cz/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sb.nemji.cz/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sb.nemji.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sb.nemji.cz/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nemji.cz</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAKZp9gwp4ueLeX2+eB2CvUUrnDkkMA0GCSqGSIb3DQEB
+CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1N1oXDTM1
+MDkyODIwMjY1N1owFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCxEbAEO17PWjk7G9OzJCz6FoEyGF6wdBerSeHS
+oX+Seoj79HKldam3D1FaWfyvrbSATJtgdBeVkGKAL/YQ/I6t6W7XSkFsOfuJBPLu
+StWLVCIIJokaeNUMf1Hvj/C1vbl0X7ooRtR9Bw37BEAMY2Z4iEf1Os72q5RMpheG
+vSWHewbobbz9jJ8ztjvaoODvzC8QsldWA6WaFz71uvFTDQbT2CrmTKB59vPCpMAO
+O2UllJeZYm6XfCWQKc4yswfKUz7T+LsuN3rNXIVNAbInPtguqKzThzLmrXRdEVwK
+lezivULBZcl6F3y7VT9bUCEwmAmxPdtlcfpCfKgMwyR/koPZAgMBAAGjXTBbMB0G
+A1UdDgQWBBQWvRy9bMJ66wgZUWbx7GkUHDxZ6zA6BgNVHREEMzAxggtzYi5uZW1q
+aS5jeoYiaHR0cHM6Ly9zYi5uZW1qaS5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAQEALC7n4vEu4XHlUdwts5szUfOXRv9J1cBRfFfkhv4XZpmaK6sj
+y4ATddyBMH7qRkuIQtpgSNuUFXaeDPYaWl14S8UcDXvPJRiuESFcNAVwfhA50BYo
+WhSRu859mA8oiDf+vS8w5MsSFp0ypBRAfc7gDZlHNxSb0JjL8rDv2lb/xtyIcBeP
+xRTQTJkWnQl6/yFldSIS1vjyq4gRDeSAbEamdB9kZYXpso/6+Xci56RGkF2jqhYG
+jBnhOQm9pZ5ExPvfJg8t0uM2JkUPFWXPemvekrOsruK03/aI5fSi1xpDPXagFeTX
+duJQgq77OjeYG4HDOE+/Q1Mc78ihrQGiMt1mQA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAKPyelTVA+LxLwVx00WMBX1JLVLrMA0GCSqGSIb3DQEB
+CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1NloXDTM1
+MDkyODIwMjY1NlowFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC/boFss3wDxrlwMYgyZqe4vaMxxCzlIbHFRMTI
+F5V3x4aPqwmEzPlgI5DwrMZCPZRMllzL15yjKx3aKbPSuwUjVBeS1licKD3TUqeQ
+OOeihaGQB5LMfB+pUeknOp5IDQqSc0FhRD9RBd0HQ0RQmrguzfmvFQUgnJSivwG4
+QxdVBTOoAtjlmEDC6eI01cRlRnw/NgsHj+P3r2123O7G9FQEzuu61BVU7RBBPzbm
+jVW+o3SbgAJn8Sk5mOVKTpqq0LP4XADpL26U08wMUTri7wO27qkRH3ARda55ubhV
+ybexhPPFFHz3FXAr56xgaQbr+p66ktvdJ4u/h4M/7qfd58tnAgMBAAGjXTBbMB0G
+A1UdDgQWBBST/dnWs3qZybPk3IUtEIfUujodWzA6BgNVHREEMzAxggtzYi5uZW1q
+aS5jeoYiaHR0cHM6Ly9zYi5uZW1qaS5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAQEAYNb4VPXPlVhJVygSeVl3D2cc413M5icp+1y3tL7VTcRKp0/B
+8c5j1iJR9QcnEUZwe7zrAaXT18BNNb1DMZT470BEhYNfO13tqJMA5/07gzUN/cOH
+5FkT+/cUCDXYTVS2GCnGmeOPNgzbuF/oUEQEcsyZ2Lg6TFWcQ6SoCyQpzCiruGuW
+XtGqoecT2BBbSIpCBnIeffIW4Lri+DSVxE1zDpnbE80VcAF+A5TP2qRNN+KHMbro
+mbbg8OPDJqbEV4TpRiTv1dMW/7Bl3gwslK+RRYC612P8EZxFnjsLBkVzmWXv/Uje
+/5e/14K2hCSYVIQY8/gqbfJYMErJJ8XsW+0SqQ==
+ </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>
+MIIDFzCCAf+gAwIBAgIUVFD+QoaYzxD5W4xBkA9MJtVvnREwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLc2IubmVtamkuY3owHhcNMTUwOTI4MjAyNjU2WhcNMzUw
+OTI4MjAyNjU2WjAWMRQwEgYDVQQDDAtzYi5uZW1qaS5jejCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAIGmupHI9HsQgayLrbTRTrbEDGZDVHQ0ruefPbhJ
+rTDVcg+30Y31w01s+pkE8JgQY8pY2I2vHpWc15aiqc8bOkPLv8aRO/d4AzJcipY8
+2A9SKeAgQwDldUj2l4d05JjxS81ZTRO4Zz8/CVsn5u2HBoX4DXexiXcnmiuZayET
+K0RJ3pt20tOITKecV5l7nZqPifkflLg+v0g0KsJLVIb4u1UyJcGNX0Y9G622Xoe0
+UP3ffB376fPXKxeDJTl6HQCT/cauTUnWcOKDWsExF0pMO4b3JAmZub+03EgwgXrr
+TxBmw9ngbPimD5NFppaMKqygXJ/nYB7NXdMFPPsihYPevGkCAwEAAaNdMFswHQYD
+VR0OBBYEFKxXcto1nYeWQ4ghK/SWd20gxuBkMDoGA1UdEQQzMDGCC3NiLm5lbWpp
+LmN6hiJodHRwczovL3NiLm5lbWppLmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQARxvTSjMwUgaX7z0uKrsYykwoXW6ZHLQAooYsTZrRoFR4s8DY5
+u5WbcM8jkFdqxbvDBdkZ//5XQyf45X7t9m3gFzojvNwu5Ms6AzOwNDLKEqFIn2gO
+b0J0ahHtxEvwZ5OO5C+U/A5y56D9VpGkvdKyW102m+pTGuBI1PChyXqtbZOPW2oe
+GS4qzsVOlYnXW8FZgftgaPqNwu/+EtSlkRtvYQdNSjs6oVXnHgO+5JYTMDgvf0xS
+Pq2qFEC0TqaooIgKbPI9IKAg7WhwSuakyV2FIRtLpbRSZfcwSmzWnYcsmkxTGVnI
+gP5HZMJJz+FjDqHEOLAg0b82EJgLbqzVuBXy
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sb.nemji.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sb.nemji.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="cs">Nemocnice Jihlava, p.o.</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Hospital Jihlava</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="cs">Nemocnice Jihlava, p.o.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Hospital Jihlava</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.nemji.cz/en/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://www.nemji.cz/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Petr</md:GivenName>
+ <md:SurName>Málek</md:SurName>
+ <md:EmailAddress>malekp@nemji.cz</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml b/swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml
new file mode 100644
index 00000000..6d93c4cb
--- /dev/null
+++ b/swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sci-ware-customer.com/swldev/shibboleth">
+ <!--
+ This is a "Science Warehouse SwlDev" Shibboleth SP for Science Warehouse Limited.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-05T10:52:13Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC9zCCAd+gAwIBAgIJAPftzawoE6U+MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+ BAMTEGlwLTEwLTk1LTE0Mi0xNDUwHhcNMTUxMTAzMTcyNzM1WhcNMjUxMDMxMTcy
+ NzM1WjAbMRkwFwYDVQQDExBpcC0xMC05NS0xNDItMTQ1MIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEAt9QCuEdzCjpBx2LtXLKhEWsjsBrd/4Uxkeh1/o6d
+ IPPJZHrPMhaSb3TXfWqZhNNQEomI5rPd7LTNVgcGxAG9DVU3RBZc2TqaZgvP18xh
+ IxF8SZk7tuR+HarVUXZMZJgf/yprQS8db4LCliqh1RPce5KylslsXktyjpg5AEwA
+ qCd+8dC3+qw54WAG/pj28qbXNqwUm9BHWI50JN/HmhcvJgLKofbhwoJoGUPbO21e
+ yFpGe1nQ91wLR8uLkzMb+LhFXwBNTpQ0AIIcIZ7ce6WirYRWSUrdNbWZ/nvSjq8f
+ NwAmUrfSXOzSjdQQa8M1nwBZ3uCATyE6S/eTU0TEFXgD4QIDAQABoz4wPDAbBgNV
+ HREEFDASghBpcC0xMC05NS0xNDItMTQ1MB0GA1UdDgQWBBSOvn0o+/xiKTdakpuz
+ sxefHX8ufTANBgkqhkiG9w0BAQUFAAOCAQEAIj+36LqW5NZsoBDUVA7L0/U3XTS3
+ N36rYaoT8ibqj7Ol43DYC+kREavEEYF8NAPiNp06MhcZ5+NLpT0Z+lrNeLYyFN38
+ M9HxcgrQV6syB3l09nUJaTCl4G1izUVAA0dVKWjI6qIOqrpMp2PcE181Z25lSl9b
+ WEz45qKTxs3bvMp+hgi9WVwQX8kWvzKA3CGqCwFgcZSi58kn5/lcmNpaYCK+cNZH
+ eAquk+r1oYNyazGO4kkBhsYJ33hi9+G5ZJJkBHK8mHvvJMsWmN5ISQSUE0H+5yxy
+ YCzUShNiI4OLItnjtZBuovyi9S3CB0BebK30iaLYM/LXpVI124hiqCbvdQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Science Warehouse Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Science Warehouse SwlDev</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.sci-ware.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Alexei</GivenName>
+ <SurName>Blue</SurName>
+ <EmailAddress>mailto:alexei.blue@sci-ware.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Alexei</GivenName>
+ <SurName>Blue</SurName>
+ <EmailAddress>mailto:alexei.blue@sci-ware.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml b/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml
index 2edebea1..37fd646f 100644
--- a/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://science-gateway.chain-project.eu/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://science-gateway.chain-project.eu/shibboleth">
<md:Extensions>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml b/swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml
new file mode 100644
index 00000000..69cc1efa
--- /dev/null
+++ b/swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.edusphere.lu/Shibboleth.sso/Metadata">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:20:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ </md:Extensions>
+ <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">eduSphere Repository (TEST)</mdui:DisplayName>
+ <mdui:Description xml:lang="en">eduSphere Repository (TEST)</mdui:Description>
+ <mdui:Description xml:lang="fr">eduSphere Repository (TEST)</mdui:Description>
+ <mdui:Description xml:lang="de">eduSphere Repository (TEST)</mdui:Description>
+ <mdui:Description xml:lang="lb">eduSphere Repository (TEST)</mdui:Description>
+ <mdui:Keywords xml:lang="en">eduSphere Repository</mdui:Keywords>
+ <mdui:Logo height="39" width="100" xml:lang="en">http://www.edusphere.lu/wp-content/uploads/2015/03/logo-eduSphere.png</mdui:Logo>
+ </mdui:UIInfo>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://search.edusphere.lu/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://search.edusphere.lu/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://search.edusphere.lu/Shibboleth.sso/Metadata</ds:KeyName>
+ <ds:KeyName>search.edusphere.lu</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=search.edusphere.lu</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFNTCCAx2gAwIBAgIJAIkhjM9ScBFDMA0GCSqGSIb3DQEBDQUAMB4xHDAaBgNV
+BAMTE3NlYXJjaC5lZHVzcGhlcmUubHUwHhcNMTUxMDI5MTIyMDU4WhcNMjUxMDI2
+MTIyMDU4WjAeMRwwGgYDVQQDExNzZWFyY2guZWR1c3BoZXJlLmx1MIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuNZkuqPOUYwgBNjScaDTt8VtHAUJkRrf
+A7R1mErGUfaoxcjIIRX7IWCIKZqYaZdoKq+qVhNrihyDGK+GIFQVt8Zg6LRLvFAM
+H6/52L/yvNm5ILSFy6XnHYGFMCx/WtnuDpzhUurf6sQDwpIz8gKnjorfObn8IkPn
+wN9S+Zj0x12uppd0nvimCDSxqMUDbh/IAAmSSSr2TZ19OW7DgFIGY/9cv0txXpj1
+8mc///oCLQ42giSkVmxYRxVbkXHcrmT731dkhEuwOqv4NNwWeg6I1xHJPgOqhToL
+u8ODNBmYtUbFc+A4bpc6HpAHS9WSB02bkroDog04GKW6KZqp9+j4XfYjTE7b0e1p
+H15CbtuBei3nppyP3K+30kcMG3i7guJhy0GDZrWLWNrHddyaby7AKqk8DDlbImIG
+/XdZRmR+KpwhxVRluWE9K32P/HvKnDtSs/p/inelT+W/J2u5ZRYmjDWbL5zDxv0b
+qr+JwnPg8LAduiWfLcGu2ft53iH4YtbtBWR1kR3ltvvHTiihWYIyjqm+Tz1xAtOE
++uH1IU4Uo6O5LevqfW9kzh4n/05rCpd8kYuFDR827FS2/+cVKbjyPvhev9E4ALjV
+5ekuOzPDLZ5GmBB55bbsNBCrQPlbINjehWEp6mXQQiaDRq0MsoSDvEPEfY7JYXcc
+hsryr2Y4O6sCAwEAAaN2MHQwUwYDVR0RBEwwSoITc2VhcmNoLmVkdXNwaGVyZS5s
+dYYzaHR0cHM6Ly9zZWFyY2guZWR1c3BoZXJlLmx1L1NoaWJib2xldGguc3NvL01l
+dGFkYXRhMB0GA1UdDgQWBBTB3QxElJ7T/U+zGi8VpxziqCmlrTANBgkqhkiG9w0B
+AQ0FAAOCAgEARqnwupw8BmGSCwPmzSQvL+rIRViN+NomGcs5ZuqZtYyrHU4ukPdK
+Kp9pE7Vgq3RxVF5lnPtnShIjg6vMGR/gztRg3/t2PmXZPU/aVag5FNLCinV2uS7h
+wT34YTUs44cN00ENo7EdmDay7CJHq8doadWKBBmQrL4dRm/jc2RoaeDrYF1H/lSr
+dCkLuP/Wsccn4R3ybYc8dfuPz1NKDa0luCmp2epEtcwbEGKyUkvjXEWO4NVF+d0z
+5Jzmyavc8WZp/V0UfRl1X3ANhzpqBtxgspl9/amaD5IOcuWwxAevkfH3J0eWxin/
+ciB6EHB9MUEvnpDaIn3qLBqI0JyJbAjBjzRfiJanARR0rRKvpfHt4eJDVlnucjxy
+iRumxhYBn03lEzAI7SGbd5kCHsPkHb/SaozZk4rHUPuIc9dSWD/Z7etDjS++Avwv
+2otdKYG/i347O2sjh/Y31uoThynHZOThIMNVHzYYutA0NwfzYG4s+Ama1XCEOh5g
+mCuDGuwPo68IZYRHU6KEx9JBJAJ/yoOxiSTG35rau4lIeOulcnS3PvcIwOMoxJ8f
+h5uzEETXp2xNkw59WdhPREf0/Z6BvNqohgAGSX3kiiphFJlLQHrJA40y3yfcZvH3
+epmQlqycyg3pWXHGI7YitqTUMbAI6gy9z7a6rXcaDmJrb1BxF/iRzkg=
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://search.edusphere.lu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">https://search.edusphere.lu/Shibboleth.sso/Metadata</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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="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: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="MEN-currentstudentassignments" Name="MEN-currentstudentassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="MEN-currentteachingassignments" Name="MEN-currentteachingassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="MEN-currentotherassignments" Name="MEN-currentotherassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Centre de Gestion Informatique de l'Education</md:OrganizationName>
+ <md:OrganizationName xml:lang="fr">Centre de Gestion Informatique de l'Education</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Centre de Gestion Informatique de l'Education</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fr">Centre de Gestion Informatique de l'Education</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.edusphere.lu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.edusphere.lu</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Carlos</md:GivenName>
+ <md:SurName>Gamboa</md:SurName>
+ <md:EmailAddress>mailto:carlos.gamboa@edusphere.lu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Carlos</md:GivenName>
+ <md:SurName>Gamboa</md:SurName>
+ <md:EmailAddress>mailto:carlos.gamboa@edusphere.lu</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.uva.nl-cas.xml b/swamid-interfederations-2.0/secure.uva.nl-cas.xml
index 58304591..885fa1a8 100644
--- a/swamid-interfederations-2.0/secure.uva.nl-cas.xml
+++ b/swamid-interfederations-2.0/secure.uva.nl-cas.xml
@@ -12,9 +12,9 @@
<mdui:DisplayName xml:lang="en">University of Amsterdam</mdui:DisplayName>
<mdui:Description xml:lang="nl">Universiteit van Amsterdam</mdui:Description>
<mdui:Description xml:lang="en">Universiteit van Amsterdam</mdui:Description>
- <mdui:Logo height="48" width="48">https://static.surfconext.nl/media/idp/uva.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">University of Amsterdam Universiteit van Amsterdam UvA</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">University of Amsterdam Universiteit van Amsterdam UVA</mdui:Keywords>
+ <mdui:Logo height="48" width="48">https://static.surfconext.nl/logos/idp/uva.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">university of amsterdam universiteit van amsterdam uva</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">university of amsterdam universiteit van amsterdam uva</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml
index f29e00e3..70e50b4d 100644
--- a/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml
@@ -27,6 +27,7 @@
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/WAYF"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/Login"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -70,12 +71,12 @@
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/POST"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/Redirect"/>
<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/SOAP"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML/Artifact" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML/POST" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
diff --git a/swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml
index b9079ab6..056a5a35 100644
--- a/swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml
@@ -27,6 +27,7 @@
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/WAYF"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/Login"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml
index 4ca25962..827394a2 100644
--- a/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml
@@ -44,24 +44,23 @@ Filesender, the Internet2 Member Portal, and wikis. </mdui:Description>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIBADANBgkqhkiG9w0BAQQFADAhMR8wHQYDVQQDExZzZXJ2
-aWNlcy5pbnRlcm5ldDIuZWR1MB4XDTEwMDYyOTEzMTY1M1oXDTE1MDYyODEzMTY1
-M1owITEfMB0GA1UEAxMWc2VydmljZXMuaW50ZXJuZXQyLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAO0gg/lSr02wwP6ZOljGB/C8qdtPwvssnJE3
-UGmbnbaMbK3xllq7fmeXaaAPcrUFkpdn8T9mmJYMF3k7/oRf2mlE7MDWPyJTSRq9
-SXNL7NRrfu0KFhZ7TPBCDtbxlrC2NpnveXx6p//k0FBrSVQaWc0QSsnp7AoNPBBp
-zzYIHotJATGAv25tg+3kX/M+mbSzziQ2bq/qcLv7O/yZCYOERDAtC5x3YG2jIReH
-+3Lt/KR51sXU/XMI9Dhez4q5jS6Fjr6IChZMsQc45RxNkVlpcbX9V/udkAIVvZ7c
-So16wcBO4po5nrm4mxS7Dd5NVqJfU0QUUCKKgVR+rfAb2sKwPDkCAwEAAaN6MHgw
-HQYDVR0OBBYEFOEPkUTO3wPRGLr62F2meNkDWQTTMEkGA1UdIwRCMECAFOEPkUTO
-3wPRGLr62F2meNkDWQTToSWkIzAhMR8wHQYDVQQDExZzZXJ2aWNlcy5pbnRlcm5l
-dDIuZWR1ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAEU232XW
-60YHEMRair7ZqBN1RzyeSgSN4TcSPe2Swlys9ag+zDk3wWJpta9jSKmGdGxSddjt
-34m5QMdRsMTpo2kaZ8kLfhTzs8bA7g5SZ6vtoVsshGl610P6wzLJ/dXnh3ScHW2L
-pL8pJjy4qfRhCdkoHdrtCkA1DxMaCrPlB5ylvCJ1NlZC97GHdIV1xhZ59Ezj/76P
-jEGFO/1vFW2Q0rwKcX3xXX4OyM2sP8+3KyRO1aBiP76jDa/p+UEMbd3Xdl6wOhK9
-VSOCgY1E1Lj8+aTgjkzA2RVIq9SOXE2ZdYjKYDugWATxVa7vkYSXZsy7rpRcQ1aj
-oeoTl9OxJtsd0Bg=
+MIIDFTCCAf2gAwIBAgIJAJcmxvLDIe+oMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
+BAMMFnNlcnZpY2VzLmludGVybmV0Mi5lZHUwHhcNMTUxMDA2MTIzODA2WhcNMjUx
+MDA2MTIzODA2WjAhMR8wHQYDVQQDDBZzZXJ2aWNlcy5pbnRlcm5ldDIuZWR1MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvnktqka8ojoq59ZAa4K2KiiM
+m4RUt4v10eeXvHEyd85N5aaHBgaRNhiflrgZ/NeU8skrui7czODaxqBs8XMzuhU4
++KCKgVKiZdpz3BcqjKcuEu9pKCoB9Zunirx21COSOuhytWvlkc4x0bHD/k1Kg+nl
+x3z3RLu+NNDEbCZKDCnb42tN1pwBSyJlUJpfLu30J3u+FrabM/ax1eo5HeMVeNQx
+2+CRFhD2fhJpD91Nt3XNfArHYJabdegNkXq8DL3WlaVZMqkMq6G1fIOO6am+Ey/I
+wKwRUcLmRsY+JBpZ8U9vQYL9yr5L4nBPyVTv+NwonOdZOfNecqZXkCJNd0rBSQID
+AQABo1AwTjAdBgNVHQ4EFgQU/JzAr/YHO8Mh7AzefIMj3hUVSZwwHwYDVR0jBBgw
+FoAU/JzAr/YHO8Mh7AzefIMj3hUVSZwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+AQsFAAOCAQEAa4VY6C9fpP7NMFJ8ImfDbu97B2n0ZFoCprC3eNRsx0HEbh+26Uk9
+d+yoqH95QvHEB4AKKm3y7dj5jGBvvT480V9Ee0m09ZNGU0n4YWnKky+LqUy9+0R3
+UFNkm3xjIy0yKwyJ6EGo9+5pmvo8tAvjvlwlYHm99YIWAKchFm/v1RrwNZmkUy2N
+WTU70aLaOQq0r3eG3FW+Net1U/dmr28QY4J0UOvD5f2LoWNPXo9xW7N+ZJHd/KsE
+uALfHFGgUGQfHIrJKfHTrdO098Yefwvxh46l/xm9r0c/HKkyfDo5UKPuVOe4srr1
+jNU70ZWm1b9LIxhfoMCYGi7dvyTnW61MVA==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -94,12 +93,18 @@ oeoTl9OxJtsd0Bg=
<md:ServiceDescription xml:lang="en">services.internet2.edu provides Internet2 services in support of our Research and Education Networking mission. Current examples include: e-mail lists, Internet2 meeting registration, and trouble ticketing
for administration of Net+ services. Planned additions include
Filesender, the Internet2 Member Portal, and wikis. </md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
<md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
<md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
<md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml b/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
index 901cbce6..28551ef7 100644
--- a/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.africa-grid.org/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.africa-grid.org/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-27T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml b/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
index 58280a94..1366e4fb 100644
--- a/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.garr.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.garr.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-09T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
index c760c886..d4352650 100644
--- a/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
@@ -99,19 +99,19 @@ Pz8R3A==</ds:X509Certificate>
<md:ContactPerson contactType="administrative">
<md:Company>Örebro University</md:Company>
<md:SurName>IT Avdelningen</md:SurName>
- <md:EmailAddress>itsupport@oru.se</md:EmailAddress>
+ <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
<md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Örebro University</md:Company>
<md:SurName>Jonny Ehrnberg</md:SurName>
- <md:EmailAddress>jonny.ehrnberg@oru.se</md:EmailAddress>
+ <md:EmailAddress>mailto:jonny.ehrnberg@oru.se</md:EmailAddress>
<md:TelephoneNumber>+46 19 303851</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Örebro University</md:Company>
<md:SurName>IT Avdelningen Örebro universitet</md:SurName>
- <md:EmailAddress>itsupport@oru.se</md:EmailAddress>
+ <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
<md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml
index 365d9c3c..1e2d8146 100644
--- a/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml
@@ -109,8 +109,8 @@
<OrganizationURL xml:lang="en">http://www.cam.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Computing Service Desk</GivenName>
- <EmailAddress>mailto:service-desk@ucs.cam.ac.uk</EmailAddress>
+ <GivenName>University Information Services' Service Desk</GivenName>
+ <EmailAddress>mailto:service-desk@uis.cam.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Raven Support</GivenName>
diff --git a/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml b/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml
index 08cff67e..f8e94f13 100644
--- a/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.comune.trieste.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.comune.trieste.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-12-17T09:30:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..2eaef8f1
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.dr.ufu.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufu.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">UFU - Universidade Federal de Uberlandia</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UFU - Universidade Federal de Uberlandia</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ufu.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ufu.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEKjCCAxICAQAwDQYJKoZIhvcNAQEFBQAwgdoxMjAwBgNVBAoUKVVGVSAtIFVuaXZ
+lcnNpZGFkZSBGZWRlcmFsIGRlIFViZXJsw6JuZGlhMTMwMQYDVQQLFCpDVEkgLSBDZW
+50cm8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHDAaBgkqhkiG9w0BCQEWD
+WRyQGN0aS51ZnUuYnIxFDASBgNVBAcUC1ViZXJsw6JuZGlhMRUwEwYDVQQIEwxNaW5h
+cyBHZXJhaXMxCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5zaGliLmRyLnVmdS5icjAeFw0
+xNDEwMjExMjE0MjVaFw0xNzEwMjAxMjE0MjVaMIHaMTIwMAYDVQQKFClVRlUgLSBVbm
+l2ZXJzaWRhZGUgRmVkZXJhbCBkZSBVYmVybMOibmRpYTEzMDEGA1UECxQqQ1RJIC0gQ
+2VudHJvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMRwwGgYJKoZIhvcNAQkB
+Fg1kckBjdGkudWZ1LmJyMRQwEgYDVQQHFAtVYmVybMOibmRpYTEVMBMGA1UECBMMTWl
+uYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOc2hpYi5kci51ZnUuYnIwgg
+EiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOTdVmbc2riXasQi22eylQoD7du
+fk28CGgtcIQHilsKKFZE050AlwhDc8/KvEGJmuQG7EW2XtSMKWTxRCBIqEejJWWlucO
++zpCf1Kq8ARSZteMzn1DAc/NSVYvPegaWcbe9voFwSjbS38Fn3tv7QCCuJTvc/FrET6
+CsuvAJnZ6V7/yNshVTMF3bwacxVTFTnV3xjYqeTjL5BF8121W4aevAABfwOT2jBwU10
+HmFnLgwlERl9B+YaTcOX5Rw32FX3T18Xo7F6cLmMRuMA8zfv+mSvuV22XiiSVgLvpVc
+3syUfcf8J98cNTEmlZViyOYb0ZntUEVYm/NkgOAfYXqN00XAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBALfZ1QHMH1OK/uTgV1aDNZLflgGROkuA3WFddF4llImVtKbOKU6AP6r
+IjoaEq3PB1hz3HEgftoVv0X8/wcVFVm7ZPqheOEUvxOczmKAuYASRFhJIwlza+vrnA5
+04TxTkVrZGkaxLYqit6UjO2DQjIyy2Z09Azkgr73ovB6WjrcjsSnooXnm9B7Di8mz7X
+G94QZbel2spNfB+Z8JzZcgyIGCjGAscPX+9CA07ie02x9jIOOC9JNlDGgfwhbWmzg97
+aCMtX+kA/sVbLZxQwFlKqaRyDcKQUKzz7wTzhBZMz8etcMkkzfKA0FINRU5bSTenRjX
+hSn3iPrOyRPY80Vexzr4=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dr.ufu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dr.ufu.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dr.ufu.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dr.ufu.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufu.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEKjCCAxICAQAwDQYJKoZIhvcNAQEFBQAwgdoxMjAwBgNVBAoUKVVGVSAtIFVuaXZ
+lcnNpZGFkZSBGZWRlcmFsIGRlIFViZXJsw6JuZGlhMTMwMQYDVQQLFCpDVEkgLSBDZW
+50cm8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHDAaBgkqhkiG9w0BCQEWD
+WRyQGN0aS51ZnUuYnIxFDASBgNVBAcUC1ViZXJsw6JuZGlhMRUwEwYDVQQIEwxNaW5h
+cyBHZXJhaXMxCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5zaGliLmRyLnVmdS5icjAeFw0
+xNDEwMjExMjE0MjVaFw0xNzEwMjAxMjE0MjVaMIHaMTIwMAYDVQQKFClVRlUgLSBVbm
+l2ZXJzaWRhZGUgRmVkZXJhbCBkZSBVYmVybMOibmRpYTEzMDEGA1UECxQqQ1RJIC0gQ
+2VudHJvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMRwwGgYJKoZIhvcNAQkB
+Fg1kckBjdGkudWZ1LmJyMRQwEgYDVQQHFAtVYmVybMOibmRpYTEVMBMGA1UECBMMTWl
+uYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOc2hpYi5kci51ZnUuYnIwgg
+EiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOTdVmbc2riXasQi22eylQoD7du
+fk28CGgtcIQHilsKKFZE050AlwhDc8/KvEGJmuQG7EW2XtSMKWTxRCBIqEejJWWlucO
++zpCf1Kq8ARSZteMzn1DAc/NSVYvPegaWcbe9voFwSjbS38Fn3tv7QCCuJTvc/FrET6
+CsuvAJnZ6V7/yNshVTMF3bwacxVTFTnV3xjYqeTjL5BF8121W4aevAABfwOT2jBwU10
+HmFnLgwlERl9B+YaTcOX5Rw32FX3T18Xo7F6cLmMRuMA8zfv+mSvuV22XiiSVgLvpVc
+3syUfcf8J98cNTEmlZViyOYb0ZntUEVYm/NkgOAfYXqN00XAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBALfZ1QHMH1OK/uTgV1aDNZLflgGROkuA3WFddF4llImVtKbOKU6AP6r
+IjoaEq3PB1hz3HEgftoVv0X8/wcVFVm7ZPqheOEUvxOczmKAuYASRFhJIwlza+vrnA5
+04TxTkVrZGkaxLYqit6UjO2DQjIyy2Z09Azkgr73ovB6WjrcjsSnooXnm9B7Di8mz7X
+G94QZbel2spNfB+Z8JzZcgyIGCjGAscPX+9CA07ie02x9jIOOC9JNlDGgfwhbWmzg97
+aCMtX+kA/sVbLZxQwFlKqaRyDcKQUKzz7wTzhBZMz8etcMkkzfKA0FINRU5bSTenRjX
+hSn3iPrOyRPY80Vexzr4=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">UFU - Universidade Federal de Uberlandia</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">UFU - Universidade Federal de Uberlandia</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ufu.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.ufu.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Divisao de Redes</md:SurName>
+ <md:EmailAddress>dr@cti.ufu.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..743baab9
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.lythamsixth.ac.uk/shibboleth">
+ <!--
+ This is a "Lytham Sixth Form College" Shibboleth IdP for Blackpool and The Fylde College.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-19T12:06:12Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lythamsixth.ac.uk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Lytham Sixth Form College</mdui:DisplayName>
+ <mdui:Logo height="146" width="350">https://shib.lythamsixth.ac.uk/gif/LSF-Logo-350x64.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>193.63.160.0/24</mdui:IPHint>
+ <mdui:IPHint>193.63.161.0/24</mdui:IPHint>
+ <mdui:IPHint>193.63.162.0/24</mdui:IPHint>
+ <mdui:IPHint>193.63.163.0/24</mdui:IPHint>
+ <mdui:IPHint>193.63.164.0/24</mdui:IPHint>
+ <mdui:IPHint>193.63.165.0/24</mdui:IPHint>
+ <mdui:IPHint>193.63.166.0/24</mdui:IPHint>
+ <mdui:IPHint>193.63.167.0/24</mdui:IPHint>
+ <mdui:DomainHint>lythamsixth.ac.uk</mdui:DomainHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEdjCCA16gAwIBAgIJAOeox3UBOO8vMA0GCSqGSIb3DQEBCwUAMIG7MQswCQYD
+ VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTEPMA0GA1UEBxMGTHl0aGFtMSIw
+ IAYDVQQKExlMeXRoYW0gU2l4dGggRm9ybSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBT
+ ZXJ2aWNlczEfMB0GA1UEAxMWc2hpYi5seXRoYW1zaXh0aC5hYy51azErMCkGCSqG
+ SIb3DQEJARYccG9zdG1hc3RlckBseXRoYW1zaXh0aC5hYy51azAeFw0xNTEwMTYx
+ NDIwNDZaFw0yNTEwMTMxNDIwNDZaMIG7MQswCQYDVQQGEwJHQjETMBEGA1UECBMK
+ TGFuY2FzaGlyZTEPMA0GA1UEBxMGTHl0aGFtMSIwIAYDVQQKExlMeXRoYW0gU2l4
+ dGggRm9ybSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEfMB0GA1UEAxMW
+ c2hpYi5seXRoYW1zaXh0aC5hYy51azErMCkGCSqGSIb3DQEJARYccG9zdG1hc3Rl
+ ckBseXRoYW1zaXh0aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ ggEBAL3bcKHTe4mNGr9hCMPc8PwvjYPspPS5MlHOSPLtxMMCFxs7a2mPjrJsoXHG
+ q3xE7I/QHAninXZG9FgAjvhpr5poYHg8ZWgPfH/jGV4qScb5kCjPR4AAGMHxb7hD
+ UXd4n05M854yKjUz1luIUKe65121L9E08/qvrQ8mUVhtRFIsY+vYZXWDql1IrtQQ
+ 6fl4Kn+cr829WM4Z/ZKgj7J+EsmR3ejyTFMn9VmQihXkPgeSGTzs+Etv7k1Bn9OF
+ VmMeyaUxAVhbYvR+qHbH1iEdNfHJ7ku1XlG5HJ3tvusF7ar5QycTqsoIaCCDJJ5/
+ 3rvcTpLDqr35aDDdmiH6jogZglsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+ hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+ FIUZC6IwXrhL2dZpcBtcSudbPv4cMB8GA1UdIwQYMBaAFIUZC6IwXrhL2dZpcBtc
+ SudbPv4cMA0GCSqGSIb3DQEBCwUAA4IBAQAKffu+lOxW1bPF1j18RaGgjB5x58ME
+ pM9ocOpqkPLdPkOW4/OehNVNFdLE4jw1p7iPr9Q+dRIRxVl/ewsXnDi7HaIySrja
+ rriIhi4/j5WBczTN6cjg8gWo4/31PXfS2OwKJ4BTaiVscSCvlIedBM5uIFaX4CwF
+ T0ioAwWKcYc3dpEz97w2b5s3JeHyjjrqZjlLkxRuI9U0jxu/j2M+mLl6pdmDIGXL
+ XuCbJtyKrqjmkL9TD9qXKQBBDxHCqOmGdJRp5EhUyVoC3u3wFDhaUufSXd6K863r
+ jxKoHRU8H+vWtT+cjFopBvaAVyQjqNRoN7zXX5xjecEFsnNkhSgjeZTR
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lythamsixth.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lythamsixth.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lythamsixth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lythamsixth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lythamsixth.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEdjCCA16gAwIBAgIJAOeox3UBOO8vMA0GCSqGSIb3DQEBCwUAMIG7MQswCQYD
+ VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTEPMA0GA1UEBxMGTHl0aGFtMSIw
+ IAYDVQQKExlMeXRoYW0gU2l4dGggRm9ybSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBT
+ ZXJ2aWNlczEfMB0GA1UEAxMWc2hpYi5seXRoYW1zaXh0aC5hYy51azErMCkGCSqG
+ SIb3DQEJARYccG9zdG1hc3RlckBseXRoYW1zaXh0aC5hYy51azAeFw0xNTEwMTYx
+ NDIwNDZaFw0yNTEwMTMxNDIwNDZaMIG7MQswCQYDVQQGEwJHQjETMBEGA1UECBMK
+ TGFuY2FzaGlyZTEPMA0GA1UEBxMGTHl0aGFtMSIwIAYDVQQKExlMeXRoYW0gU2l4
+ dGggRm9ybSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEfMB0GA1UEAxMW
+ c2hpYi5seXRoYW1zaXh0aC5hYy51azErMCkGCSqGSIb3DQEJARYccG9zdG1hc3Rl
+ ckBseXRoYW1zaXh0aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ ggEBAL3bcKHTe4mNGr9hCMPc8PwvjYPspPS5MlHOSPLtxMMCFxs7a2mPjrJsoXHG
+ q3xE7I/QHAninXZG9FgAjvhpr5poYHg8ZWgPfH/jGV4qScb5kCjPR4AAGMHxb7hD
+ UXd4n05M854yKjUz1luIUKe65121L9E08/qvrQ8mUVhtRFIsY+vYZXWDql1IrtQQ
+ 6fl4Kn+cr829WM4Z/ZKgj7J+EsmR3ejyTFMn9VmQihXkPgeSGTzs+Etv7k1Bn9OF
+ VmMeyaUxAVhbYvR+qHbH1iEdNfHJ7ku1XlG5HJ3tvusF7ar5QycTqsoIaCCDJJ5/
+ 3rvcTpLDqr35aDDdmiH6jogZglsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+ hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+ FIUZC6IwXrhL2dZpcBtcSudbPv4cMB8GA1UdIwQYMBaAFIUZC6IwXrhL2dZpcBtc
+ SudbPv4cMA0GCSqGSIb3DQEBCwUAA4IBAQAKffu+lOxW1bPF1j18RaGgjB5x58ME
+ pM9ocOpqkPLdPkOW4/OehNVNFdLE4jw1p7iPr9Q+dRIRxVl/ewsXnDi7HaIySrja
+ rriIhi4/j5WBczTN6cjg8gWo4/31PXfS2OwKJ4BTaiVscSCvlIedBM5uIFaX4CwF
+ T0ioAwWKcYc3dpEz97w2b5s3JeHyjjrqZjlLkxRuI9U0jxu/j2M+mLl6pdmDIGXL
+ XuCbJtyKrqjmkL9TD9qXKQBBDxHCqOmGdJRp5EhUyVoC3u3wFDhaUufSXd6K863r
+ jxKoHRU8H+vWtT+cjFopBvaAVyQjqNRoN7zXX5xjecEFsnNkhSgjeZTR
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Blackpool and The Fylde College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Lytham Sixth Form College</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.lythamsixth.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Helpdesk</GivenName>
+ <EmailAddress>mailto:helpdesk@blackpool.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Technical support</GivenName>
+ <EmailAddress>mailto:shib-tech@blackpool.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml
index 063a2de4..dd5deaa9 100644
--- a/swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml
@@ -31,31 +31,21 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEmDCCA4CgAwIBAgIQfLHlbRUtdCp5KSC69ObH+DANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowbzELMAkGA1UE
- BhMCR0IxIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgQ2FtYnJpZGdlMR8wHQYDVQQL
- ExZVQ1MgU2hpYmJvbGV0aCBTZXJ2aWNlMR0wGwYDVQQDExRzaGliLnJhdmVuLmNh
- bS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQTbdQmYTcE
- Hwkw+7E9FXLcALHRwKoTpgA4PiZKcNu0CsVSD5VADQGN3u5myrlhjWIy7/filK5M
- BoUl5zsFFAgtNcPvCaSCNo9VuvIgLyhrM36JVX5n4/L6rHEP1KpUimho67lpN/eL
- 92+3nXWIexwgDrYDiQyCl/RdHmzJCHakIMNnubnp8LdUvU4MDr2IviH7mecoUL/W
- LsKO+kEvFJMTsr2XUWZezCHIcTtEx2k2G63GtBrEnPq/UiG/vqzOX0NMsUM4d+j6
- mxogNZ6Ev3YZEWW98sCzzaBc7qsFjr3Derm4TuWDipkz59TdLlYPeC1TAsTFpTvg
- 42fGhZjK/esCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
- R+qQ47ntMB0GA1UdDgQWBBSW6ydPZrdKjKgjpVpJ6K3T8BZrLzAOBgNVHQ8BAf8E
- BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
- AwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilo
- dHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEF
- BQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcv
- VEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVy
- ZW5hLm9yZzAfBgNVHREEGDAWghRzaGliLnJhdmVuLmNhbS5hYy51azANBgkqhkiG
- 9w0BAQUFAAOCAQEAh5t+ortlUIp2CkhSF3KTeUm3O8vhM0EX0Kl6bid2qI69nxom
- vGYMqBMPKcc9foCbEgILSKa9kUwt3lcyF4HFK7X/BzU0c7YyR/Di734fxyvWqsgj
- H8WJJmZnS7md614HFlfoCMjeeC6iTuAT5LcsreBdl+VBerpL51/SCb0IKtd3J0dK
- 4+EFLNpQgQKhMYR2zGYIeNX+3uH5ESHhFYL7bgG3RsBTzn2CZALHGm6+dVgnjw49
- fHaY+8yYGVTfXPZqJ08SfZxCidmlWejicoxE1uHFGuL6HSEDMm/uF3L0H4mUPoxO
- iDQ+4/pKRbtOiTokxLohAPABDm+GgCrcuwZjqg==
+ MIICujCCAaICCQDN9BMM2g2oWzANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDExRz
+ aGliLnJhdmVuLmNhbS5hYy51azAeFw0xNTExMjAxNDUwNTFaFw0yNTExMTcxNDUw
+ NTFaMB8xHTAbBgNVBAMTFHNoaWIucmF2ZW4uY2FtLmFjLnVrMIIBIjANBgkqhkiG
+ 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxBNt1CZhNwQfCTD7sT0VctwAsdHAqhOmADg+
+ Jkpw27QKxVIPlUANAY3e7mbKuWGNYjLv9+KUrkwGhSXnOwUUCC01w+8JpII2j1W6
+ 8iAvKGszfolVfmfj8vqscQ/UqlSKaGjruWk394v3b7eddYh7HCAOtgOJDIKX9F0e
+ bMkIdqQgw2e5uenwt1S9TgwOvYi+IfuZ5yhQv9Yuwo76QS8UkxOyvZdRZl7MIchx
+ O0THaTYbrca0GsSc+r9SIb++rM5fQ0yxQzh36PqbGiA1noS/dhkRZb3ywLPNoFzu
+ qwWOvcN6ubhO5YOKmTPn1N0uVg94LVMCxMWlO+DjZ8aFmMr96wIDAQABMA0GCSqG
+ SIb3DQEBBQUAA4IBAQBimCfClavq2Wk1Zsq9AQ3TWeVFrm1kaCUi4J5j3uWNlMVK
+ PsIGE0BHAALMixG+XWt5+QW70CXq6RnHXMS0TLfM5q6K8jIVURK599bTF2/d4fNq
+ 3QJNaVusuqCqym3Z7rt71QfGtPi0rVKVlQL+lL87a0TDLIyWLsbEe786NpYe0mEe
+ BXPQwpPwSaJ1PnPNlsl5i/cUZou5zZQGHtqEY/PR7wAxS/28A6qWLVpMQEUYtb9M
+ ZBb6lO15RJ5qwk6paQG87nhMPAFwSbK+OpCkt3hYd7l8LjXNG74eOZdPM5V6DmZz
+ nMRF0t4QBDKsuZ64N/+u7R3Nj6uzsQsb7PJXGNTf
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -78,31 +68,21 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEmDCCA4CgAwIBAgIQfLHlbRUtdCp5KSC69ObH+DANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowbzELMAkGA1UE
- BhMCR0IxIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgQ2FtYnJpZGdlMR8wHQYDVQQL
- ExZVQ1MgU2hpYmJvbGV0aCBTZXJ2aWNlMR0wGwYDVQQDExRzaGliLnJhdmVuLmNh
- bS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQTbdQmYTcE
- Hwkw+7E9FXLcALHRwKoTpgA4PiZKcNu0CsVSD5VADQGN3u5myrlhjWIy7/filK5M
- BoUl5zsFFAgtNcPvCaSCNo9VuvIgLyhrM36JVX5n4/L6rHEP1KpUimho67lpN/eL
- 92+3nXWIexwgDrYDiQyCl/RdHmzJCHakIMNnubnp8LdUvU4MDr2IviH7mecoUL/W
- LsKO+kEvFJMTsr2XUWZezCHIcTtEx2k2G63GtBrEnPq/UiG/vqzOX0NMsUM4d+j6
- mxogNZ6Ev3YZEWW98sCzzaBc7qsFjr3Derm4TuWDipkz59TdLlYPeC1TAsTFpTvg
- 42fGhZjK/esCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
- R+qQ47ntMB0GA1UdDgQWBBSW6ydPZrdKjKgjpVpJ6K3T8BZrLzAOBgNVHQ8BAf8E
- BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
- AwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilo
- dHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEF
- BQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcv
- VEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVy
- ZW5hLm9yZzAfBgNVHREEGDAWghRzaGliLnJhdmVuLmNhbS5hYy51azANBgkqhkiG
- 9w0BAQUFAAOCAQEAh5t+ortlUIp2CkhSF3KTeUm3O8vhM0EX0Kl6bid2qI69nxom
- vGYMqBMPKcc9foCbEgILSKa9kUwt3lcyF4HFK7X/BzU0c7YyR/Di734fxyvWqsgj
- H8WJJmZnS7md614HFlfoCMjeeC6iTuAT5LcsreBdl+VBerpL51/SCb0IKtd3J0dK
- 4+EFLNpQgQKhMYR2zGYIeNX+3uH5ESHhFYL7bgG3RsBTzn2CZALHGm6+dVgnjw49
- fHaY+8yYGVTfXPZqJ08SfZxCidmlWejicoxE1uHFGuL6HSEDMm/uF3L0H4mUPoxO
- iDQ+4/pKRbtOiTokxLohAPABDm+GgCrcuwZjqg==
+ MIICujCCAaICCQDN9BMM2g2oWzANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDExRz
+ aGliLnJhdmVuLmNhbS5hYy51azAeFw0xNTExMjAxNDUwNTFaFw0yNTExMTcxNDUw
+ NTFaMB8xHTAbBgNVBAMTFHNoaWIucmF2ZW4uY2FtLmFjLnVrMIIBIjANBgkqhkiG
+ 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxBNt1CZhNwQfCTD7sT0VctwAsdHAqhOmADg+
+ Jkpw27QKxVIPlUANAY3e7mbKuWGNYjLv9+KUrkwGhSXnOwUUCC01w+8JpII2j1W6
+ 8iAvKGszfolVfmfj8vqscQ/UqlSKaGjruWk394v3b7eddYh7HCAOtgOJDIKX9F0e
+ bMkIdqQgw2e5uenwt1S9TgwOvYi+IfuZ5yhQv9Yuwo76QS8UkxOyvZdRZl7MIchx
+ O0THaTYbrca0GsSc+r9SIb++rM5fQ0yxQzh36PqbGiA1noS/dhkRZb3ywLPNoFzu
+ qwWOvcN6ubhO5YOKmTPn1N0uVg94LVMCxMWlO+DjZ8aFmMr96wIDAQABMA0GCSqG
+ SIb3DQEBBQUAA4IBAQBimCfClavq2Wk1Zsq9AQ3TWeVFrm1kaCUi4J5j3uWNlMVK
+ PsIGE0BHAALMixG+XWt5+QW70CXq6RnHXMS0TLfM5q6K8jIVURK599bTF2/d4fNq
+ 3QJNaVusuqCqym3Z7rt71QfGtPi0rVKVlQL+lL87a0TDLIyWLsbEe786NpYe0mEe
+ BXPQwpPwSaJ1PnPNlsl5i/cUZou5zZQGHtqEY/PR7wAxS/28A6qWLVpMQEUYtb9M
+ ZBb6lO15RJ5qwk6paQG87nhMPAFwSbK+OpCkt3hYd7l8LjXNG74eOZdPM5V6DmZz
+ nMRF0t4QBDKsuZ64N/+u7R3Nj6uzsQsb7PJXGNTf
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -118,8 +98,8 @@
<OrganizationURL xml:lang="en">http://www.cam.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Computing Service Help Desk</GivenName>
- <EmailAddress>mailto:help-desk@ucs.cam.ac.uk</EmailAddress>
+ <GivenName>University Information Services' Service Desk</GivenName>
+ <EmailAddress>mailto:service-desk@uis.cam.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Raven Support</GivenName>
diff --git a/swamid-interfederations-2.0/shib.reaseheath.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.reaseheath.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..662873f5
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.reaseheath.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.reaseheath.ac.uk/idp/shibboleth">
+ <!--
+ This is a Shibboleth test IdP for Reaseheath College.
+ -->
+ <Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-03T15:43:53Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reaseheath.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPzCCAiegAwIBAgIUJtSeU6l5y3tr7fhTbEMMdn2U+BYwDQYJKoZIhvcNAQEL
+ BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
+ NDUxMFoXDTM1MTAxNDE1NDUxMFowIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
+ LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr2h1r5VBnL9+
+ BiLgULv0RqHvItjgw6Dxr7fW3PWPHxR465Igl6bQGMeBncN7BplQw2qCtf/Pdw65
+ TGKPijbrDBXobI9hKhvIUTia6w5D3qFetCSCkRnoA9dq9xFpNOcT/0bCCkshl+dt
+ lEu5dvA5q0mp9AXHo+f/h3NjVAkpQ0c9saA99nxtpZOqOR6CIB6zFLg6cSftEqX4
+ 39qbAZKBIRPiJn6PQSUd8n3zPgPy5qTts1ToksRYR6LOgi4z87CfhxMMrNfjkUM9
+ LM0ma7LWhJo32Sbci0nja8HalLRfK0gUH1GlHMh2OZkgQJ9LmLUm6E0gtYdTnDYB
+ pSky2sFa+wIDAQABo3EwbzAdBgNVHQ4EFgQU9C6qwGwlN1SKjJagZYW3GKaalVUw
+ TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
+ cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+ AQEAHJp4ZwMk7E8ECWWtwBL2Fq/Sg34b+WdXhgqLt2YFPxYn1Z3MzN1QVD+3JiSd
+ B6/krjU5jjhqXe69HXzTIMy7wFhEhk78IhFcHxugyj9zC1+TXoMOLo72CvnDrPcb
+ ITBm3ypNt/UV4wKUxAfltDQy/IAbs/CXFLIAhYG7xFZ06dHuGOQ1I0JYFyDf9eqn
+ 8nGFHFsCW0cs16s4d6jFvGwTYHQ7/x5aKAgztkD2VgiDZXof/Hg3HiOtVPEFX1NV
+ qRa8xFl+F1m4flEPHbHDWdjbmnwe2kPl4y6PwqWJrSMNgKlOSVhPAbztz/t3H6gp
+ LesywhYMlSPtH22K+a3CiahDMw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPzCCAiegAwIBAgIUGjPH8LhaoQmEkZaMA9mvvFacc/swDQYJKoZIhvcNAQEL
+ BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
+ NDUwN1oXDTM1MTAxNDE1NDUwN1owIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
+ LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAphZayAXU4TZd
+ GHTg8O533mIIgetrNg622ypHh8Cp4yISkwBeRqXsysm7eLisT98f6TwF/909yvVi
+ vc6nbW93ZI/NZNdgtI/TJf2PCZL7s610Ep3ovqYR39iR4bw5PHmLXGRdLiVuKWzH
+ clNq/5/J5IAVIc/ZxkrLprDKFXwzw/c323JtdBMfNhk5ybluMhMwN5nA5CykDGfz
+ tklFQ79col3TD/pZs1DdU+iyZp9G8eO4fC66DP9awfQeg3nGtGQUB5v2ZI6GcPNd
+ VauZseVGUzCpPMY3cTr9xfsR643SOSnNkTkafiEM+mkt5pYpWAPQAZ4waPpYGYES
+ JdsLXzdBLQIDAQABo3EwbzAdBgNVHQ4EFgQUVDIF0fJ8QtDTH2hViCgfNUfqit4w
+ TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
+ cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+ AQEAkw7D/FwTi7k+qqVbQmLNpzKgDAioMyAFSeiuCw280IBwvxa2PfBcSTGDzR3t
+ TNbKSI1GrSfRDcsoYIVt9UQX2Hy/cNUGMUS7UgNRpQ4CG+p/f9U9GHIFO6nKDsbg
+ tT24pA5Uhn1hFRHTiGgaovx9sK6QwFFOvztOpVbF97zl5AtisKZ/tS/gD1q0IC+1
+ Dq07d0W/Ki6taSUClNk9PebFIOIuwOQHG9Gx+hqTOAqWFDNlMPwaLdvtZEVRpN+6
+ dU+M+4WHeWDHiNxPX3k/jNUTlmHskrxTtXi4RbVYyXw+tAxhHq8S4vN2kNElhr8l
+ gvZT6e+fbGfucnFJvdlyK66CbQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDQDCCAiigAwIBAgIVALhMQiufWiWfLbo35hETLp+s2plNMA0GCSqGSIb3DQEB
+ CwUAMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0aC5hYy51azAeFw0xNTEwMTQx
+ NTQ1MDlaFw0zNTEwMTQxNTQ1MDlaMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0
+ aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANSlu8ODQ8vQ
+ 5gIusx6gX27mN3vNYBwtUoH98MunT8KoKme1O2D52/Q4l9VRrRuxO5rv2X2ezSbo
+ UoacSBGmqR15LpJJE9qIysAe4nIwlOTfuSN/8P4CcrzbZAFf1gu0BHsLkVkBb2cm
+ /wSmfISG6mh/+7VKwkEcxHA+gej1QdJbjmU+TQKjK0A6Px02PHYvuHBdFBFv+00/
+ K24pUCBANpPBK9RWxN3LxYrQervyzRAWy5JHitZuIkO9q4XWW+YuJSADzTY/y1+M
+ Ar6ZBLUcxUg0NqZJLtvhQwoJZnUqIwEY8kbN9A5FmLHFpPl9BFgx32nMGKna8YvI
+ WWp7dftoAgECAwEAAaNxMG8wHQYDVR0OBBYEFLRRrSoN4c99qjThozsyvcCPqR8v
+ ME4GA1UdEQRHMEWCFXNoaWIucmVhc2VoZWF0aC5hYy51a4YsaHR0cHM6Ly9zaGli
+ LnJlYXNlaGVhdGguYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ ggEBAAxgcPcNG1wMo8hIca5uxoaluAJ4FGPiq90h7MWS1XSMDX3ERc2wXzZWSmhp
+ vKl/6B99HoqPycfkCVqg3c3CGW9y41bdXltxhvLID3JN7cxf3Ne7vQUNMDXlR5D9
+ qVqo0lAySIWY4Yz+FB1CzcUBsxb3dnJ4cwH+xHAx3YkVDDwyIq6gsvIvuu+oN4G7
+ 5eR54/RUm65jzVW2hUJLk3MLC4/1syOrvJAfmEJrIfdPg5DrlpN4HsucpWLO88wo
+ dwmJ2RZsUVyC97olmPKAQOLV0YdeoDn8jowXXo+xDGxKQzO1S8M9STBJPr3c5+yV
+ 5QUuKHTcpSRcXCPL+qGac9d/T6E=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.reaseheath.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reaseheath.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPzCCAiegAwIBAgIUJtSeU6l5y3tr7fhTbEMMdn2U+BYwDQYJKoZIhvcNAQEL
+ BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
+ NDUxMFoXDTM1MTAxNDE1NDUxMFowIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
+ LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr2h1r5VBnL9+
+ BiLgULv0RqHvItjgw6Dxr7fW3PWPHxR465Igl6bQGMeBncN7BplQw2qCtf/Pdw65
+ TGKPijbrDBXobI9hKhvIUTia6w5D3qFetCSCkRnoA9dq9xFpNOcT/0bCCkshl+dt
+ lEu5dvA5q0mp9AXHo+f/h3NjVAkpQ0c9saA99nxtpZOqOR6CIB6zFLg6cSftEqX4
+ 39qbAZKBIRPiJn6PQSUd8n3zPgPy5qTts1ToksRYR6LOgi4z87CfhxMMrNfjkUM9
+ LM0ma7LWhJo32Sbci0nja8HalLRfK0gUH1GlHMh2OZkgQJ9LmLUm6E0gtYdTnDYB
+ pSky2sFa+wIDAQABo3EwbzAdBgNVHQ4EFgQU9C6qwGwlN1SKjJagZYW3GKaalVUw
+ TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
+ cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+ AQEAHJp4ZwMk7E8ECWWtwBL2Fq/Sg34b+WdXhgqLt2YFPxYn1Z3MzN1QVD+3JiSd
+ B6/krjU5jjhqXe69HXzTIMy7wFhEhk78IhFcHxugyj9zC1+TXoMOLo72CvnDrPcb
+ ITBm3ypNt/UV4wKUxAfltDQy/IAbs/CXFLIAhYG7xFZ06dHuGOQ1I0JYFyDf9eqn
+ 8nGFHFsCW0cs16s4d6jFvGwTYHQ7/x5aKAgztkD2VgiDZXof/Hg3HiOtVPEFX1NV
+ qRa8xFl+F1m4flEPHbHDWdjbmnwe2kPl4y6PwqWJrSMNgKlOSVhPAbztz/t3H6gp
+ LesywhYMlSPtH22K+a3CiahDMw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPzCCAiegAwIBAgIUGjPH8LhaoQmEkZaMA9mvvFacc/swDQYJKoZIhvcNAQEL
+ BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
+ NDUwN1oXDTM1MTAxNDE1NDUwN1owIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
+ LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAphZayAXU4TZd
+ GHTg8O533mIIgetrNg622ypHh8Cp4yISkwBeRqXsysm7eLisT98f6TwF/909yvVi
+ vc6nbW93ZI/NZNdgtI/TJf2PCZL7s610Ep3ovqYR39iR4bw5PHmLXGRdLiVuKWzH
+ clNq/5/J5IAVIc/ZxkrLprDKFXwzw/c323JtdBMfNhk5ybluMhMwN5nA5CykDGfz
+ tklFQ79col3TD/pZs1DdU+iyZp9G8eO4fC66DP9awfQeg3nGtGQUB5v2ZI6GcPNd
+ VauZseVGUzCpPMY3cTr9xfsR643SOSnNkTkafiEM+mkt5pYpWAPQAZ4waPpYGYES
+ JdsLXzdBLQIDAQABo3EwbzAdBgNVHQ4EFgQUVDIF0fJ8QtDTH2hViCgfNUfqit4w
+ TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
+ cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+ AQEAkw7D/FwTi7k+qqVbQmLNpzKgDAioMyAFSeiuCw280IBwvxa2PfBcSTGDzR3t
+ TNbKSI1GrSfRDcsoYIVt9UQX2Hy/cNUGMUS7UgNRpQ4CG+p/f9U9GHIFO6nKDsbg
+ tT24pA5Uhn1hFRHTiGgaovx9sK6QwFFOvztOpVbF97zl5AtisKZ/tS/gD1q0IC+1
+ Dq07d0W/Ki6taSUClNk9PebFIOIuwOQHG9Gx+hqTOAqWFDNlMPwaLdvtZEVRpN+6
+ dU+M+4WHeWDHiNxPX3k/jNUTlmHskrxTtXi4RbVYyXw+tAxhHq8S4vN2kNElhr8l
+ gvZT6e+fbGfucnFJvdlyK66CbQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDQDCCAiigAwIBAgIVALhMQiufWiWfLbo35hETLp+s2plNMA0GCSqGSIb3DQEB
+ CwUAMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0aC5hYy51azAeFw0xNTEwMTQx
+ NTQ1MDlaFw0zNTEwMTQxNTQ1MDlaMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0
+ aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANSlu8ODQ8vQ
+ 5gIusx6gX27mN3vNYBwtUoH98MunT8KoKme1O2D52/Q4l9VRrRuxO5rv2X2ezSbo
+ UoacSBGmqR15LpJJE9qIysAe4nIwlOTfuSN/8P4CcrzbZAFf1gu0BHsLkVkBb2cm
+ /wSmfISG6mh/+7VKwkEcxHA+gej1QdJbjmU+TQKjK0A6Px02PHYvuHBdFBFv+00/
+ K24pUCBANpPBK9RWxN3LxYrQervyzRAWy5JHitZuIkO9q4XWW+YuJSADzTY/y1+M
+ Ar6ZBLUcxUg0NqZJLtvhQwoJZnUqIwEY8kbN9A5FmLHFpPl9BFgx32nMGKna8YvI
+ WWp7dftoAgECAwEAAaNxMG8wHQYDVR0OBBYEFLRRrSoN4c99qjThozsyvcCPqR8v
+ ME4GA1UdEQRHMEWCFXNoaWIucmVhc2VoZWF0aC5hYy51a4YsaHR0cHM6Ly9zaGli
+ LnJlYXNlaGVhdGguYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ ggEBAAxgcPcNG1wMo8hIca5uxoaluAJ4FGPiq90h7MWS1XSMDX3ERc2wXzZWSmhp
+ vKl/6B99HoqPycfkCVqg3c3CGW9y41bdXltxhvLID3JN7cxf3Ne7vQUNMDXlR5D9
+ qVqo0lAySIWY4Yz+FB1CzcUBsxb3dnJ4cwH+xHAx3YkVDDwyIq6gsvIvuu+oN4G7
+ 5eR54/RUm65jzVW2hUJLk3MLC4/1syOrvJAfmEJrIfdPg5DrlpN4HsucpWLO88wo
+ dwmJ2RZsUVyC97olmPKAQOLV0YdeoDn8jowXXo+xDGxKQzO1S8M9STBJPr3c5+yV
+ 5QUuKHTcpSRcXCPL+qGac9d/T6E=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Reaseheath College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Reaseheath College (Test)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.reaseheath.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IT Services</GivenName>
+ <EmailAddress>mailto:support@reaseheath.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IT Services</GivenName>
+ <EmailAddress>mailto:support@reaseheath.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml
index 80b72e53..5dec211e 100644
--- a/swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml
@@ -59,6 +59,47 @@ QlWpyRQfOn6GOvmhDbM=
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=shib.uni-mainz.de,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIF8DCCBNigAwIBAgIHGlGNEMJrKTANBgkqhkiG9w0BAQsFADCBojELMAkGA1UE
+BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
+LjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnox
+FTATBgNVBAMTDEpHVSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTamd1LWNhQHVu
+aS1tYWluei5kZTAeFw0xNTEwMjkxMjIyMjVaFw0xOTAxMjUxMjIyMjVaMIGDMQsw
+CQYDVQQGEwJERTEYMBYGA1UECAwPUmhlaW5sYW5kLVBmYWx6MQ4wDAYDVQQHDAVN
+YWluejEuMCwGA1UECgwlSm9oYW5uZXMgR3V0ZW5iZXJnLVVuaXZlcnNpdGFldCBN
+YWluejEaMBgGA1UEAwwRc2hpYi51bmktbWFpbnouZGUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDcpVmR0l6m/MrnlyY/LgILDGUMLHf/m7X8NI5Lju0s
+RNQYdTk0jZ3SfW7hoIbeCOW1W8cDjPsyYl13cU1FYsQ/43W4qKLR1+0A/bZ05CDH
+5yDV3yGaFLWzzomQ6eHEpgFHOuNpySsXJ4MXsfObkL3yTD9CgiuS1XqpCQHx6TOM
+YVFrjoNLKukCp7flG+/OFueVN0uUwL7huomGKtIXPQFprT+q06EqbdNszcq2bt3l
+FWmEUwbAK66wTNJvkFEa3fgbsW1DuIK+oDeA6hr0dHb8tirA4ww97y3upNqKTSBd
+z7lr/xD1S6Hl7A8xKWTSORzpbsoptsT3dsvB/1tqPUMzAgMBAAGjggJGMIICQjBZ
+BgNVHSAEUjBQMBEGDysGAQQBga0hgiwBAQQDBDARBg8rBgEEAYGtIYIsAgEEAwEw
+DwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAIBgZngQwBAgIwCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYE
+FM+hafRdjETrrKia7HYSPoPA4/XfMB8GA1UdIwQYMBaAFDMYOT1VNFhwo6yv8Iz7
+mkciPU/NMBwGA1UdEQQVMBOCEXNoaWIudW5pLW1haW56LmRlMIGDBgNVHR8EfDB6
+MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1tYWluei1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
+bWFpbnotY2EvcHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHDMDMG
+CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
+U1AwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW1haW56
+LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDovL2Nk
+cDIucGNhLmRmbi5kZS91bmktbWFpbnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBCwUAA4IBAQCQACHxVetQU3UZoPVLDeXWTl6SBU8MAKNw6z6Y
+VRts0YC7bPUy44M+JT8nyQtZ3i/iiv7LpsGlAXhAI8V33vdckcKVAfzKW72dLHqb
+uVfNgNg51oOc3GfnEZ/CiqMeb24IThvhL05d2ozo5Sp455cUU5WumLERYQyYqkrO
+M6VaDqej+QIgKFmUHqDy1MpFFr1cmTQa0G8aCccAHPzMDzpsy4ixjL+MeV/XQDr3
+4Wjha/zHnj7H5lVSNXdKuo8JwBERv5nf++6IiJs8R7agG7h9Lg9sc5oXyY+dv3pO
+KYeXaQluI5vCZTsL0vjTNZ1kphU4MWsXGXXtiP5p2G+cZw8s
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
index 0f241f76..39f61b7d 100644
--- a/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.unibo.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.unibo.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-26T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
index e549d1e9..c03e8446 100644
--- a/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.to.cnr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.to.cnr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml
index 381d48a2..8e19c13b 100644
--- a/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml
@@ -18,6 +18,42 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIFETCCA/mgAwIBAgIUf6ORiSVI2C32bVc/pw0qlk211l4wDQYJKoZIhvcNAQEL
+ BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+ BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MTEwMzEyMDQy
+ M1oXDTE4MTEwMzEyMDQxOVowgZ0xCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Ob3R0
+ aW5naGFtc2hpcmUxEzARBgNVBAcTCk5PVFRJTkdIQU0xJDAiBgNVBAoTG05vdHRp
+ bmdoYW0gVHJlbnQgVW5pdmVyc2l0eTEcMBoGA1UECxMTSW5mb3JtYXRpb24gU3lz
+ dGVtczEbMBkGA1UEAxMSc2hpYjJpZHAubnR1LmFjLnVrMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEAtn3OZnkj82U1qep4KBD8tMy2A84GtKZj14us/mCz
+ U4JBMQWoBUhihZfhLNErE4EQllz5wUAEDfYYwnclcngY2X6nzgqTJuGmrQLZfukF
+ RPzBfdrQnJGTg/3/dIvCGJ+KfqIt5fGEAwYVpMJaDg6LjBcZSgjmppOocEKVQJyd
+ ZWEZtKp5+PLDIfQ4btrxw1mCOo/ngEGB8owPeFXstxIweC+9XNhJp4c8L2iZEsfy
+ rNSE+0KFb7DI2sdEbFyaDixLSFlX5CY7fhUStPUzMOnhXnl2UR9hdgH8x60zu0iU
+ AIXLx0cs81W+VtX2xgsg42oB/dw/6rfFWT37EmXuJi+cQQIDAQABo4IBljCCAZIw
+ cwYIKwYBBQUHAQEEZzBlMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRp
+ c2dsb2JhbC5jb20wNwYIKwYBBQUHMAKGK2h0dHA6Ly90cnVzdC5xdW92YWRpc2ds
+ b2JhbC5jb20vcXZzc2xnMi5jcnQwHQYDVR0RBBYwFIISc2hpYjJpZHAubnR1LmFj
+ LnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEWKGh0
+ dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/
+ BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
+ gBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
+ Y3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQUdOYX
+ CiIw/0+Pmuy3G+dj7ShaC0kwDQYJKoZIhvcNAQELBQADggEBAEG6I9qcqCWJzXDe
+ YzumSW1UKABfa3lSs8F+7G5cWHPq39C5Eas8+ZUpDytTug6pg2CLn9qWIjW2hstY
+ BuPkFULUL1nmJP8iLiY5YtdfFG9GS7gHAPy9urAAR7i6UMSlqJgfyIHlY6kPxv4+
+ IUHPQC0LVUFzQhHrFkjdBj5IcH1KIT0/b7T8IwovtRDGCyBoXeUr5y7uZjzmVGF4
+ Uq+fiME+67uMhY9TV9ERdn+NiYkxScu/2WSve5ZrsfrwxQTe9FhgYnMDv2JNGSUk
+ Jxl/t3PafEIUbWMpcSWZinaLGZ/2nZ9cRH3fgu45o1co8CjjrDHTGSrWdjhKrmgM
+ fjw7AVA=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEzzCCA7egAwIBAgIQZVN9rG0l85bNmeRDGBbHLzANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEyMTEyMDAwMDAwMFoXDTE1MTEyMDIzNTk1OVowgZ0xCzAJBgNV
@@ -65,6 +101,42 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIFETCCA/mgAwIBAgIUf6ORiSVI2C32bVc/pw0qlk211l4wDQYJKoZIhvcNAQEL
+ BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+ BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MTEwMzEyMDQy
+ M1oXDTE4MTEwMzEyMDQxOVowgZ0xCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Ob3R0
+ aW5naGFtc2hpcmUxEzARBgNVBAcTCk5PVFRJTkdIQU0xJDAiBgNVBAoTG05vdHRp
+ bmdoYW0gVHJlbnQgVW5pdmVyc2l0eTEcMBoGA1UECxMTSW5mb3JtYXRpb24gU3lz
+ dGVtczEbMBkGA1UEAxMSc2hpYjJpZHAubnR1LmFjLnVrMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEAtn3OZnkj82U1qep4KBD8tMy2A84GtKZj14us/mCz
+ U4JBMQWoBUhihZfhLNErE4EQllz5wUAEDfYYwnclcngY2X6nzgqTJuGmrQLZfukF
+ RPzBfdrQnJGTg/3/dIvCGJ+KfqIt5fGEAwYVpMJaDg6LjBcZSgjmppOocEKVQJyd
+ ZWEZtKp5+PLDIfQ4btrxw1mCOo/ngEGB8owPeFXstxIweC+9XNhJp4c8L2iZEsfy
+ rNSE+0KFb7DI2sdEbFyaDixLSFlX5CY7fhUStPUzMOnhXnl2UR9hdgH8x60zu0iU
+ AIXLx0cs81W+VtX2xgsg42oB/dw/6rfFWT37EmXuJi+cQQIDAQABo4IBljCCAZIw
+ cwYIKwYBBQUHAQEEZzBlMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRp
+ c2dsb2JhbC5jb20wNwYIKwYBBQUHMAKGK2h0dHA6Ly90cnVzdC5xdW92YWRpc2ds
+ b2JhbC5jb20vcXZzc2xnMi5jcnQwHQYDVR0RBBYwFIISc2hpYjJpZHAubnR1LmFj
+ LnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEWKGh0
+ dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/
+ BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
+ gBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
+ Y3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQUdOYX
+ CiIw/0+Pmuy3G+dj7ShaC0kwDQYJKoZIhvcNAQELBQADggEBAEG6I9qcqCWJzXDe
+ YzumSW1UKABfa3lSs8F+7G5cWHPq39C5Eas8+ZUpDytTug6pg2CLn9qWIjW2hstY
+ BuPkFULUL1nmJP8iLiY5YtdfFG9GS7gHAPy9urAAR7i6UMSlqJgfyIHlY6kPxv4+
+ IUHPQC0LVUFzQhHrFkjdBj5IcH1KIT0/b7T8IwovtRDGCyBoXeUr5y7uZjzmVGF4
+ Uq+fiME+67uMhY9TV9ERdn+NiYkxScu/2WSve5ZrsfrwxQTe9FhgYnMDv2JNGSUk
+ Jxl/t3PafEIUbWMpcSWZinaLGZ/2nZ9cRH3fgu45o1co8CjjrDHTGSrWdjhKrmgM
+ fjw7AVA=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEzzCCA7egAwIBAgIQZVN9rG0l85bNmeRDGBbHLzANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEyMTEyMDAwMDAwMFoXDTE1MTEyMDIzNTk1OVowgZ0xCzAJBgNV
diff --git a/swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml b/swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml
new file mode 100644
index 00000000..73c8c82a
--- /dev/null
+++ b/swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.ws.seemis.gov.scot/shibboleth-sp">
+ <!--
+ This is a "Glow Services" Shibboleth SP for SEEMIS Group LLP.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC1jCCAb6gAwIBAgIJANnFj5LehaRsMA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
+ BAMTBXNoaWJiMB4XDTEwMDkxMzE0MjEyMloXDTIwMDkxMDE0MjEyMlowEDEOMAwG
+ A1UEAxMFc2hpYmIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtSXC9
+ 5Iq68ruXAxPoscW47pepV3+UBJne3/lJ5VxdI3n3QbmM0GfMrd3jDkS4r2BgnYF1
+ veTqa9BCCGKh5Hp6ISDo9dZ4Si/zllypDYhOmcBBbuUr/bjAj7y7hjp9Q18yHBnO
+ FmeYQIXfI5Q5gbEaTT3JCON+65nVMH3rifQvoGU9Dbxwo2INR0lmZtLBpPgeq+2i
+ Gt+FKLOOOey0ydB0eKD2qDASoqQhOKKNTvgxmWGWiXQwswRQNygLyvbnJ+pIf0GG
+ YyHCyplLkq99nEeChSx7wSjaiD9J5uUDEICJAZo6V6vqNC+DJu6Ztx4Tq1w39m0A
+ QuwgWV4d5XQTLnftAgMBAAGjMzAxMBAGA1UdEQQJMAeCBXNoaWJiMB0GA1UdDgQW
+ BBTuy95SjJcKxjwAb2d7iwYOHVJMETANBgkqhkiG9w0BAQUFAAOCAQEAOeOhi+4R
+ GhqXhKLiw8yUCOSff4x+dDfjzseeWUeBhVyYeMsAklANvDE7nlKB8gcQv9HgHaLC
+ fbo2bGQegAumPYkNBbLbHk5wMM9lcKV+h08ak54ufgY5dxdKN2YYl9EC56egzuJg
+ hTWoSRbwML5X6CGKuKMLSCiEVJXS8hmZHJl1kxmwXKAqArUhFwhfFMYxBbXnBUSV
+ gI3Rbjt43XXJJEt6BhLaLVxqmzndyabdI2u3zx6CdtvFynSPDOA/p8Rifcrfzt20
+ l5nkqOEMNUx0VHYCZ/W+pt8AmPMWGRWjL2wcUndgwrdBVqaeT7Dmz7ozeniJbF1n
+ mCaszq2WwCToAw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC1jCCAb6gAwIBAgIJANnFj5LehaRsMA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
+ BAMTBXNoaWJiMB4XDTEwMDkxMzE0MjEyMloXDTIwMDkxMDE0MjEyMlowEDEOMAwG
+ A1UEAxMFc2hpYmIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtSXC9
+ 5Iq68ruXAxPoscW47pepV3+UBJne3/lJ5VxdI3n3QbmM0GfMrd3jDkS4r2BgnYF1
+ veTqa9BCCGKh5Hp6ISDo9dZ4Si/zllypDYhOmcBBbuUr/bjAj7y7hjp9Q18yHBnO
+ FmeYQIXfI5Q5gbEaTT3JCON+65nVMH3rifQvoGU9Dbxwo2INR0lmZtLBpPgeq+2i
+ Gt+FKLOOOey0ydB0eKD2qDASoqQhOKKNTvgxmWGWiXQwswRQNygLyvbnJ+pIf0GG
+ YyHCyplLkq99nEeChSx7wSjaiD9J5uUDEICJAZo6V6vqNC+DJu6Ztx4Tq1w39m0A
+ QuwgWV4d5XQTLnftAgMBAAGjMzAxMBAGA1UdEQQJMAeCBXNoaWJiMB0GA1UdDgQW
+ BBTuy95SjJcKxjwAb2d7iwYOHVJMETANBgkqhkiG9w0BAQUFAAOCAQEAOeOhi+4R
+ GhqXhKLiw8yUCOSff4x+dDfjzseeWUeBhVyYeMsAklANvDE7nlKB8gcQv9HgHaLC
+ fbo2bGQegAumPYkNBbLbHk5wMM9lcKV+h08ak54ufgY5dxdKN2YYl9EC56egzuJg
+ hTWoSRbwML5X6CGKuKMLSCiEVJXS8hmZHJl1kxmwXKAqArUhFwhfFMYxBbXnBUSV
+ gI3Rbjt43XXJJEt6BhLaLVxqmzndyabdI2u3zx6CdtvFynSPDOA/p8Rifcrfzt20
+ l5nkqOEMNUx0VHYCZ/W+pt8AmPMWGRWjL2wcUndgwrdBVqaeT7Dmz7ozeniJbF1n
+ mCaszq2WwCToAw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.ws.seemis.gov.scot/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibb.ws.seemis.gov.scot/Shibboleth.sso/SAML/POST" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">SEEMIS Group LLP</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">SEEMIS Group LLP: Glow Services</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.seemis.gov.scot/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>SEEMIS Helpdesk</GivenName>
+ <EmailAddress>mailto:letters@seemis.gov.scot</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Ian</GivenName>
+ <SurName>Mountfort</SurName>
+ <EmailAddress>mailto:ian.mountfort@seemis.gov.scot</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
index 3479e144..bf722d98 100644
--- a/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
@@ -106,19 +106,19 @@ nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
<md:ContactPerson contactType="administrative">
<md:Company>Jönköping University</md:Company>
<md:SurName>Joakim Danielsson</md:SurName>
- <md:EmailAddress>Joakim.Danielsson@hj.se</md:EmailAddress>
+ <md:EmailAddress>mailto:Joakim.Danielsson@hj.se</md:EmailAddress>
<md:TelephoneNumber>+46 36 101116</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Jönköping University</md:Company>
<md:SurName>Stefan Kindh</md:SurName>
- <md:EmailAddress>Stefan.Kindh@hj.se</md:EmailAddress>
+ <md:EmailAddress>mailto:Stefan.Kindh@hj.se</md:EmailAddress>
<md:TelephoneNumber>+46 36 101170</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Jönköping University</md:Company>
<md:SurName>IT-Helpdesk</md:SurName>
- <md:EmailAddress>helpdesk@hj.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@hj.se</md:EmailAddress>
<md:TelephoneNumber>+46 36 101112</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml
index 7528a32f..2c819725 100644
--- a/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml
@@ -102,19 +102,19 @@ B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
<md:ContactPerson contactType="administrative">
<md:Company>Lulea University of Technology</md:Company>
<md:SurName>LTU Servicedesk</md:SurName>
- <md:EmailAddress>its-idp@list.ltu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
<md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Lulea University of Technology</md:Company>
<md:SurName>LTU Servicedesk</md:SurName>
- <md:EmailAddress>its-idp@list.ltu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
<md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Lulea University of Technology</md:Company>
<md:SurName>LTU Servicedesk</md:SurName>
- <md:EmailAddress>its-idp@list.ltu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
<md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
index b0abeaff..6c534b2d 100644
--- a/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
@@ -31,31 +31,28 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEcjCCA1qgAwIBAgIRAPfZ5zaSWEpw8Vc1xSSxyNgwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMTMwMDAwMDBaFw0xNTExMTMyMzU5NTlaME8xCzAJBgNV
- BAYTAkNaMSgwJgYDVQQKEx9UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBMaWJlcmVj
- MRYwFAYDVQQDEw1zaGliYm8udHVsLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
- MIIBCgKCAQEArstKIJXSamcd4N0fzyZ0ViFYVCJBZZU3QKmQ25NZq6Cfrw8kH75E
- SioySW1H4kSzTKLze7qTOLmVYpZyq68emuK+d2vf2wm9TPLYbjC+LVJKrPiRtRHF
- 7cCi2k5ONwENq7jnIvpq0Z+V30sC0/WfXESnjsB51/PklOa04YMwpUQDqQHsWl/8
- pG9fQ5G9OtzWUiYYHPbyNe3zZa1O9uUKpATKNuwtx49+b/VdNKW2voHieVG0beyE
- b59FR/Io4gVRevLxo2B/tkBaa8SmuTfCwyqSkkv59sywUObnN3KYmVUb8Fpmbx4X
- c1BJHi2wC6IqbTxWKS+e4FkqW3Snc0xNNwIDAQABo4IBYDCCAVwwHwYDVR0jBBgw
- FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNxZp6dM+6sOb4hhs74b
- sMtnL5OTMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
- CCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoG
- A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
- U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
- dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
- dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXNoaWJiby50dWwu
- Y3owDQYJKoZIhvcNAQEFBQADggEBAKfiwyXiInmGSgBMFTEGwFsaE0opLkvDEiSp
- +C4namIgpNTRIb7rsp1R+C8NgQaykoQTNdMgUJO94lF8VESOdfoYjkEYZi9KWs1U
- 9+wtdJxx0FY2NKhx2mgvF/FgTbNdUEEqW+5byWxTLXycTYe5ZIgbHgRcOupU9NKs
- dfl8zJKwqtOjOIm2fKE3Z8xULMvw8D6rV7dWuVFios3P4sBfkt0S5uK15mlX5lDI
- vZBzEWQ1L9C1GELPPMS56JYfObgJxGzcNZu+s6lXOINBoROYT/5p2mhI5xWeZWJZ
- zOSaicB9fW0hVsTwGJDw4hwESk9eLj3tlpyvWSYXvbf1Y06t8rw=
- </ds:X509Certificate>
+ MIID6jCCAtKgAwIBAgIBCjANBgkqhkiG9w0BAQsFADCBmjELMAkGA1UEBhMCQ1ox
+ EDAOBgNVBAcTB0xpYmVyZWMxKDAmBgNVBAoTH1RlY2huaWNhbCBVbml2ZXJzaXR5
+ IG9mIExpYmVyZWMxDjAMBgNVBAsTBUxpYW5lMSIwIAYDVQQDExlUVUwgQ2VydGlm
+ aWNhdGUgQXV0aG9yaXR5MRswGQYJKoZIhvcNAQkBFgxsaWFuZUB0dWwuY3owHhcN
+ MTUxMDI2MDAwMDAwWhcNMzAxMDI1MjM1OTU5WjBxMQswCQYDVQQGEwJDWjEQMA4G
+ A1UEBxMHTGliZXJlYzEoMCYGA1UEChMfVGVjaG5pY2FsIFVuaXZlcnNpdHkgb2Yg
+ TGliZXJlYzEOMAwGA1UECxMFTGlhbmUxFjAUBgNVBAMTDXNoaWJiby50dWwuY3ow
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdUYyRY1/QVM6cuR3mTWpw
+ wHdc6Aeuy/DNUcvzXUEnWZ6bhdPBScu231BBr9NCZ5wr8pZ3N4JB7n5qjScRqpz2
+ D1VOtb/BLy8mFEThE/wWE6DINbAMzF1FQjGE4vLO7FWt0G1nURxqe5USZkFLIZUL
+ Wqs1Fnrlfsl1hGbm2ELu/8gfXNbnKQKZ12a8qqojpwIec860+zGS+YkHyYz4IzUq
+ kRHM0KQG0qcPzeB3OdQMy44nhHknLeNQ7WIpVAn1bx6g3blyAYxEhqGVjGxbm2j1
+ r+FV2r/0ZrwVavM9aeOw3bX+F/M2VBPBsbimnuE/xYnjVhIN76PcsaMdtSsYR4+9
+ AgMBAAGjYzBhMAsGA1UdDwQEAwIFoDAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8v
+ bGlhbmUudHVsLmN6L2NybC90dWxDQS5jcmwwHgYJYIZIAYb4QgENBBEWD3hjYSBj
+ ZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQsFAAOCAQEAZfabkvqZVo4w4LOoLQfVtTP8
+ VCI/HoJsgAsYl7Gf2RngZ76XAePhza0JNCfo0SJDJBWca0VtX91EzazFWkRR1cEO
+ B0IwF0MVLQttZA8XItk0EaXi05sC/s4qeykLk31AP3mPD2SC58Vty2DbPCWJxLBQ
+ 31qNr9zxzVzDVAtzXkVWdfdRrgzFICDIfo9BqELUPCIcw2+/xzoy4h33NB05ZFa7
+ +UqvbZl6I4Rz3ZWHt8moGUGQF04kKGI3psHS6M0hxMQccNtbb269gFcuK5vb5AZa
+ nH0Q6NVuH5v93Y3fOM0wIgosOcrB90QrXq5BpWu+XL1VxhyPnSxTf/teOIy3hw==
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -78,31 +75,28 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEcjCCA1qgAwIBAgIRAPfZ5zaSWEpw8Vc1xSSxyNgwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMTMwMDAwMDBaFw0xNTExMTMyMzU5NTlaME8xCzAJBgNV
- BAYTAkNaMSgwJgYDVQQKEx9UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBMaWJlcmVj
- MRYwFAYDVQQDEw1zaGliYm8udHVsLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
- MIIBCgKCAQEArstKIJXSamcd4N0fzyZ0ViFYVCJBZZU3QKmQ25NZq6Cfrw8kH75E
- SioySW1H4kSzTKLze7qTOLmVYpZyq68emuK+d2vf2wm9TPLYbjC+LVJKrPiRtRHF
- 7cCi2k5ONwENq7jnIvpq0Z+V30sC0/WfXESnjsB51/PklOa04YMwpUQDqQHsWl/8
- pG9fQ5G9OtzWUiYYHPbyNe3zZa1O9uUKpATKNuwtx49+b/VdNKW2voHieVG0beyE
- b59FR/Io4gVRevLxo2B/tkBaa8SmuTfCwyqSkkv59sywUObnN3KYmVUb8Fpmbx4X
- c1BJHi2wC6IqbTxWKS+e4FkqW3Snc0xNNwIDAQABo4IBYDCCAVwwHwYDVR0jBBgw
- FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNxZp6dM+6sOb4hhs74b
- sMtnL5OTMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
- CCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoG
- A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
- U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
- dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
- dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXNoaWJiby50dWwu
- Y3owDQYJKoZIhvcNAQEFBQADggEBAKfiwyXiInmGSgBMFTEGwFsaE0opLkvDEiSp
- +C4namIgpNTRIb7rsp1R+C8NgQaykoQTNdMgUJO94lF8VESOdfoYjkEYZi9KWs1U
- 9+wtdJxx0FY2NKhx2mgvF/FgTbNdUEEqW+5byWxTLXycTYe5ZIgbHgRcOupU9NKs
- dfl8zJKwqtOjOIm2fKE3Z8xULMvw8D6rV7dWuVFios3P4sBfkt0S5uK15mlX5lDI
- vZBzEWQ1L9C1GELPPMS56JYfObgJxGzcNZu+s6lXOINBoROYT/5p2mhI5xWeZWJZ
- zOSaicB9fW0hVsTwGJDw4hwESk9eLj3tlpyvWSYXvbf1Y06t8rw=
- </ds:X509Certificate>
+ MIID6jCCAtKgAwIBAgIBCjANBgkqhkiG9w0BAQsFADCBmjELMAkGA1UEBhMCQ1ox
+ EDAOBgNVBAcTB0xpYmVyZWMxKDAmBgNVBAoTH1RlY2huaWNhbCBVbml2ZXJzaXR5
+ IG9mIExpYmVyZWMxDjAMBgNVBAsTBUxpYW5lMSIwIAYDVQQDExlUVUwgQ2VydGlm
+ aWNhdGUgQXV0aG9yaXR5MRswGQYJKoZIhvcNAQkBFgxsaWFuZUB0dWwuY3owHhcN
+ MTUxMDI2MDAwMDAwWhcNMzAxMDI1MjM1OTU5WjBxMQswCQYDVQQGEwJDWjEQMA4G
+ A1UEBxMHTGliZXJlYzEoMCYGA1UEChMfVGVjaG5pY2FsIFVuaXZlcnNpdHkgb2Yg
+ TGliZXJlYzEOMAwGA1UECxMFTGlhbmUxFjAUBgNVBAMTDXNoaWJiby50dWwuY3ow
+ ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdUYyRY1/QVM6cuR3mTWpw
+ wHdc6Aeuy/DNUcvzXUEnWZ6bhdPBScu231BBr9NCZ5wr8pZ3N4JB7n5qjScRqpz2
+ D1VOtb/BLy8mFEThE/wWE6DINbAMzF1FQjGE4vLO7FWt0G1nURxqe5USZkFLIZUL
+ Wqs1Fnrlfsl1hGbm2ELu/8gfXNbnKQKZ12a8qqojpwIec860+zGS+YkHyYz4IzUq
+ kRHM0KQG0qcPzeB3OdQMy44nhHknLeNQ7WIpVAn1bx6g3blyAYxEhqGVjGxbm2j1
+ r+FV2r/0ZrwVavM9aeOw3bX+F/M2VBPBsbimnuE/xYnjVhIN76PcsaMdtSsYR4+9
+ AgMBAAGjYzBhMAsGA1UdDwQEAwIFoDAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8v
+ bGlhbmUudHVsLmN6L2NybC90dWxDQS5jcmwwHgYJYIZIAYb4QgENBBEWD3hjYSBj
+ ZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQsFAAOCAQEAZfabkvqZVo4w4LOoLQfVtTP8
+ VCI/HoJsgAsYl7Gf2RngZ76XAePhza0JNCfo0SJDJBWca0VtX91EzazFWkRR1cEO
+ B0IwF0MVLQttZA8XItk0EaXi05sC/s4qeykLk31AP3mPD2SC58Vty2DbPCWJxLBQ
+ 31qNr9zxzVzDVAtzXkVWdfdRrgzFICDIfo9BqELUPCIcw2+/xzoy4h33NB05ZFa7
+ +UqvbZl6I4Rz3ZWHt8moGUGQF04kKGI3psHS6M0hxMQccNtbb269gFcuK5vb5AZa
+ nH0Q6NVuH5v93Y3fOM0wIgosOcrB90QrXq5BpWu+XL1VxhyPnSxTf/teOIy3hw==
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
index fdf95478..bf608871 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
@@ -14,8 +14,8 @@
<mdui:DisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
<mdui:Description xml:lang="de">Wir bieten als Hochschulrechenzentrum für die Georg-August-Universität Göttingen und als Rechen- und IT-Kompetenzzentrum für die Max-Planck-Gesellschaft ein breites Spektrum an Informations- und Kommunikationsleistungen für die Wissenschaft.</mdui:Description>
<mdui:Description xml:lang="en">We offer as a university computer center of the Georg-August-University of Göttingen and as computing and IT competence center for the Max Planck Society, a wide range of information and communication services to science.</mdui:Description>
- <mdui:Logo height="16" width="16">https://www.gwdg.de/fileadmin/images/favicon.ico</mdui:Logo>
- <mdui:Logo height="72" width="240">https://www.gwdg.de/fileadmin/images/neu/logo.png</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://shibboleth-idp.gwdg.de/favicon.ico</mdui:Logo>
+ <mdui:Logo height="72" width="240">https://shibboleth-idp.gwdg.de/logo.png</mdui:Logo>
<mdui:InformationURL xml:lang="de">http://gwdg.de</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://gwdg.de</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="de">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml b/swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml
index 51dfdb1b..a953b4d7 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml
@@ -27,32 +27,29 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIE0DCCA7igAwIBAgIQaz0mInuiKQ8z3tKWaoYaizANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMTAxMDAwMDAwMFoXDTE1MTAxMDIzNTk1OVowgZ8xCzAJBgNV
- BAYTAkdSMREwDwYDVQQIEwhIZXJha2xpbzERMA8GA1UEBxMISGVyYWtsaW8xNjA0
- BgNVBAoULUZvdW5kYXRpb24gZm9yIFJlc2VhcmNoICYgVGVjaG5vbG9neSAtIEhl
- bGxhczEMMAoGA1UECxMDSUNTMSQwIgYDVQQDExtzaGliYm9sZXRoLWlkcC5pY3Mu
- Zm9ydGguZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxgLe/0SIu
- 2fO5NavCHRrGqv9CeA5relNbiYm8ORK4ZlDTtckVEJJV684Tm5vvSL4+shd3Gr1I
- rDjx9I1aBGtT/7Lo7kwkaosGk3dgmpBXo35GkV+D/+AadV/0P89rV9y7bZL5DqR6
- qcJMDrHCs1okrCuTXnpp6aBrKexor4K9vOQOw8V8nM1fRMKZJVFGGzkMfMkK8BFl
- FRYzm49X5KTA3TUumRHkk1KtPcQapi2Ln7Pgsl1ykholk0dqZJ9D0tuyJcCizv0e
- qK8B/F8FfB5DWXQxqfJR6syHQcvUvFbFxNuvT8aPDPf2GW6vUoSjZjcoMoVumbPB
- 17QxVFnbyxpDAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
- V0fqkOO57TAdBgNVHQ4EFgQUzhxHKvXot/qQQ61zkc6+tSE0680wDgYDVR0PAQH/
- BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
- BwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4Yp
- aHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYB
- BQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3Jn
- L1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRl
- cmVuYS5vcmcwJgYDVR0RBB8wHYIbc2hpYmJvbGV0aC1pZHAuaWNzLmZvcnRoLmdy
- MA0GCSqGSIb3DQEBBQUAA4IBAQCj6EmaSBrWmZ56r+JaKIkLtfBZ5qEtPHlPI0QJ
- mE2JXaZlWQRvb1s1WmRDRd5QTUB9VAKNhXS+XVyp/zBBiFWpvEPbAWktn4pgnOKF
- GmRrjaxEhsjF8wK3I1vzc6YBCOSkj9zY8/8Bz8CweCtqwz+IrgbIJJUGO1H1ihDO
- FG+zViUn047rwbcRkKFfNdeUEQXGaLVga5L1ihdePtJvw1qDd7m7TUwvNqlkexPg
- egbceaKohLi+Rc1fXgZSEWX+R+Oej+o+uP8M2aaiYRP0EhdniW8uv5OaAOtsa/A5
- boL5qHjUg0FZo3xxvlp3GnGLqgiHfukVs0noXUgNSVOIJbqD
+ MIIECTCCAvGgAwIBAgIJAIAFFNmTM96cMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
+ VQQGEwJHUjEOMAwGA1UECAwFQ3JldGUxEjAQBgNVBAcMCUhlcmFrbGlvbjEOMAwG
+ A1UECgwFRk9SVEgxDDAKBgNVBAsMA0lDUzEkMCIGA1UEAwwbc2hpYmJvbGV0aC1p
+ ZHAuaWNzLmZvcnRoLmdyMSMwIQYJKoZIhvcNAQkBFhRzdXBwb3J0QGljcy5mb3J0
+ aC5ncjAeFw0xNTEwMDgxMDM5MjBaFw00MDEwMDExMDM5MjBaMIGaMQswCQYDVQQG
+ EwJHUjEOMAwGA1UECAwFQ3JldGUxEjAQBgNVBAcMCUhlcmFrbGlvbjEOMAwGA1UE
+ CgwFRk9SVEgxDDAKBgNVBAsMA0lDUzEkMCIGA1UEAwwbc2hpYmJvbGV0aC1pZHAu
+ aWNzLmZvcnRoLmdyMSMwIQYJKoZIhvcNAQkBFhRzdXBwb3J0QGljcy5mb3J0aC5n
+ cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK44C09K73i6drwcyTYY
+ yfUHRdNoecBGCKiEW4Nv3XPROKyJEpZeXcqNIjX9Ay5tCgXLI7pwVyD2zvmrw9J+
+ Bh2zJUSez5icumO3kwoQd+5kt9vqusHCs168ttlcSQ7ulWReSU0geS+uQ7uY2MOw
+ m1dCSZJ8lBX3l13AZ/KIm2+Q/zt6FDy42ZliosWoi+HBns7W3PzpjSWtfpq+scyd
+ 7jAu8y/pyYoWUK6FCp2CuRSHl4DPzMKcUXdbmN0WsjZVPmnRCedXqXpfu21DRJRK
+ aI47OJ2E29XqqqiLozbwSsex9sOy8rDyqkwXF5jxfRsTBZTCuT3pOiFnfUJQCeI9
+ 0PUCAwEAAaNQME4wHQYDVR0OBBYEFB0BaUQoT2qrSl67KfbiuzComuW2MB8GA1Ud
+ IwQYMBaAFB0BaUQoT2qrSl67KfbiuzComuW2MAwGA1UdEwQFMAMBAf8wDQYJKoZI
+ hvcNAQEFBQADggEBAIQfZ8sg/vT2r3FBaF79wUN5Y0IzvsAhBGcswiljzOJDxOn/
+ xFLgUjhmpwW7Mo8siDR5RVg0ANRw5nMdvG05SkhJsuzKgQkweQin3NflNR5U5ZOe
+ 3oOM7gMvSP0OR6e1o7PdTU9QnDiWrB760lwUf1ny86dUooNZ0VZNo/CU+2IB6dnQ
+ K3H7c0cMoWoMFolzhsAxg/HZvv0igIMAJ83Nj0ktzpxJR4s9vSTL+RTVHL3vRVjG
+ mXvUT48DDF48hmWDN9rh1aApoBf+OvrVGfeaazdMrK/ho6xts+kbJdCumfGx5cyP
+ AXf1z42E/mE/ELURJf75+xO8AShPK4Ua/5qsbnM=
+
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -82,32 +79,29 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIE0DCCA7igAwIBAgIQaz0mInuiKQ8z3tKWaoYaizANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMTAxMDAwMDAwMFoXDTE1MTAxMDIzNTk1OVowgZ8xCzAJBgNV
- BAYTAkdSMREwDwYDVQQIEwhIZXJha2xpbzERMA8GA1UEBxMISGVyYWtsaW8xNjA0
- BgNVBAoULUZvdW5kYXRpb24gZm9yIFJlc2VhcmNoICYgVGVjaG5vbG9neSAtIEhl
- bGxhczEMMAoGA1UECxMDSUNTMSQwIgYDVQQDExtzaGliYm9sZXRoLWlkcC5pY3Mu
- Zm9ydGguZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxgLe/0SIu
- 2fO5NavCHRrGqv9CeA5relNbiYm8ORK4ZlDTtckVEJJV684Tm5vvSL4+shd3Gr1I
- rDjx9I1aBGtT/7Lo7kwkaosGk3dgmpBXo35GkV+D/+AadV/0P89rV9y7bZL5DqR6
- qcJMDrHCs1okrCuTXnpp6aBrKexor4K9vOQOw8V8nM1fRMKZJVFGGzkMfMkK8BFl
- FRYzm49X5KTA3TUumRHkk1KtPcQapi2Ln7Pgsl1ykholk0dqZJ9D0tuyJcCizv0e
- qK8B/F8FfB5DWXQxqfJR6syHQcvUvFbFxNuvT8aPDPf2GW6vUoSjZjcoMoVumbPB
- 17QxVFnbyxpDAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
- V0fqkOO57TAdBgNVHQ4EFgQUzhxHKvXot/qQQ61zkc6+tSE0680wDgYDVR0PAQH/
- BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
- BwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4Yp
- aHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYB
- BQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3Jn
- L1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRl
- cmVuYS5vcmcwJgYDVR0RBB8wHYIbc2hpYmJvbGV0aC1pZHAuaWNzLmZvcnRoLmdy
- MA0GCSqGSIb3DQEBBQUAA4IBAQCj6EmaSBrWmZ56r+JaKIkLtfBZ5qEtPHlPI0QJ
- mE2JXaZlWQRvb1s1WmRDRd5QTUB9VAKNhXS+XVyp/zBBiFWpvEPbAWktn4pgnOKF
- GmRrjaxEhsjF8wK3I1vzc6YBCOSkj9zY8/8Bz8CweCtqwz+IrgbIJJUGO1H1ihDO
- FG+zViUn047rwbcRkKFfNdeUEQXGaLVga5L1ihdePtJvw1qDd7m7TUwvNqlkexPg
- egbceaKohLi+Rc1fXgZSEWX+R+Oej+o+uP8M2aaiYRP0EhdniW8uv5OaAOtsa/A5
- boL5qHjUg0FZo3xxvlp3GnGLqgiHfukVs0noXUgNSVOIJbqD
+ MIIECTCCAvGgAwIBAgIJAIAFFNmTM96cMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
+ VQQGEwJHUjEOMAwGA1UECAwFQ3JldGUxEjAQBgNVBAcMCUhlcmFrbGlvbjEOMAwG
+ A1UECgwFRk9SVEgxDDAKBgNVBAsMA0lDUzEkMCIGA1UEAwwbc2hpYmJvbGV0aC1p
+ ZHAuaWNzLmZvcnRoLmdyMSMwIQYJKoZIhvcNAQkBFhRzdXBwb3J0QGljcy5mb3J0
+ aC5ncjAeFw0xNTEwMDgxMDM5MjBaFw00MDEwMDExMDM5MjBaMIGaMQswCQYDVQQG
+ EwJHUjEOMAwGA1UECAwFQ3JldGUxEjAQBgNVBAcMCUhlcmFrbGlvbjEOMAwGA1UE
+ CgwFRk9SVEgxDDAKBgNVBAsMA0lDUzEkMCIGA1UEAwwbc2hpYmJvbGV0aC1pZHAu
+ aWNzLmZvcnRoLmdyMSMwIQYJKoZIhvcNAQkBFhRzdXBwb3J0QGljcy5mb3J0aC5n
+ cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK44C09K73i6drwcyTYY
+ yfUHRdNoecBGCKiEW4Nv3XPROKyJEpZeXcqNIjX9Ay5tCgXLI7pwVyD2zvmrw9J+
+ Bh2zJUSez5icumO3kwoQd+5kt9vqusHCs168ttlcSQ7ulWReSU0geS+uQ7uY2MOw
+ m1dCSZJ8lBX3l13AZ/KIm2+Q/zt6FDy42ZliosWoi+HBns7W3PzpjSWtfpq+scyd
+ 7jAu8y/pyYoWUK6FCp2CuRSHl4DPzMKcUXdbmN0WsjZVPmnRCedXqXpfu21DRJRK
+ aI47OJ2E29XqqqiLozbwSsex9sOy8rDyqkwXF5jxfRsTBZTCuT3pOiFnfUJQCeI9
+ 0PUCAwEAAaNQME4wHQYDVR0OBBYEFB0BaUQoT2qrSl67KfbiuzComuW2MB8GA1Ud
+ IwQYMBaAFB0BaUQoT2qrSl67KfbiuzComuW2MAwGA1UdEwQFMAMBAf8wDQYJKoZI
+ hvcNAQEFBQADggEBAIQfZ8sg/vT2r3FBaF79wUN5Y0IzvsAhBGcswiljzOJDxOn/
+ xFLgUjhmpwW7Mo8siDR5RVg0ANRw5nMdvG05SkhJsuzKgQkweQin3NflNR5U5ZOe
+ 3oOM7gMvSP0OR6e1o7PdTU9QnDiWrB760lwUf1ny86dUooNZ0VZNo/CU+2IB6dnQ
+ K3H7c0cMoWoMFolzhsAxg/HZvv0igIMAJ83Nj0ktzpxJR4s9vSTL+RTVHL3vRVjG
+ mXvUT48DDF48hmWDN9rh1aApoBf+OvrVGfeaazdMrK/ho6xts+kbJdCumfGx5cyP
+ AXf1z42E/mE/ELURJf75+xO8AShPK4Ua/5qsbnM=
+
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml
index 5904e8ed..8d24391d 100644
--- a/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml
@@ -88,9 +88,9 @@
<OrganizationURL xml:lang="en">http://www.burycollege.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Pam</GivenName>
- <SurName>Riley</SurName>
- <EmailAddress>mailto:pam.riley@burycollege.ac.uk</EmailAddress>
+ <GivenName>Louise</GivenName>
+ <SurName>Minta</SurName>
+ <EmailAddress>mailto:louise.minta@burycollege.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Dominic</GivenName>
diff --git a/swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml
new file mode 100644
index 00000000..029c28c0
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cbpf.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cbpf.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:DisplayName>
+ <mdui:Description xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:Description>
+ <mdui:Description xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://portal.cbpf.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://portal.cbpf.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxNjA0BgNVBAoTLUNCUEYgLSBD
+ZW50cm8gQnJhc2lsZWlybyBkZSBQZXNxdWlzYXMgRmlzaWNhczEMMAoGA1UECxMD
+Q0FUMRwwGgYJKoZIhvcNAQkBFg1sYW5uYUBjYnBmLmJyMRcwFQYDVQQHEw5SaW8g
+ZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJBgNVBAYTAkJS
+MRswGQYDVQQDExJzaGliYm9sZXRoLmNicGYuYnIwHhcNMTUxMDE2MTQxOTE3WhcN
+MTgxMDE1MTQxOTE3WjCBwDE2MDQGA1UEChMtQ0JQRiAtIENlbnRybyBCcmFzaWxl
+aXJvIGRlIFBlc3F1aXNhcyBGaXNpY2FzMQwwCgYDVQQLEwNDQVQxHDAaBgkqhkiG
+9w0BCQEWDWxhbm5hQGNicGYuYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcw
+FQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxGzAZBgNVBAMTEnNo
+aWJib2xldGguY2JwZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AOP5KsReKesB+mSCPtKECtbEHR4HmL5nDtsirSweQs/0B91kQoYgNl7AMpmOt25p
+sGrWAF8poXJIZsFnVeFPRxXxamtOsbsmCNc5RFipG7ZNpnJEmH+TFVAFfBzav/xj
+hH0RQPGJ2CxGBxeS+zY6GzKqlKRCNTP0uud/dVeVw2A17FNJbOA7kEucrhVyxI1D
+7nOrYuMmL4H84Pe7SpXHWpdEZaiiuvbSW1XM+mHNlvBDNOWLilTB+LP7Xjq7Fpjr
+XTGvJ+zKL9SMEOnn8lc/6Iszu4ffg0S5xbJ+wwqBND2SLNxvJQtF9Ee3b/KjA2AI
+MRc4ZZ8eQZq4RKD65BBW7zkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlbBD9rz1
+TZSKOHEkt0TwLnhlwKJBqAQYrhr4kMeJdEmnQszWYNPmTnuaJ7byo0U95g9mJDRm
+qS+tX+qIOv/ds9qKY9bEXZOGKMo0srgMWaKufEOegxaZkP6x3nhCB6DzEmXuMVg+
+1HDGoHIZJuDZpXEE3Hdu1KiuQFhmcnO5MQ99WoMI3+Vy36Wrm/mdhyplkLTb1S3S
+mtit3VgXMl3KNv9IcRISBY9oyZdOTzHP/676+HwNYB888FApyKlmLnTvMtxCwuI8
+p2bQTau4MNCPHLB6bYabI5bb21dowUM2UHgRMMQ3KtX9QADp8jQquqO10GIciPe4
+XQmKkysRlE2Thg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cbpf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cbpf.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cbpf.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cbpf.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cbpf.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxNjA0BgNVBAoTLUNCUEYgLSBD
+ZW50cm8gQnJhc2lsZWlybyBkZSBQZXNxdWlzYXMgRmlzaWNhczEMMAoGA1UECxMD
+Q0FUMRwwGgYJKoZIhvcNAQkBFg1sYW5uYUBjYnBmLmJyMRcwFQYDVQQHEw5SaW8g
+ZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJBgNVBAYTAkJS
+MRswGQYDVQQDExJzaGliYm9sZXRoLmNicGYuYnIwHhcNMTUxMDE2MTQxOTE3WhcN
+MTgxMDE1MTQxOTE3WjCBwDE2MDQGA1UEChMtQ0JQRiAtIENlbnRybyBCcmFzaWxl
+aXJvIGRlIFBlc3F1aXNhcyBGaXNpY2FzMQwwCgYDVQQLEwNDQVQxHDAaBgkqhkiG
+9w0BCQEWDWxhbm5hQGNicGYuYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcw
+FQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxGzAZBgNVBAMTEnNo
+aWJib2xldGguY2JwZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AOP5KsReKesB+mSCPtKECtbEHR4HmL5nDtsirSweQs/0B91kQoYgNl7AMpmOt25p
+sGrWAF8poXJIZsFnVeFPRxXxamtOsbsmCNc5RFipG7ZNpnJEmH+TFVAFfBzav/xj
+hH0RQPGJ2CxGBxeS+zY6GzKqlKRCNTP0uud/dVeVw2A17FNJbOA7kEucrhVyxI1D
+7nOrYuMmL4H84Pe7SpXHWpdEZaiiuvbSW1XM+mHNlvBDNOWLilTB+LP7Xjq7Fpjr
+XTGvJ+zKL9SMEOnn8lc/6Iszu4ffg0S5xbJ+wwqBND2SLNxvJQtF9Ee3b/KjA2AI
+MRc4ZZ8eQZq4RKD65BBW7zkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlbBD9rz1
+TZSKOHEkt0TwLnhlwKJBqAQYrhr4kMeJdEmnQszWYNPmTnuaJ7byo0U95g9mJDRm
+qS+tX+qIOv/ds9qKY9bEXZOGKMo0srgMWaKufEOegxaZkP6x3nhCB6DzEmXuMVg+
+1HDGoHIZJuDZpXEE3Hdu1KiuQFhmcnO5MQ99WoMI3+Vy36Wrm/mdhyplkLTb1S3S
+mtit3VgXMl3KNv9IcRISBY9oyZdOTzHP/676+HwNYB888FApyKlmLnTvMtxCwuI8
+p2bQTau4MNCPHLB6bYabI5bb21dowUM2UHgRMMQ3KtX9QADp8jQquqO10GIciPe4
+XQmKkysRlE2Thg==
+
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://portal.cbpf.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://portal.cbpf.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Orlanna Oliveira</md:SurName>
+ <md:EmailAddress>lanna@cbpf.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml
new file mode 100644
index 00000000..123b7bfe
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cefet-rj.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cefet-rj.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:DisplayName>
+ <mdui:Description xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:Description>
+ <mdui:Description xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.cefet-rj.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.cefet-rj.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIELDCCAxQCAQAwDQYJKoZIhvcNAQEFBQAwgdsxRzBFBgNVBAoUPkNlbnRybyBG
+ZWRlcmFsIGRlIEVkdWNh5+NvIFRlY25vbPNnaWNhIENlbHNvIFN1Y2tvdyBkYSBG
+b25zZWNhMQ4wDAYDVQQLEwVEVElORjEgMB4GCSqGSIb3DQEJARYRZHRpbmZAY2Vm
+ZXQtcmouYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8g
+ZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xldGguY2Vm
+ZXQtcmouYnIwHhcNMTUxMDIzMTQxMjM5WhcNMTgxMDIyMTQxMjM5WjCB2zFHMEUG
+A1UEChQ+Q2VudHJvIEZlZGVyYWwgZGUgRWR1Y2Hn428gVGVjbm9s82dpY2EgQ2Vs
+c28gU3Vja293IGRhIEZvbnNlY2ExDjAMBgNVBAsTBURUSU5GMSAwHgYJKoZIhvcN
+AQkBFhFkdGluZkBjZWZldC1yai5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMW
+c2hpYmJvbGV0aC5jZWZldC1yai5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKAHz/3nFY8T9shurcbmk+DAaA5pUY28eCmtYLHygAZ2Dz2qdJcsWY0U
+1WjWzoxlaXIjRSffiG1xrq/BMxHppGo8qrGdbi34T9989eCJ5AMesoyVj3qy3nQe
+F08mdE2gKeq8ZN+kRpVNEH6rkJzdH06hrgtvHNrnPtsnWuuo+kK2G53vbD+/O+Yb
+EYEPOyZI0poLYhsFR+qBMLMxo/Kfu9cfWsVixYmPHFnqiF0HiwElX9cEB1YqH+xN
+mvfs8aa4sqY05IYhOmOZXQbn8GmV6m1KNglUQbwuq7cMWwi82qo8Nb8bh+NH0Jxw
+J1tY4db/G0EBpWrBcu2Q4qR4EKfaLfkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+mogHpnDhhAruiF2aQQiLp216GJ4XM6ZmlqPq5q8s8r59pfNO+9Ork/AHZR8Z/Hkp
+Dkfoso1qkYAbpNDdiGt4vleUfCHdHoq2N3SG/tYKatx/ozp7L/PWSXBy+C4GT6u+
+m1mKJBRLjIPxc3jYovdSBJDvTwWzT16Jh4xls+mHXK2NQtObPIAMjkFUYZKYNFTf
+6Pk43YzySIldWH8zQk+7T1sucVAgV/C5qw4BlJdywX6xBSjG0KoX6xsClgdsjuuU
+ed0HOE+rbfcdak8uDdywV4Fqbi6IkKGo/mTO/OImm9aMqHMoG05HzRFDqPjn3Uv8
+fVFA8m9TqEvrRbsw1wmqyg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cefet-rj.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cefet-rj.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cefet-rj.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cefet-rj.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cefet-rj.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIELDCCAxQCAQAwDQYJKoZIhvcNAQEFBQAwgdsxRzBFBgNVBAoUPkNlbnRybyBG
+ZWRlcmFsIGRlIEVkdWNh5+NvIFRlY25vbPNnaWNhIENlbHNvIFN1Y2tvdyBkYSBG
+b25zZWNhMQ4wDAYDVQQLEwVEVElORjEgMB4GCSqGSIb3DQEJARYRZHRpbmZAY2Vm
+ZXQtcmouYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8g
+ZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xldGguY2Vm
+ZXQtcmouYnIwHhcNMTUxMDIzMTQxMjM5WhcNMTgxMDIyMTQxMjM5WjCB2zFHMEUG
+A1UEChQ+Q2VudHJvIEZlZGVyYWwgZGUgRWR1Y2Hn428gVGVjbm9s82dpY2EgQ2Vs
+c28gU3Vja293IGRhIEZvbnNlY2ExDjAMBgNVBAsTBURUSU5GMSAwHgYJKoZIhvcN
+AQkBFhFkdGluZkBjZWZldC1yai5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMW
+c2hpYmJvbGV0aC5jZWZldC1yai5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKAHz/3nFY8T9shurcbmk+DAaA5pUY28eCmtYLHygAZ2Dz2qdJcsWY0U
+1WjWzoxlaXIjRSffiG1xrq/BMxHppGo8qrGdbi34T9989eCJ5AMesoyVj3qy3nQe
+F08mdE2gKeq8ZN+kRpVNEH6rkJzdH06hrgtvHNrnPtsnWuuo+kK2G53vbD+/O+Yb
+EYEPOyZI0poLYhsFR+qBMLMxo/Kfu9cfWsVixYmPHFnqiF0HiwElX9cEB1YqH+xN
+mvfs8aa4sqY05IYhOmOZXQbn8GmV6m1KNglUQbwuq7cMWwi82qo8Nb8bh+NH0Jxw
+J1tY4db/G0EBpWrBcu2Q4qR4EKfaLfkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+mogHpnDhhAruiF2aQQiLp216GJ4XM6ZmlqPq5q8s8r59pfNO+9Ork/AHZR8Z/Hkp
+Dkfoso1qkYAbpNDdiGt4vleUfCHdHoq2N3SG/tYKatx/ozp7L/PWSXBy+C4GT6u+
+m1mKJBRLjIPxc3jYovdSBJDvTwWzT16Jh4xls+mHXK2NQtObPIAMjkFUYZKYNFTf
+6Pk43YzySIldWH8zQk+7T1sucVAgV/C5qw4BlJdywX6xBSjG0KoX6xsClgdsjuuU
+ed0HOE+rbfcdak8uDdywV4Fqbi6IkKGo/mTO/OImm9aMqHMoG05HzRFDqPjn3Uv8
+fVFA8m9TqEvrRbsw1wmqyg==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.cefet-rj.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.cefet-rj.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Cesar Gama</md:SurName>
+ <md:EmailAddress>cesar.gama@cefet-rj.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml
new file mode 100644
index 00000000..f1ec92fa
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cetem.gov.br/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="pt-br">
+ http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+ </mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">CETEM - Centro de Tecnologia Mineral</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</mdui:DisplayName>
+ <mdui:Description xml:lang="en">CETEM - Centro de Tecnologia Mineral</mdui:Description>
+ <mdui:Description xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.cetem.gov.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.cetem.gov.br/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEBDCCAuwCAQAwDQYJKoZIhvcNAQEFBQAwgccxLTArBgNVBAoTJENFVEVNIC0g
+Q2VudHJvIGRlIFRlY25vbG9naWEgTWluZXJhbDENMAsGA1UECxMEU0VJTjEmMCQG
+CSqGSIb3DQEJARYXc2Vpbi1yZWRlc0BjZXRlbS5nb3YuYnIxFzAVBgNVBAcTDlJp
+byBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF3NoaWJib2xldGguY2V0ZW0uZ292LmJyMB4XDTE1MTAxNDE5
+MTYzNFoXDTE4MTAxMzE5MTYzNFowgccxLTArBgNVBAoTJENFVEVNIC0gQ2VudHJv
+IGRlIFRlY25vbG9naWEgTWluZXJhbDENMAsGA1UECxMEU0VJTjEmMCQGCSqGSIb3
+DQEJARYXc2Vpbi1yZWRlc0BjZXRlbS5nb3YuYnIxFzAVBgNVBAcTDlJpbyBkZSBK
+YW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxIDAe
+BgNVBAMTF3NoaWJib2xldGguY2V0ZW0uZ292LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAwLmjjlh/U5GsJ0NxjhR7gJfPrruNYnK+Cb0xCorpbUkX
+oxK6X36ZNEi2Rut6Y3gEsYeFCjFKJLLtFDpG8Snm6hzYXe3L0U6Q84CcxoYWcfvY
+OnM1mivtpc0yl3iPEAUd5AFcox/sNSbkGtDjkbX86h9b7+BFvnT5UZyZChg81Ppf
++DuuEQ0HVxTs3cpxg/Vhh7dF6kHOpzaJXdUJHq+f2O/u7c0doSBW6MNY+a8cJM3N
+Q3yNY7cEaW3e1o5yBVknFIJu8k210p7XiTaF7c9szVqQ41c3eQAB0okYXizG2H0w
+Ovd/QTCOaHyEkc+TvxYByaoUgkWtWjUN0jyYHVBFcwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCsJrZ+1CKqTJhW7oU/tU/MC6QyvR2RoM9dl3NrdWOkSDMCRqIl+hDM
+zioi+xvYJN8RTthdTLNhkF2dge+yR2mLoneF++Pi+X0xR3lubowGiCLLiGfa0i+U
+X/LeJUPON+bX7NbbXdtM6nUxiLd0lAxjScOpY+NAwvCswM+xHfHZG2ehxgvAV5gc
+BHl7OWkgGmgUWrtS1JRBpYxRbnhlOGngoLVrzmBhCo5eCrWLp2hb2whzDuu8if/1
+d5oA+IrrKlrbLyUsagA3Zb6lakPsmZNayxV+GBi5QdEEzQQ/9xet0Ugq1R0P7u6x
+iEcPQigOKOCHgUO5rjTwYd5NkRpzYgnw
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cetem.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cetem.gov.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cetem.gov.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cetem.gov.br/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIEBDCCAuwCAQAwDQYJKoZIhvcNAQEFBQAwgccxLTArBgNVBAoTJENFVEVNIC0g
+Q2VudHJvIGRlIFRlY25vbG9naWEgTWluZXJhbDENMAsGA1UECxMEU0VJTjEmMCQG
+CSqGSIb3DQEJARYXc2Vpbi1yZWRlc0BjZXRlbS5nb3YuYnIxFzAVBgNVBAcTDlJp
+byBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF3NoaWJib2xldGguY2V0ZW0uZ292LmJyMB4XDTE1MTAxNDE5
+MTYzNFoXDTE4MTAxMzE5MTYzNFowgccxLTArBgNVBAoTJENFVEVNIC0gQ2VudHJv
+IGRlIFRlY25vbG9naWEgTWluZXJhbDENMAsGA1UECxMEU0VJTjEmMCQGCSqGSIb3
+DQEJARYXc2Vpbi1yZWRlc0BjZXRlbS5nb3YuYnIxFzAVBgNVBAcTDlJpbyBkZSBK
+YW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxIDAe
+BgNVBAMTF3NoaWJib2xldGguY2V0ZW0uZ292LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAwLmjjlh/U5GsJ0NxjhR7gJfPrruNYnK+Cb0xCorpbUkX
+oxK6X36ZNEi2Rut6Y3gEsYeFCjFKJLLtFDpG8Snm6hzYXe3L0U6Q84CcxoYWcfvY
+OnM1mivtpc0yl3iPEAUd5AFcox/sNSbkGtDjkbX86h9b7+BFvnT5UZyZChg81Ppf
++DuuEQ0HVxTs3cpxg/Vhh7dF6kHOpzaJXdUJHq+f2O/u7c0doSBW6MNY+a8cJM3N
+Q3yNY7cEaW3e1o5yBVknFIJu8k210p7XiTaF7c9szVqQ41c3eQAB0okYXizG2H0w
+Ovd/QTCOaHyEkc+TvxYByaoUgkWtWjUN0jyYHVBFcwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCsJrZ+1CKqTJhW7oU/tU/MC6QyvR2RoM9dl3NrdWOkSDMCRqIl+hDM
+zioi+xvYJN8RTthdTLNhkF2dge+yR2mLoneF++Pi+X0xR3lubowGiCLLiGfa0i+U
+X/LeJUPON+bX7NbbXdtM6nUxiLd0lAxjScOpY+NAwvCswM+xHfHZG2ehxgvAV5gc
+BHl7OWkgGmgUWrtS1JRBpYxRbnhlOGngoLVrzmBhCo5eCrWLp2hb2whzDuu8if/1
+d5oA+IrrKlrbLyUsagA3Zb6lakPsmZNayxV+GBi5QdEEzQQ/9xet0Ugq1R0P7u6x
+iEcPQigOKOCHgUO5rjTwYd5NkRpzYgnw
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">CETEM - Centro de Tecnologia Mineral</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">CETEM - Centro de Tecnologia Mineral</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.cetem.gov.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.cetem.gov.br/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Carlos Silva</md:SurName>
+ <md:EmailAddress>sein-redes@cetem.gov.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml
index 003e8790..72bbe94a 100644
--- a/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml
@@ -12,7 +12,7 @@
<Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby.ac.uk</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">University of Derby Shibboleth</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Derby</mdui:DisplayName>
<mdui:Logo height="80" width="60">https://ulib.derby.ac.uk/library/images/uni_logo_80_60.png</mdui:Logo>
<mdui:Logo height="16" width="16">https://ulib.derby.ac.uk/library/images/uni_logo_16_16.png</mdui:Logo>
</mdui:UIInfo>
@@ -91,7 +91,7 @@
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">University of Derby</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of Derby Shibboleth</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">University of Derby</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.derby.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml b/swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml
new file mode 100644
index 00000000..15c516e1
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.digiknihovna.cz/metadata.xml">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-10-01T16:55:01Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">digiknihovna.cz</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">The Municipal Library of Česká Třebová</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Městská knihovna Česká Třebová</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for employees and readers of the Municipal Library Česká Třebová</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a čtenáře Městské knihovny Česká Třebová</mdui:Description>
+ <mdui:Logo height="40" width="40">https://shibboleth.digiknihovna.cz/logo.png</mdui:Logo>
+ <mdui:Logo height="40" width="231" xml:lang="cs">https://shibboleth.digiknihovna.cz/logo_c.png</mdui:Logo>
+ </mdui:UIInfo>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEuTCCA6GgAwIBAgIQMSRlr+rBP5LrTZg2Fn21DDANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIVdvU2lnbiBDQSBGcmVlIFNTTCBDZXJ0aWZpY2F0ZSBHMjAeFw0xNTA5MDkxMDQxNDhaFw0xODA5MDkxMDQxNDhaMCUxIzAhBgNVBAMMGnNoaWJib2xldGguZGlnaWtuaWhvdm5hLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvjg/PDJR3owFOJp+giLTmykCobeZnwyKUy3rCvSFGI8P3VrkiEUf706KOkF2flgvgJNaJo/fZjR5zLdK9yoSVEhyc2rvaMJmpZoak7O9mD2kVWSdE1m55m31DnKApGUm8+GR9aboDJsfTg8NsVDy95uVLDV6tPK0z4TUyNmSFn6elvGk5uR2imByb6CnGPjsHZipdHdxYTSOCXnzyG/xeo1owa2NAPIY/VQ+PoRR7AzyJNbNJJ/vJeyFCaesTckjVVWZ9JUKyXZIwgspgHoDrgi+vMrCpJHyjw5aMUNelmEg6pXh912/erW27ttmLlQfqzSOjYk/GWvHJwRiowQUsQIDAQABo4IBszCCAa8wCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAJBgNVHRMEAjAAMB0GA1UdDgQWBBR3ercwolapHISAswrafros0OmeqzAfBgNVHSMEGDAWgBTSpxYgfK/ZlZ7rQwoZ8uC5dA6oxzB9BggrBgEFBQcBAQRxMG8wNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwNi53b3NpZ24uY29tL2NhNi9zZXJ2ZXIxL2ZyZWUwNwYIKwYBBQUHMAKGK2h0dHA6Ly9haWE2Lndvc2lnbi5jb20vY2E2LnNlcnZlcjEuZnJlZS5jZXIwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2NybHM2Lndvc2lnbi5jb20vY2E2LXNlcnZlcjEtZnJlZS5jcmwwJQYDVR0RBB4wHIIac2hpYmJvbGV0aC5kaWdpa25paG92bmEuY3owUQYDVR0gBEowSDAIBgZngQwBAgEwPAYNKwYBBAGCm1EGAQICATArMCkGCCsGAQUFBwIBFh1odHRwOi8vd3d3Lndvc2lnbi5jb20vcG9saWN5LzANBgkqhkiG9w0BAQsFAAOCAQEA0x/GwChs/IwVX8feGUJg9SAC35CunowX+4qziQlBeHDe3KuF7JU/K6Ev4wVNL099pLbzD9kry1E/VGaNt6Bmj5Ib7qE8rMSropFZi1Q+0fy8rAYlfIg+ge1Jcc5CAN8n2qJOWIupas1c2RG8B9SG1HG4055mZkdZncxUaWxKccSWTh7OI0MhmyJqYFoGGoodWXXnz/FGGdPUIQ00MPRZtVvf3ykGn7kI2XdRbPvig1XXoz9A/39xhJjn6EUxWeyHwuTeN7ZJH+OldiYTpE99mFcLEec2/Y52ZcZ1Cv1hwwdZKOBw2sRuwAfpZ+Wwv4A8ucdKWKOXd4nCFnS+zMtmcA==</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>MIIEuTCCA6GgAwIBAgIQMSRlr+rBP5LrTZg2Fn21DDANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIVdvU2lnbiBDQSBGcmVlIFNTTCBDZXJ0aWZpY2F0ZSBHMjAeFw0xNTA5MDkxMDQxNDhaFw0xODA5MDkxMDQxNDhaMCUxIzAhBgNVBAMMGnNoaWJib2xldGguZGlnaWtuaWhvdm5hLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvjg/PDJR3owFOJp+giLTmykCobeZnwyKUy3rCvSFGI8P3VrkiEUf706KOkF2flgvgJNaJo/fZjR5zLdK9yoSVEhyc2rvaMJmpZoak7O9mD2kVWSdE1m55m31DnKApGUm8+GR9aboDJsfTg8NsVDy95uVLDV6tPK0z4TUyNmSFn6elvGk5uR2imByb6CnGPjsHZipdHdxYTSOCXnzyG/xeo1owa2NAPIY/VQ+PoRR7AzyJNbNJJ/vJeyFCaesTckjVVWZ9JUKyXZIwgspgHoDrgi+vMrCpJHyjw5aMUNelmEg6pXh912/erW27ttmLlQfqzSOjYk/GWvHJwRiowQUsQIDAQABo4IBszCCAa8wCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAJBgNVHRMEAjAAMB0GA1UdDgQWBBR3ercwolapHISAswrafros0OmeqzAfBgNVHSMEGDAWgBTSpxYgfK/ZlZ7rQwoZ8uC5dA6oxzB9BggrBgEFBQcBAQRxMG8wNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwNi53b3NpZ24uY29tL2NhNi9zZXJ2ZXIxL2ZyZWUwNwYIKwYBBQUHMAKGK2h0dHA6Ly9haWE2Lndvc2lnbi5jb20vY2E2LnNlcnZlcjEuZnJlZS5jZXIwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2NybHM2Lndvc2lnbi5jb20vY2E2LXNlcnZlcjEtZnJlZS5jcmwwJQYDVR0RBB4wHIIac2hpYmJvbGV0aC5kaWdpa25paG92bmEuY3owUQYDVR0gBEowSDAIBgZngQwBAgEwPAYNKwYBBAGCm1EGAQICATArMCkGCCsGAQUFBwIBFh1odHRwOi8vd3d3Lndvc2lnbi5jb20vcG9saWN5LzANBgkqhkiG9w0BAQsFAAOCAQEA0x/GwChs/IwVX8feGUJg9SAC35CunowX+4qziQlBeHDe3KuF7JU/K6Ev4wVNL099pLbzD9kry1E/VGaNt6Bmj5Ib7qE8rMSropFZi1Q+0fy8rAYlfIg+ge1Jcc5CAN8n2qJOWIupas1c2RG8B9SG1HG4055mZkdZncxUaWxKccSWTh7OI0MhmyJqYFoGGoodWXXnz/FGGdPUIQ00MPRZtVvf3ykGn7kI2XdRbPvig1XXoz9A/39xhJjn6EUxWeyHwuTeN7ZJH+OldiYTpE99mFcLEec2/Y52ZcZ1Cv1hwwdZKOBw2sRuwAfpZ+Wwv4A8ucdKWKOXd4nCFnS+zMtmcA==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SingleLogoutService.php"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SSOService.php"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Municipal Library Česká Třebová</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">Městská knihovna Česká Třebová</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Municipal Library Česká Třebová</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">Městská knihovna Česká Třebová</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://knihovna.ceska-trebova.cz/index.php/en/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://knihovna.ceska-trebova.cz/index.php/cs/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Jiří</md:GivenName>
+ <md:SurName>Kozlovský</md:SurName>
+ <md:EmailAddress>Jiri.Kozlovsky@mzk.cz</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml
index 6bc70901..82bd09cd 100644
--- a/swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml
@@ -9,11 +9,11 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enc.sorbonne.fr</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Idp test shibboleth.enc.sorbonne.fr</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ecole Nationale des Chartes production</mdui:DisplayName>
<mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZElEQVQoz5WSTU8TURSGz507czvTaacfFlCioEATAwkLEEgMK9iYuNKNiX/ExJ1/wYWJP4DEjTGRmLAwJn7ECCaopCja0hSKpdChH8x07nz03uMCgkZXvrtz3ufkbB6CiPA/Uf5dFasNAFgtVADA5eHfNf6RH5VDiVg/ck5Gxws6Dne8wHH5GXP6oWYfd/2eAHn/4dOMZSytrK0WKnbLffD4efWglTD1cq15QhJEbHZ4KqE/e7WeSZkSUQihx5gQMuoJCch5oMf0m/MTQiClREFEy2SuH3zfqdft40jI/NBAOplIW+al8+d0Ve3PWp+2Km433No5QETScTwkZOnFh7nJUcvQx4ZyEmDfbuuMGUzTNOp2/ZrdWtvcvXtjtid6is40KQQAVOtHRlz1goj7kdMN7LYLIP0gkhKXX28Ud/bbxx4FII7LPxerrQ6fn86HYVQo1abGhwGAqZoQ0cq7rwuz+XQy/ma9hADXJ0cUSpXxkcHtvcajJy+/lWtMo5QQRgmgRATT1DbL9Tv3Hi+/3ZgYG5QoVYkSQBnszwqR3Dto9WUtBUAhClEUABmGIqTR7cWZjBWPqRQlEs65w3t+EL7/Ui7/PDSY5ofRhVxapaRUbfRlE5Vac/Ri38LceMYyEjFVBYC4TgHYQC6VSuq5TPKo7Xo89MPo1uJUtd60O3x2ciRjGQajAEA8zwMAKSEUUtPoZrHW7vJeL5JSMQ0WCjF9dZhphNFTJ4jruqcaUgqIQkoeiLYTBGF0eTAFiJRSKeWZe78PbIeXdhszE1c+Frb3DzuUEhbTmKqaeqzrBwvX8ifYL1UkZ1awU1oLAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjEzKzAyOjAwKXrYNQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OToxMyswMjowMFgnYIkAAAAASUVORK5CYII=</mdui:Logo>
<mdui:InformationURL xml:lang="fr">http://www.enc.sorbonne.fr</mdui:InformationURL>
<mdui:Description xml:lang="en">Idp test école nationale des Chartes</mdui:Description>
- <mdui:DisplayName xml:lang="fr">Idp test shibboleth.enc.sorbonne.fr</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">Ecole Nationale des Chartes production</mdui:DisplayName>
<mdui:Description xml:lang="fr">Idp test école nationale des Chartes</mdui:Description>
</mdui:UIInfo>
</md:Extensions>
@@ -50,8 +50,8 @@ K+rXM7jkNQmgfZEZYJwccXuA+Ugd0UMtXh6qTpXcf8hNrCZEj9jQ
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.enc.sorbonne.fr/idp/profile/Shibboleth/SSO"/>
</md:IDPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">Idp test shibboleth.enc.sorbonne.fr</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Idp test shibboleth.enc.sorbonne.fr</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">Ecole Nationale des Chartes production</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Ecole Nationale des Chartes production</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.enc.sorbonne.fr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml
index 7f43876f..17adc19d 100644
--- a/swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml
@@ -15,8 +15,8 @@
<mdui:DisplayName xml:lang="pt-br">IFAC - Instituto Federal do Acre</mdui:DisplayName>
<mdui:Description xml:lang="en">IFAC - Instituto Federal do Acre</mdui:Description>
<mdui:Description xml:lang="pt-br">IFAC - Instituto Federal do Acre</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.ifac.edu.br/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="pt-br">http://www.ifac.edu.br/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.ifac.edu.br</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ifac.edu.br</mdui:InformationURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -27,23 +27,23 @@
bnN0aXR1dG8gRmVkZXJhbCBkbyBBY3JlMQ4wDAYDVQQLEwVEU0dUSTEgMB4GCSqG
SIb3DQEJARYRY29yZWRAaWZhYy5lZHUuYnIxEzARBgNVBAcTClJpbyBCcmFuY28x
DTALBgNVBAgTBEFjcmUxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmlmYWMuZWR1LmJyMB4XDTE1MDkwODE2MTUyNloXDTE4MDkwNzE2MTUyNlowga8x
+LmlmYWMuZWR1LmJyMB4XDTE1MTAwNjIwNTUyOVoXDTE4MTAwNTIwNTUyOVowga8x
KTAnBgNVBAoTIElGQUMgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBBY3JlMQ4wDAYD
VQQLEwVEU0dUSTEgMB4GCSqGSIb3DQEJARYRY29yZWRAaWZhYy5lZHUuYnIxEzAR
BgNVBAcTClJpbyBCcmFuY28xDTALBgNVBAgTBEFjcmUxCzAJBgNVBAYTAkJSMR8w
HQYDVQQDExZzaGliYm9sZXRoLmlmYWMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA9c1APj9R1C8zWY6YaZNR6UdK6EA5x3huwn8/EEuVeUmM
-QerRs859VTSvUrBNML3jMTRQBu6EAWucWaXbF0a33ZnrscH7JIrDyI8gskI2lL4a
-fX4ixl+LCclt/5tvm4vq4KEey16/0d0cTIQmMxwQAFp5+Miwmk8urAjfv+RjtJue
-2hMUcVxsfvFhamYi6FSSxbudbOqM+4OimhJBdhwzdWImIT5maE91tHsfu1Zf+h5C
-uXXUG5wufkpevPHDezmn3eCADcE12AGq9JBZj7WpMsYRwdGtRLDuS/arwP2tSvQX
-nVu670Xkc9OBOIO2VK0FdcL+7VjMfItaT3DzGcRxYwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQA4gp9QjDWIhK2cUYj9dDPcTx8YFAOa05wJZBYM6xjoAfhq+7q645PR
-8UFv7o75eT07kGp+Ffxxa7dWtvGYT5aax+wrxKwaydsnfIG/6hG+40XwCgKh0kc4
-WX3cune2jF/7h+MmiZOnR2XuGw1QJj7VDKHx5bjDyLIsWD/sl9AYciXZW/cmR2FP
-rYa5rHY2WcqRZu6blv1Z08QUAp7Mv4bP32BBO+uewcG6ClqKwMNuf9F5nReQU0uQ
-f7IiNi8wQ7BB83fLmt1oUbK/Ml7iZEzEx3CrDNFoSjo65qr5rdeeNA9sEE9MYX4l
-+H4SNpCIy/sKtQFuMD87TycxmL8b3YqV
+AAOCAQ8AMIIBCgKCAQEA4IsqgsWcWHB9bzA2eBTmpB1q1rPh9gtJsBLT5iLkaDm3
+u60f94zj2aUAKkibZJTUfzdwqS4FfYa5I4OFJeBjgB7i7OeHk8GpVd3ZhTEGeQ3t
+BcqoEfYvGjUBd7IWECFwqrzHm+uDNyg62O3UlZjeHeIQ5nIIkXVZg6DRdR0ExTNI
+FWca/Mej0M0ChvZ6TAMfSAL60DUK4rE20399txo/vml/IwG/9GmqymJwsO27m2fT
+qYJGIcnM+/xddmlhNmrdpa7uWSS8K10gV4DX3JEeXAQAuf3bmeAG51Kbh/qAs9dX
+Z/CQd08wBHDIY06yIW3cMEIxGtnxvBfgVc1MIiNOLwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQAwG40LnqlODWjBoNtt20Ds8rO9NOaOsngoVYdfZ5/1qogsdfAl+br2
+06GrsPgnbN0dfES2pVOuUDUa3eDmpv5ugBZOSZF6m0Zdm0vRgOtlLDABiFHYOtm1
+eK20dlzVLCearR72mRnJxQhB+p6hFLJoCdJk+OnrvMDr9qz4v+G2wPp19xMxLe97
+Zpc18pLXEiGimtu1mtMwJWFiEPyYnRp8ls0PwAhDMy/ZwdGJ29xtnl9DLfTuBx5c
+ilBQMwsWRA4QgnDig1I1Lf2dhEQC6ccEez6yOMSpkH/1Dy95S9G85svsuF2PWRtP
+BN+Ko78mWuJWJz4hCcf0LfkUuWTZHuiu
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -70,23 +70,24 @@ MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKTAnBgNVBAoTIElGQUMgLSBJ
bnN0aXR1dG8gRmVkZXJhbCBkbyBBY3JlMQ4wDAYDVQQLEwVEU0dUSTEgMB4GCSqG
SIb3DQEJARYRY29yZWRAaWZhYy5lZHUuYnIxEzARBgNVBAcTClJpbyBCcmFuY28x
DTALBgNVBAgTBEFjcmUxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmlmYWMuZWR1LmJyMB4XDTE1MDkwODE2MTUyNloXDTE4MDkwNzE2MTUyNlowga8x
+LmlmYWMuZWR1LmJyMB4XDTE1MTAwNjIwNTUyOVoXDTE4MTAwNTIwNTUyOVowga8x
KTAnBgNVBAoTIElGQUMgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBBY3JlMQ4wDAYD
VQQLEwVEU0dUSTEgMB4GCSqGSIb3DQEJARYRY29yZWRAaWZhYy5lZHUuYnIxEzAR
BgNVBAcTClJpbyBCcmFuY28xDTALBgNVBAgTBEFjcmUxCzAJBgNVBAYTAkJSMR8w
HQYDVQQDExZzaGliYm9sZXRoLmlmYWMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA9c1APj9R1C8zWY6YaZNR6UdK6EA5x3huwn8/EEuVeUmM
-QerRs859VTSvUrBNML3jMTRQBu6EAWucWaXbF0a33ZnrscH7JIrDyI8gskI2lL4a
-fX4ixl+LCclt/5tvm4vq4KEey16/0d0cTIQmMxwQAFp5+Miwmk8urAjfv+RjtJue
-2hMUcVxsfvFhamYi6FSSxbudbOqM+4OimhJBdhwzdWImIT5maE91tHsfu1Zf+h5C
-uXXUG5wufkpevPHDezmn3eCADcE12AGq9JBZj7WpMsYRwdGtRLDuS/arwP2tSvQX
-nVu670Xkc9OBOIO2VK0FdcL+7VjMfItaT3DzGcRxYwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQA4gp9QjDWIhK2cUYj9dDPcTx8YFAOa05wJZBYM6xjoAfhq+7q645PR
-8UFv7o75eT07kGp+Ffxxa7dWtvGYT5aax+wrxKwaydsnfIG/6hG+40XwCgKh0kc4
-WX3cune2jF/7h+MmiZOnR2XuGw1QJj7VDKHx5bjDyLIsWD/sl9AYciXZW/cmR2FP
-rYa5rHY2WcqRZu6blv1Z08QUAp7Mv4bP32BBO+uewcG6ClqKwMNuf9F5nReQU0uQ
-f7IiNi8wQ7BB83fLmt1oUbK/Ml7iZEzEx3CrDNFoSjo65qr5rdeeNA9sEE9MYX4l
-+H4SNpCIy/sKtQFuMD87TycxmL8b3YqV
+AAOCAQ8AMIIBCgKCAQEA4IsqgsWcWHB9bzA2eBTmpB1q1rPh9gtJsBLT5iLkaDm3
+u60f94zj2aUAKkibZJTUfzdwqS4FfYa5I4OFJeBjgB7i7OeHk8GpVd3ZhTEGeQ3t
+BcqoEfYvGjUBd7IWECFwqrzHm+uDNyg62O3UlZjeHeIQ5nIIkXVZg6DRdR0ExTNI
+FWca/Mej0M0ChvZ6TAMfSAL60DUK4rE20399txo/vml/IwG/9GmqymJwsO27m2fT
+qYJGIcnM+/xddmlhNmrdpa7uWSS8K10gV4DX3JEeXAQAuf3bmeAG51Kbh/qAs9dX
+Z/CQd08wBHDIY06yIW3cMEIxGtnxvBfgVc1MIiNOLwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQAwG40LnqlODWjBoNtt20Ds8rO9NOaOsngoVYdfZ5/1qogsdfAl+br2
+06GrsPgnbN0dfES2pVOuUDUa3eDmpv5ugBZOSZF6m0Zdm0vRgOtlLDABiFHYOtm1
+eK20dlzVLCearR72mRnJxQhB+p6hFLJoCdJk+OnrvMDr9qz4v+G2wPp19xMxLe97
+Zpc18pLXEiGimtu1mtMwJWFiEPyYnRp8ls0PwAhDMy/ZwdGJ29xtnl9DLfTuBx5c
+ilBQMwsWRA4QgnDig1I1Lf2dhEQC6ccEez6yOMSpkH/1Dy95S9G85svsuF2PWRtP
+BN+Ko78mWuJWJz4hCcf0LfkUuWTZHuiu
+
</ds:X509Certificate>
</ds:X509Data>
@@ -102,8 +103,8 @@ f7IiNi8wQ7BB83fLmt1oUbK/Ml7iZEzEx3CrDNFoSjo65qr5rdeeNA9sEE9MYX4l
<md:OrganizationName xml:lang="pt-br">IFAC - Instituto Federal do Acre</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">IFAC - Instituto Federal do Acre</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="pt-br">IFAC - Instituto Federal do Acre</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ifac.edu.br/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="pt-br">http://www.ifac.edu.br/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.ifac.edu.br</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.ifac.edu.br</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
<md:SurName>Kellyton Azevedo</md:SurName>
diff --git a/swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml
new file mode 100644
index 00000000..fe19f2fa
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.turnitinuk.com/shibboleth">
+ <!--
+ This is a 'TurnitinUK' Shibboleth SP for iParadigms Inc.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-18T10:58:40Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/Login" index="1"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/WAYF/UKFederation"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEJDCCAwygAwIBAgIJANNCqdS5T/uTMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYD
+ VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEQMA4GA1UEBwwHT2FrbGFuZDET
+ MBEGA1UECgwKaVBhcmFkaWdtczEgMB4GA1UEAwwXc2hpYmJvbGV0aC5zdWJtaXQu
+ YWMudWsxJTAjBgkqhkiG9w0BCQEWFnNoaWJhZG1pbkB0dXJuaXRpbi5jb20wHhcN
+ MTMwODIzMDAzMjM4WhcNMjMwODIxMDAzMjM4WjCBkjELMAkGA1UEBhMCVVMxEzAR
+ BgNVBAgMCkNhbGlmb3JuaWExEDAOBgNVBAcMB09ha2xhbmQxEzARBgNVBAoMCmlQ
+ YXJhZGlnbXMxIDAeBgNVBAMMF3NoaWJib2xldGguc3VibWl0LmFjLnVrMSUwIwYJ
+ KoZIhvcNAQkBFhZzaGliYWRtaW5AdHVybml0aW4uY29tMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEAwP4A/JGVAR4/MLEn2/YgG+8RqWnJqi/Pxuux6AR8
+ YJouaq6OIN7FtmFTze4aOVji3u0QoxDU559gl72VA3c4J+DYV/6sKz4LCGrN7NTM
+ RdtHrHJkPtj1ktIkBaCSYPADoTsrlQnRqZ5sSc8Q1vQNFQCfhf61mkKE3VX+EwTK
+ njx6NhyhpPSfctUdPR/QADZZCWazldENSuH7yyUjTlxhBLLQD9Yyahn2e11Afqvc
+ iJvyZMVtfQ0ezKVQlinXTtPKROuVHPybKcCcvu0WLncrW1M1kbhkmUNbCjPWspxp
+ y91ggvdRePbOdZZwmUIxkEMeGiXDA8YvmF2gk6wptRv/7wIDAQABo3sweTAJBgNV
+ HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
+ Y2F0ZTAdBgNVHQ4EFgQUvcJOH3FW/nHHBg7gjXPFvTUg0EkwHwYDVR0jBBgwFoAU
+ vcJOH3FW/nHHBg7gjXPFvTUg0EkwDQYJKoZIhvcNAQEFBQADggEBAJteiRc11ZQe
+ mm2idBi0wnpXTsXq7Boo2tFBB1QhJ4c/XkkBb1gzBaGe2dH4jZ0NbpN8+JXifplz
+ ZokKNVILqvi7xnR3aAs2lFRqN3mpZ2a3Kkn5liLtiOeuVx37o/n6RxpTKS/KHufz
+ ebYCs8ORGrdWHuiGHPX6LNy9ITONdFr7ma57aQ7Xr47hxgT/XRk48OcDGhTFAlmt
+ XCnhD1dwMqXgkfULzheeg/j2BDCBfWjfG+4D6FzQlbFbyfOK03w8Yjxmy397OYbC
+ Q/KYFVKd7S68jRoJ05AH/RvuEL7Fr8hSYJHhs26lgTM9MFU79jjzfhH4OvYyjoK5
+ Bqox791QdCs=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/POST" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+ <AttributeConsumingService index="0">
+ <ServiceName xml:lang="en">TurnitinUK</ServiceName>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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"/>
+ </AttributeConsumingService>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">iParadigms Inc</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">iParadigms: TurnitinUK</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.submit.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Shibboleth admin</GivenName>
+ <EmailAddress>mailto:shibadmin@turnitin.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Shibboleth admin</GivenName>
+ <EmailAddress>mailto:shibadmin@turnitin.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..4814b432
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ucs.org.uk/idp/shibboleth">
+ <!--
+ This is a Shibboleth IdP for University College School.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-27T12:19:58Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.org.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPzCCAiegAwIBAgIUXs62jEnH5FsW4cjbIFYDsu/rYeUwDQYJKoZIhvcNAQEL
+ BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
+ NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
+ b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkEWdF/SA6DAl
+ o2IOEgyXVX2mBGHEDDGuhl1smegJjxwo0Ys47OL8n2/9QdzAO5u3ByhdcF37S5Wa
+ Col14nxdz/TM5iqOQjQnYEC4XQ8ZUMxuC/aHrw5786R6wNnxVBtxhNMRd2tzdJ4R
+ PWqBkdJXLCm72S79aOKF2akyj1Ieg0z4ZvV/DvAkZxxlwZm2q8o+JEDNfJsvk9p4
+ PhwpR3PzOETNCMLPnQx1YHBFEW0KOtZG8b2Auf0CsaXsRcw3zqGzIjvmTqHie3bO
+ DIIrR/L4EMc5xafB58J3NVvnwqGvqidv4spfvS5hE2b8JQCtXHuEf7Xj0ncLtSsl
+ 8h+yzePBXQIDAQABo3EwbzAdBgNVHQ4EFgQUAdHMNEvYUBJ4lyohJ6WpEifDkeEw
+ TgYDVR0RBEcwRYIVc2hpYmJvbGV0aC51Y3Mub3JnLnVrhixodHRwczovL3NoaWJi
+ b2xldGgudWNzLm9yZy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+ AQEAMe+dycc8L+gL30bOi/6DmIuKj4zS94Br/Yh8y0FL64ike3uBCn5+UlRsV35D
+ m9xSY+tjxZlLMovzE9xE22yhO4vK7gx364dGtQ6PoitAzzbXDpbsGkDzhYxBGEF/
+ xKLQvUfSIRvDGCgf0EgKshAipP2TdPA84SIUEHCkIXXwtNz6tz4La/KYr1wOkrML
+ gbiqIyN2gkFwA9btTvSpnARzgfduOvh0WmipFDmTGsMKAxX/nLedA/sjKnu2vAmH
+ y9uFaB1FlLq7QvRs9Nqqos8621+YaSci+fS3lJbSoQM8UKwolsl3DNcPh4QtOOBT
+ zs3XPrEtTuaOzNRQRXwFfO0baA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDQDCCAiigAwIBAgIVAK5lpCtEt0YEj/CJZgaG7dPZIw7xMA0GCSqGSIb3DQEB
+ CwUAMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNzLm9yZy51azAeFw0xNTEwMjcw
+ NzU5MTZaFw0zNTEwMjcwNjU5MTZaMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNz
+ Lm9yZy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2U2LzuslPT
+ fJ2Ezm2NcS9DyCJMPfSbTUJnoFraUW4mcwW0m0dn0ryaLGYMNNJzEn1Tv7ClhD0W
+ Y0JoKrVO1o9k+qZYpZAfh9bUayuL7eqv49+Z8vincc0mZ3JdHrIfny28Z+MIIdTd
+ kGMMFHujprfdc8fhGmCShgqzzH4F8qQPwlY0L+afT/nUxDECj5H1Qf3GWSg2u8UV
+ AotnbeGbWRY9O0cbvMXRirpry1dzMYTDIEAsylaUUepooX9PMGQhDUjmqxUnzf4H
+ DhwvOBPu/5/gW7onYp10l71arOGyPxnBLvFnRqipGV7+on8SFNDP2uVvfk1UfTCO
+ Wz409p3So6UCAwEAAaNxMG8wHQYDVR0OBBYEFG3JTHabDX4l7zWK933Gyowb3UGe
+ ME4GA1UdEQRHMEWCFXNoaWJib2xldGgudWNzLm9yZy51a4YsaHR0cHM6Ly9zaGli
+ Ym9sZXRoLnVjcy5vcmcudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ ggEBAE12AL3ypSOjL6vtnH0Kj+QBuHDl/G/m7CJUaRpk6d7uJ97nRSfrBNV/RAFi
+ 0KJWolJ3x543MjhdbNhog8Lpc3jPvLUl3Lbw1efqgRDO/6JyAYtoQoykr++WDQh7
+ vyA+26N3nkWJRbIkkCJG4Z+Cy6epAH1eNbiDCEYT2qS+Cx2Z1nuwRKB1VfWxtsBl
+ pQhU9N0kWcgV8b1hBkeaGYiEoGNqRgZKdXscegcllvz3h73EnicmNk11jVcFbAfV
+ iw8/udM/e21y7rZAThdDQn6RfrEkdcfKHEt4mhT9sltGkj47/ijjJoO4SLIMn2gy
+ 7x54O572tP8flTqE+GyCEuwQj0w=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPzCCAiegAwIBAgIUAdfxtpW8SR/vWxMYD8AA9FJnV9AwDQYJKoZIhvcNAQEL
+ BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
+ NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
+ b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmgoO4GAHQGFL
+ FiLCtVDpODWZdcJ7PolpjigT5pPVe4YcU7C9yCIO695i67amSYoI9gF2iL+5vHO6
+ QBMdJhTo9hI3/vtMcXt8ycOE9iIAwxryn0Weeul74qtjSrwjcyysmqb6BReZGikh
+ i/Ay0rGCsQbZHTPmSDXGgU5FYTi5Kb5rVS4SHJVJTNujCOgj8Ezgxk/sEMWp+v6e
+ DIcaGeJgOK71wB8ZGFsixwU3HE1Goqv+W8wfk58jX82sYa8mNNBWX7yTS3cgmAfr
+ q17KWun9GuZ5YnASZ/aOSf8tazRLwaBWAPF4wolBmmdyi8EkZkPcMxgsCLp+GmRf
+ RdZafD89QQIDAQABo3EwbzAdBgNVHQ4EFgQUuvSPDirxARyNoaZFPw9bAZuQSwww
+ TgYDVR0RBEcwRYIVc2hpYmJvbGV0aC51Y3Mub3JnLnVrhixodHRwczovL3NoaWJi
+ b2xldGgudWNzLm9yZy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+ AQEAA1edyj4I4+zqlc5lImXyAQe4NLB9qMZVo0clUImKLEXFoozyG9tv495wId5Q
+ WREgtkJd0bDkv1+GkGgcwkFeV488BXWx8jG7uQ9SdpOuE3nPacWLzUZnbX9Ate+F
+ VZjXx5XFCf9ITAyKfAj8Ap+bvoDSopHOX04x4yu/6UvpQzuTC33rui0w2dlihOXQ
+ tHd9tqg7XEq55EVB0B4ahXU4EGpflBhPo7uY2bmO5b6aoCcGCMEPRdkxXyg+2m4J
+ itkouztW7o137ACQFkenM95VyKqQm5/dBdQ71j0XR2ZKCypd6n2aa5HlVfAsa9R5
+ pI6zE5tbN6oDkV62/80Ft22n6A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucs.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ucs.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ucs.org.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.org.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPzCCAiegAwIBAgIUXs62jEnH5FsW4cjbIFYDsu/rYeUwDQYJKoZIhvcNAQEL
+ BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
+ NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
+ b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkEWdF/SA6DAl
+ o2IOEgyXVX2mBGHEDDGuhl1smegJjxwo0Ys47OL8n2/9QdzAO5u3ByhdcF37S5Wa
+ Col14nxdz/TM5iqOQjQnYEC4XQ8ZUMxuC/aHrw5786R6wNnxVBtxhNMRd2tzdJ4R
+ PWqBkdJXLCm72S79aOKF2akyj1Ieg0z4ZvV/DvAkZxxlwZm2q8o+JEDNfJsvk9p4
+ PhwpR3PzOETNCMLPnQx1YHBFEW0KOtZG8b2Auf0CsaXsRcw3zqGzIjvmTqHie3bO
+ DIIrR/L4EMc5xafB58J3NVvnwqGvqidv4spfvS5hE2b8JQCtXHuEf7Xj0ncLtSsl
+ 8h+yzePBXQIDAQABo3EwbzAdBgNVHQ4EFgQUAdHMNEvYUBJ4lyohJ6WpEifDkeEw
+ TgYDVR0RBEcwRYIVc2hpYmJvbGV0aC51Y3Mub3JnLnVrhixodHRwczovL3NoaWJi
+ b2xldGgudWNzLm9yZy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+ AQEAMe+dycc8L+gL30bOi/6DmIuKj4zS94Br/Yh8y0FL64ike3uBCn5+UlRsV35D
+ m9xSY+tjxZlLMovzE9xE22yhO4vK7gx364dGtQ6PoitAzzbXDpbsGkDzhYxBGEF/
+ xKLQvUfSIRvDGCgf0EgKshAipP2TdPA84SIUEHCkIXXwtNz6tz4La/KYr1wOkrML
+ gbiqIyN2gkFwA9btTvSpnARzgfduOvh0WmipFDmTGsMKAxX/nLedA/sjKnu2vAmH
+ y9uFaB1FlLq7QvRs9Nqqos8621+YaSci+fS3lJbSoQM8UKwolsl3DNcPh4QtOOBT
+ zs3XPrEtTuaOzNRQRXwFfO0baA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDQDCCAiigAwIBAgIVAK5lpCtEt0YEj/CJZgaG7dPZIw7xMA0GCSqGSIb3DQEB
+ CwUAMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNzLm9yZy51azAeFw0xNTEwMjcw
+ NzU5MTZaFw0zNTEwMjcwNjU5MTZaMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNz
+ Lm9yZy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2U2LzuslPT
+ fJ2Ezm2NcS9DyCJMPfSbTUJnoFraUW4mcwW0m0dn0ryaLGYMNNJzEn1Tv7ClhD0W
+ Y0JoKrVO1o9k+qZYpZAfh9bUayuL7eqv49+Z8vincc0mZ3JdHrIfny28Z+MIIdTd
+ kGMMFHujprfdc8fhGmCShgqzzH4F8qQPwlY0L+afT/nUxDECj5H1Qf3GWSg2u8UV
+ AotnbeGbWRY9O0cbvMXRirpry1dzMYTDIEAsylaUUepooX9PMGQhDUjmqxUnzf4H
+ DhwvOBPu/5/gW7onYp10l71arOGyPxnBLvFnRqipGV7+on8SFNDP2uVvfk1UfTCO
+ Wz409p3So6UCAwEAAaNxMG8wHQYDVR0OBBYEFG3JTHabDX4l7zWK933Gyowb3UGe
+ ME4GA1UdEQRHMEWCFXNoaWJib2xldGgudWNzLm9yZy51a4YsaHR0cHM6Ly9zaGli
+ Ym9sZXRoLnVjcy5vcmcudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ ggEBAE12AL3ypSOjL6vtnH0Kj+QBuHDl/G/m7CJUaRpk6d7uJ97nRSfrBNV/RAFi
+ 0KJWolJ3x543MjhdbNhog8Lpc3jPvLUl3Lbw1efqgRDO/6JyAYtoQoykr++WDQh7
+ vyA+26N3nkWJRbIkkCJG4Z+Cy6epAH1eNbiDCEYT2qS+Cx2Z1nuwRKB1VfWxtsBl
+ pQhU9N0kWcgV8b1hBkeaGYiEoGNqRgZKdXscegcllvz3h73EnicmNk11jVcFbAfV
+ iw8/udM/e21y7rZAThdDQn6RfrEkdcfKHEt4mhT9sltGkj47/ijjJoO4SLIMn2gy
+ 7x54O572tP8flTqE+GyCEuwQj0w=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPzCCAiegAwIBAgIUAdfxtpW8SR/vWxMYD8AA9FJnV9AwDQYJKoZIhvcNAQEL
+ BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
+ NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
+ b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmgoO4GAHQGFL
+ FiLCtVDpODWZdcJ7PolpjigT5pPVe4YcU7C9yCIO695i67amSYoI9gF2iL+5vHO6
+ QBMdJhTo9hI3/vtMcXt8ycOE9iIAwxryn0Weeul74qtjSrwjcyysmqb6BReZGikh
+ i/Ay0rGCsQbZHTPmSDXGgU5FYTi5Kb5rVS4SHJVJTNujCOgj8Ezgxk/sEMWp+v6e
+ DIcaGeJgOK71wB8ZGFsixwU3HE1Goqv+W8wfk58jX82sYa8mNNBWX7yTS3cgmAfr
+ q17KWun9GuZ5YnASZ/aOSf8tazRLwaBWAPF4wolBmmdyi8EkZkPcMxgsCLp+GmRf
+ RdZafD89QQIDAQABo3EwbzAdBgNVHQ4EFgQUuvSPDirxARyNoaZFPw9bAZuQSwww
+ TgYDVR0RBEcwRYIVc2hpYmJvbGV0aC51Y3Mub3JnLnVrhixodHRwczovL3NoaWJi
+ b2xldGgudWNzLm9yZy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+ AQEAA1edyj4I4+zqlc5lImXyAQe4NLB9qMZVo0clUImKLEXFoozyG9tv495wId5Q
+ WREgtkJd0bDkv1+GkGgcwkFeV488BXWx8jG7uQ9SdpOuE3nPacWLzUZnbX9Ate+F
+ VZjXx5XFCf9ITAyKfAj8Ap+bvoDSopHOX04x4yu/6UvpQzuTC33rui0w2dlihOXQ
+ tHd9tqg7XEq55EVB0B4ahXU4EGpflBhPo7uY2bmO5b6aoCcGCMEPRdkxXyg+2m4J
+ itkouztW7o137ACQFkenM95VyKqQm5/dBdQ71j0XR2ZKCypd6n2aa5HlVfAsa9R5
+ pI6zE5tbN6oDkV62/80Ft22n6A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucs.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University College School</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University College School</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ucs.org.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Matthew</GivenName>
+ <SurName>Meilack</SurName>
+ <EmailAddress>mailto:matt.meilack@ucs.org.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Matthew</GivenName>
+ <SurName>Meilack</SurName>
+ <EmailAddress>mailto:matt.meilack@ucs.org.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml
new file mode 100644
index 00000000..83cc7a63
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uni.opole.pl/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-12-02T00:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.opole.pl</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">
+ Opole University</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pl">
+ Uniwersytet Opolski</mdui:DisplayName>
+ <mdui:Description xml:lang="en">
+ Opole University Identity Provider
+ </mdui:Description>
+ <mdui:Description xml:lang="pl">
+ Dostawca Tożsamości Uniwersytetu Opolskiego
+ </mdui:Description>
+ <mdui:Logo height="55" width="165" xml:lang="en">
+ https://shibboleth.uni.opole.pl/idp/logouo_header.png
+ </mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUJYgjpRkfWuuLnYgjmOtFu6kZyuQwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MloX
+DTM1MDQzMDA2NTU1MlowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvpolQ/zhvPO0OGBOJu8JjMLurb10
+qNcR+RuS/YUZ2wbnjggMSCHm+X+dY2RAX2Qu3sty2f6Rizpwa4dHcTVARrHonPu2
+0j+bFjQndzODqAbg3IsD+i9P2qPXJOZ0atgfcf5FQ+h8AgOST3pRX9YSwDcOZ/mO
+hoDlitxWJmXxX+e39Ix0/ONtfpy+R9JKE+UEuqZ/xBiwmKwfRll5M4V7mZj8UcFW
+/AvoWol8h+UUtHSweZxZYAad1nniIlDOBN//ABM+wRc4saC/bB/wV1NTi8ZQp8i+
+MEZ+81TwOmpxo/z5EOPbl0/rl1VhG54yxjFFgqI13tn4QLoJWUGozYO1dwIDAQAB
+o2UwYzAdBgNVHQ4EFgQUA1adRNultXunWuW5NyNRqc46bdowQgYDVR0RBDswOYIP
+aWRwLmV4YW1wbGUub3JnhiZodHRwczovL2lkcC5leGFtcGxlLm9yZy9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAooPuGuUZiJUc+9rW8FnHvflucH3h
+rpu75Fyp6/e7U+KpiKAmrdo83/Ve4GadEhBEANZ/lbu1z5eZTurXhPA6j4Df89Xf
+3GkPpyy9YoFvKypn/FeUAMpyo+BlNSnzAQuC+b+AYZrKwjwBKk9vrpGPJ7uUsz9D
+VBWHN6W0pQqExq6qXfgcLGnluzqJ0LbNGJrndfKV4WN/MAE52zVo24f9huQandRt
+PTimpBVSen6/qlR87r67YGV6/jgfL3Q8N5g42sT2iT/05Q22aYaIk1+e9X44jIos
+gn4E7aCKeaHFN/LG+NCNR1Fq+g0vDJIPe6FDeaC+kqK84MtvxqxG/wJxBQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVANM9C5l48yMhTAHJ9LbCXXOK1yQHMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzAeFw0xNTA0MzAwNjU1NTBa
+Fw0zNTA0MzAwNjU1NTBaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALCW6XciidnTK7mHBV+aDlGBuNKk
+Pj6O3bXSdt0cQQhMlKS7rNmxMaKsS1SxKB/E5OcUeL1DjAqICGpYls33cWIgLvSB
+wTkLRWQRLxsV2cvdRK6Deb32Tf7KeR3w0coHpYQ8GeYVTGA98F2Ovmo/ZUgXr2qK
+C55rOrmbyPs7Bqi9jjeFDNaczu3Y25kkp1sultt4AZZOtMkIsjypnYkhxn9/2fVp
+W/ZFXqoemfT3N63t1SWNZc+Yaeo82kvbLcrkFeOdkD2vmXMXSjt/+LGOnI8fpARy
+r/57UVycEpyfDp+Fve+EeUOP7LMQMVpLTQJxLFesL0lTTUsgx1PktUmc18ECAwEA
+AaNlMGMwHQYDVR0OBBYEFKlA/UMF3cCICQgPWEmRaIAaALeYMEIGA1UdEQQ7MDmC
+D2lkcC5leGFtcGxlLm9yZ4YmaHR0cHM6Ly9pZHAuZXhhbXBsZS5vcmcvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAA95wRr3PU93Cy9Cu2oCIOPpNrHm
+7FO524QdyhuInC9Ue6ZGrez2J9TNJIblQzzsCw+STD0A0Hs8oHuZxl0hV8USsq4f
+ZNkdoRIntpIpOt7VefS2pxNDP1JGzgI36S2dgRPgNGBhtsd+5EjRCOPONeUy2gx/
+OeBnwcw8j36pQHdRlZKQVspAS5h0ePRHbS7luIQDeL8ZUkXIXuLEmnjHXnJzWUCP
+N5DC9rjlhu2+0Z1KeiuZgmVAiB66BFvjXCnkWIK5kh+/C/BYQpgHDx7B9nBYr5Xb
+2iYaqN73c9+XwBSf0+vYLC9Ivn6fAXMUN/wkK1FH9hjX09wBPR8LS2oq5fg=
+ </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>
+MIIDJzCCAg+gAwIBAgIUEVPEG+BAdndjuiWqotqWKaPL2jowDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MVoX
+DTM1MDQzMDA2NTU1MVowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJI6hLgX21HDCZsTHQoI4xA91YD
+LNuTv2q+nxSHeYy3uCDCAbDAuwJDnpdbdGlYadVvG1gHTkHRMc7pS2HSgd5y27Ig
+TMzAUeLLJM1ZUajJs8d7g32LLGQEHIFAwidYB+saKaCOCSRowLx5Cw5vFWLxEEih
+evERL6P8J3mb/6vzTSJeqYU9XQxI8+FQQY9mI7JLaprn60dHj3S/XnxLmbVEgQ2Z
+/jSRFDAufZ8Jv9EAqMqmRtXEakaYjQzM/anu0wPE+CeBHQA6geobUN+L1sbs70iE
+eei8gvGiI+Y+2cQzSjIL0qEH3YFcLV05R2iRgUN1aMXywxLOlfRhl9bOrQIDAQAB
+o2UwYzAdBgNVHQ4EFgQU/rP7y0WdXMLRdHdnxh5xPbLpFskwQgYDVR0RBDswOYIP
+aWRwLmV4YW1wbGUub3JnhiZodHRwczovL2lkcC5leGFtcGxlLm9yZy9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAL1YSqSt0GbkJqiBsKvf0NgInNIAz
+25HjG/RxxETiQicxIrusYLgOb9czKQKGi9cWxyKY00cVBPLq9J2TIg0URWJBZMnh
+QzcZS9Bz4eDIuQ/s1zzOTxJzeAUJHIIme8DwEx+VNJHdVuntmf44TsxdOxxTPg0S
+dd55ODSvyXtIcJcCSj4Iuh6iQM+Wlq2PAH4GxhPmevz/Yl/5kEGIKrAjcfDOTwaD
+vp0OaVjVxH3HPESQTqPd2JrOVd4Ghtf59oadIMAwGxQ93/Ci33s9iaoHYEQtnHdQ
+KbGw/zFpxtXvzKZu3tXYOU79RQceiSTlOhm2JNPPL43AwNw6rsX69prLZg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uni.opole.pl/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.opole.pl</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUJYgjpRkfWuuLnYgjmOtFu6kZyuQwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MloX
+DTM1MDQzMDA2NTU1MlowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvpolQ/zhvPO0OGBOJu8JjMLurb10
+qNcR+RuS/YUZ2wbnjggMSCHm+X+dY2RAX2Qu3sty2f6Rizpwa4dHcTVARrHonPu2
+0j+bFjQndzODqAbg3IsD+i9P2qPXJOZ0atgfcf5FQ+h8AgOST3pRX9YSwDcOZ/mO
+hoDlitxWJmXxX+e39Ix0/ONtfpy+R9JKE+UEuqZ/xBiwmKwfRll5M4V7mZj8UcFW
+/AvoWol8h+UUtHSweZxZYAad1nniIlDOBN//ABM+wRc4saC/bB/wV1NTi8ZQp8i+
+MEZ+81TwOmpxo/z5EOPbl0/rl1VhG54yxjFFgqI13tn4QLoJWUGozYO1dwIDAQAB
+o2UwYzAdBgNVHQ4EFgQUA1adRNultXunWuW5NyNRqc46bdowQgYDVR0RBDswOYIP
+aWRwLmV4YW1wbGUub3JnhiZodHRwczovL2lkcC5leGFtcGxlLm9yZy9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAooPuGuUZiJUc+9rW8FnHvflucH3h
+rpu75Fyp6/e7U+KpiKAmrdo83/Ve4GadEhBEANZ/lbu1z5eZTurXhPA6j4Df89Xf
+3GkPpyy9YoFvKypn/FeUAMpyo+BlNSnzAQuC+b+AYZrKwjwBKk9vrpGPJ7uUsz9D
+VBWHN6W0pQqExq6qXfgcLGnluzqJ0LbNGJrndfKV4WN/MAE52zVo24f9huQandRt
+PTimpBVSen6/qlR87r67YGV6/jgfL3Q8N5g42sT2iT/05Q22aYaIk1+e9X44jIos
+gn4E7aCKeaHFN/LG+NCNR1Fq+g0vDJIPe6FDeaC+kqK84MtvxqxG/wJxBQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVANM9C5l48yMhTAHJ9LbCXXOK1yQHMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzAeFw0xNTA0MzAwNjU1NTBa
+Fw0zNTA0MzAwNjU1NTBaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALCW6XciidnTK7mHBV+aDlGBuNKk
+Pj6O3bXSdt0cQQhMlKS7rNmxMaKsS1SxKB/E5OcUeL1DjAqICGpYls33cWIgLvSB
+wTkLRWQRLxsV2cvdRK6Deb32Tf7KeR3w0coHpYQ8GeYVTGA98F2Ovmo/ZUgXr2qK
+C55rOrmbyPs7Bqi9jjeFDNaczu3Y25kkp1sultt4AZZOtMkIsjypnYkhxn9/2fVp
+W/ZFXqoemfT3N63t1SWNZc+Yaeo82kvbLcrkFeOdkD2vmXMXSjt/+LGOnI8fpARy
+r/57UVycEpyfDp+Fve+EeUOP7LMQMVpLTQJxLFesL0lTTUsgx1PktUmc18ECAwEA
+AaNlMGMwHQYDVR0OBBYEFKlA/UMF3cCICQgPWEmRaIAaALeYMEIGA1UdEQQ7MDmC
+D2lkcC5leGFtcGxlLm9yZ4YmaHR0cHM6Ly9pZHAuZXhhbXBsZS5vcmcvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAA95wRr3PU93Cy9Cu2oCIOPpNrHm
+7FO524QdyhuInC9Ue6ZGrez2J9TNJIblQzzsCw+STD0A0Hs8oHuZxl0hV8USsq4f
+ZNkdoRIntpIpOt7VefS2pxNDP1JGzgI36S2dgRPgNGBhtsd+5EjRCOPONeUy2gx/
+OeBnwcw8j36pQHdRlZKQVspAS5h0ePRHbS7luIQDeL8ZUkXIXuLEmnjHXnJzWUCP
+N5DC9rjlhu2+0Z1KeiuZgmVAiB66BFvjXCnkWIK5kh+/C/BYQpgHDx7B9nBYr5Xb
+2iYaqN73c9+XwBSf0+vYLC9Ivn6fAXMUN/wkK1FH9hjX09wBPR8LS2oq5fg=
+ </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>
+MIIDJzCCAg+gAwIBAgIUEVPEG+BAdndjuiWqotqWKaPL2jowDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MVoX
+DTM1MDQzMDA2NTU1MVowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJI6hLgX21HDCZsTHQoI4xA91YD
+LNuTv2q+nxSHeYy3uCDCAbDAuwJDnpdbdGlYadVvG1gHTkHRMc7pS2HSgd5y27Ig
+TMzAUeLLJM1ZUajJs8d7g32LLGQEHIFAwidYB+saKaCOCSRowLx5Cw5vFWLxEEih
+evERL6P8J3mb/6vzTSJeqYU9XQxI8+FQQY9mI7JLaprn60dHj3S/XnxLmbVEgQ2Z
+/jSRFDAufZ8Jv9EAqMqmRtXEakaYjQzM/anu0wPE+CeBHQA6geobUN+L1sbs70iE
+eei8gvGiI+Y+2cQzSjIL0qEH3YFcLV05R2iRgUN1aMXywxLOlfRhl9bOrQIDAQAB
+o2UwYzAdBgNVHQ4EFgQU/rP7y0WdXMLRdHdnxh5xPbLpFskwQgYDVR0RBDswOYIP
+aWRwLmV4YW1wbGUub3JnhiZodHRwczovL2lkcC5leGFtcGxlLm9yZy9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAL1YSqSt0GbkJqiBsKvf0NgInNIAz
+25HjG/RxxETiQicxIrusYLgOb9czKQKGi9cWxyKY00cVBPLq9J2TIg0URWJBZMnh
+QzcZS9Bz4eDIuQ/s1zzOTxJzeAUJHIIme8DwEx+VNJHdVuntmf44TsxdOxxTPg0S
+dd55ODSvyXtIcJcCSj4Iuh6iQM+Wlq2PAH4GxhPmevz/Yl/5kEGIKrAjcfDOTwaD
+vp0OaVjVxH3HPESQTqPd2JrOVd4Ghtf59oadIMAwGxQ93/Ci33s9iaoHYEQtnHdQ
+KbGw/zFpxtXvzKZu3tXYOU79RQceiSTlOhm2JNPPL43AwNw6rsX69prLZg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="pl">Uniwersytet Opolski</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Opole University</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Opole University
+ </md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Opolski</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="pl">http://www.uni.opole.pl/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.uni.opole.pl/en
+ </md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Sławomir</md:GivenName>
+ <md:SurName>Paszkiewicz</md:SurName>
+ <md:EmailAddress>mailto:idp@uni.opole.pl</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
index 0f6fed0b..d1912fb3 100644
--- a/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.unifi.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.unifi.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-23T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml
index a9ea80b6..8eb30a26 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml
@@ -88,6 +88,11 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/ECP" index="4"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML/POST" index="5"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">JSTOR</ServiceName>
+ <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="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ </AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Ithaka Harbors, Inc.</OrganizationName>
diff --git a/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml
index 8b784fe7..fda60b4e 100644
--- a/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml
@@ -43,17 +43,17 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST/SLO"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth3.liv.ac.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib3-test.liv.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
@@ -85,8 +85,8 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml
index 199aa49c..cd9e1cfb 100644
--- a/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.cca.unipd.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.cca.unipd.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
index 27e2fce7..399ae35b 100644
--- a/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
@@ -81,6 +81,6 @@ UfiJZdPA+g==
<md:OrganizationURL xml:lang="en">http://www.oca.eu</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:EmailAddress>sit-nice@oca.eu</md:EmailAddress>
+ <md:EmailAddress>dsi@oca.eu</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml
index 9e27b0b7..220e769b 100644
--- a/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.polimi.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.polimi.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml
index d4d4e01e..cb97e1d8 100644
--- a/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.to.cnr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.to.cnr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
index 3b52ec6c..70bf0ccd 100644
--- a/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.unipr.it/idp/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.unipr.it/idp/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..57c5ed3f
--- /dev/null
+++ b/swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibo.vkol.cz/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-12-08T15:12:02Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vkol.cz</shibmd:Scope>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Research Library in Olomouc</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Vědecká knihovna v Olomouci</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for patrons and staff of Research Library in Olomouc</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Vědecké knihovny v Olomouci</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.vkol.cz/en/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://www.vkol.cz/</mdui:InformationURL>
+ <mdui:Logo height="40" width="40">https://shibo.vkol.cz/logo_40.png</mdui:Logo>
+ <mdui:Logo height="90" width="91">https://shibo.vkol.cz/logo_90.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVANklP/WPGioD4uJOxCiHuW1lyYvLMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM5WhcN
+MzUxMDI3MTIzNDM5WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhK6yT8AnPYSFrdvpNPrk0/8CT77AHMcx
+KchaopWFfmb740mzgeMqM9fR6WomOHhqv8EoB+nxdnEBnVn0schp3F6Xuh5FK1d4
+TR6Hbc2LM1cZRlsXeUT1bk9SVkfI8pJV0va2Q/ffW1eKypXRuotD8NMA5L/SBo3I
+pQsPIDmb2zufEJQ2TPG3nCQ4viX+qPqs9Ptils7ZyNMywkxiYDIkYYttdP7hoduH
+pHTZF6lBbVME+VYJPfrTdPvbb72WlnysrrhcEmqMUirdcb4KQSmCuJ9rXVFhxq50
+mHD/ikn63M4DGKfFPOkMcedVjV76NuM6mc/9BIBUc4GjLfxspwtjTwIDAQABo2Ew
+XzAdBgNVHQ4EFgQUdjZRkENDX91W48XAsxxJEsyX3M4wPgYDVR0RBDcwNYINc2hp
+Ym8udmtvbC5jeoYkaHR0cHM6Ly9zaGliby52a29sLmN6L2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQAU2soh0Qe8YuEjVUYFEoZwdpZSAbxqV7ffVQQx
+ZDP8V7NS1yhiuSpaltYarEKEe79Roikw4o85TDoTLqOKHjvDBEoTEESDoEeEt85w
+CzsskVpEzKc9abziC+swCWwGp7h1hlmStE1+wqMENw7tu5bfG8TjVXazV6JAB/uW
+ch/yHVANoJSXRI1Lg5sQ6YJD48CJyk3HKxLegiBdArok3rupcUMzpU9Ibbi2lUe+
++jRxhQBU9X1CRgb5y6UdeWrFmE5N3tMsRP1D5hEOFDXzpMO+9N+mqNT74HXVHmBh
+IunquFiwHqaq+d/VHve7lJaNERMGP8dnUjTisHQYoBXzzE2Y
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUFpKDcZj8pgvy6pKI1EiT0+Z7PpAwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNc2hpYm8udmtvbC5jejAeFw0xNTEwMjcxMzM0MzdaFw0z
+NTEwMjcxMjM0MzdaMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDtm2eqb0mrOJR6/N76g8cADzU0Ba0rMwD
+LctnNi0s2Aj4pldpFinbF27krFNszV1pcpw9Ts9SmS27j6hhE0njlgG/+TsL2NAJ
+5h6fd/Zh+GD2WXKJhs7m5CsX5dIK8xCcY3CrZMtWay+tdTn9ZPm8fV61+dHJ/cA2
+c1MPD8ICd1iAjR+coAxkFO6nBWs64F1DC/bCVSKVltzGWcfpOS2QQVHEt9ptQ3ja
+iY51LVAdzHtUQM5DBXR7MvjsXbl9EjGahj/CRCkL95oiDr0kKjgqJXFiIgigRwWa
+JJ3WHIHD1am9m+V3bjhaSa2s6X6eTHD4XhZXkbByEz245dgR8dGFAgMBAAGjYTBf
+MB0GA1UdDgQWBBQU1Iq8GcJcBtzVSgnAblOs5nzafTA+BgNVHREENzA1gg1zaGli
+by52a29sLmN6hiRodHRwczovL3NoaWJvLnZrb2wuY3ovaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAHCLtsaQyGsVuR+Nqd+sk0qu5CdMMq3t4Dpi8AfL
+3WmzMobgZtnlT+M9k1/zQ8E/+RD9WALxFuWhywxI8An7Xvu4UShtjIOlYNlr6Xec
+t6JyKWyrPk4Lg6dhrd+Fm6OzTTYOtwDR/KoMx8O3mONzGLFp5qAvYbveEUqYlOZ5
+Y+n53tBF9hIjkOYsO/z0GUlu96PncZeZ96vc5Vm9lkW0gs7druFFc/GgUZ+1RB/R
+MrZqvpCJ8ufxMWB+d+Y0ogq5CXmYrvbVYiQf+KieHmY7jw7/oBTnYnM8JANC2pwe
+FhbZRUsHucC16PyRIVtne6BJfM1mwy6+BQTNUAl9y4KXO9U=
+ </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>
+MIIDIDCCAgigAwIBAgIVAKS9iTg+VmzdK2E7t2F4uc9lX0QAMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM4WhcN
+MzUxMDI3MTIzNDM4WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkrVwD9sKCqANF5mPXpBx8NTNogEBFFjZ
+LhxdGZrmM/VQGRtzd+Apgf6UxY6X20BPARo3TvgedQVvYhjC4TFU43J54CxepHwN
+igC0mLQ6F8K4RHmE3YzX5/ziocIqXTvbpleIDrHCX0mdIDbBPZ9JchDCXTJXiJCg
+TwVq+wKAv6ujgCsUQtDdEkVbhH/5b3VUMnLvJC6pweJ0MLTHUULHGcTtZkuS4mAV
++/xCuBNqz4AHSXPViKIfZ/eOE8c2l7USkGeKk1IyDvnF7P479cAdjw34C7gSe+1z
+8TwErZYbwbex530yZGsid0gOlKN8Chb12hKaDOU8oqhFEFCgVcQskwIDAQABo2Ew
+XzAdBgNVHQ4EFgQUNbt7QAsyt7NEHn/xvN6BEgV3900wPgYDVR0RBDcwNYINc2hp
+Ym8udmtvbC5jeoYkaHR0cHM6Ly9zaGliby52a29sLmN6L2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQBvf8Q6BumhEbT4H1K9clkLLepE8LrafTWFniv8
+2LXIqltCEcMjCerhAaXtcDBVBKFKFJx6kdO5aWQ+bdVZ45E1JMnS099aLyaj+Db2
+3wc4MiVGnsgWvJtUW4ebAWrggW4AG23NEta3Gq9bMzh4d4LVacK4Num85KlW5Ptg
+6stUJZ+7qQ2f66PByYeQ7KuIyfyYeQeC9Jdxhqh+f4eq55hfoe+xTiyqee+XjVSi
+v+8IGZJ5jUs5oKN/zYrSkLwtgg05gLGRRohYmrOenaIdvtJN7zezoZOEaq1G6scC
+EFATVycEnZXPpoVMS/L8mnJxbKmTSRcsOn8gsOBYLVIV03Zw
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibo.vkol.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibo.vkol.cz/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibo.vkol.cz/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibo.vkol.cz/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vkol.cz</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVANklP/WPGioD4uJOxCiHuW1lyYvLMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM5WhcN
+MzUxMDI3MTIzNDM5WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhK6yT8AnPYSFrdvpNPrk0/8CT77AHMcx
+KchaopWFfmb740mzgeMqM9fR6WomOHhqv8EoB+nxdnEBnVn0schp3F6Xuh5FK1d4
+TR6Hbc2LM1cZRlsXeUT1bk9SVkfI8pJV0va2Q/ffW1eKypXRuotD8NMA5L/SBo3I
+pQsPIDmb2zufEJQ2TPG3nCQ4viX+qPqs9Ptils7ZyNMywkxiYDIkYYttdP7hoduH
+pHTZF6lBbVME+VYJPfrTdPvbb72WlnysrrhcEmqMUirdcb4KQSmCuJ9rXVFhxq50
+mHD/ikn63M4DGKfFPOkMcedVjV76NuM6mc/9BIBUc4GjLfxspwtjTwIDAQABo2Ew
+XzAdBgNVHQ4EFgQUdjZRkENDX91W48XAsxxJEsyX3M4wPgYDVR0RBDcwNYINc2hp
+Ym8udmtvbC5jeoYkaHR0cHM6Ly9zaGliby52a29sLmN6L2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQAU2soh0Qe8YuEjVUYFEoZwdpZSAbxqV7ffVQQx
+ZDP8V7NS1yhiuSpaltYarEKEe79Roikw4o85TDoTLqOKHjvDBEoTEESDoEeEt85w
+CzsskVpEzKc9abziC+swCWwGp7h1hlmStE1+wqMENw7tu5bfG8TjVXazV6JAB/uW
+ch/yHVANoJSXRI1Lg5sQ6YJD48CJyk3HKxLegiBdArok3rupcUMzpU9Ibbi2lUe+
++jRxhQBU9X1CRgb5y6UdeWrFmE5N3tMsRP1D5hEOFDXzpMO+9N+mqNT74HXVHmBh
+IunquFiwHqaq+d/VHve7lJaNERMGP8dnUjTisHQYoBXzzE2Y
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUFpKDcZj8pgvy6pKI1EiT0+Z7PpAwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNc2hpYm8udmtvbC5jejAeFw0xNTEwMjcxMzM0MzdaFw0z
+NTEwMjcxMjM0MzdaMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDtm2eqb0mrOJR6/N76g8cADzU0Ba0rMwD
+LctnNi0s2Aj4pldpFinbF27krFNszV1pcpw9Ts9SmS27j6hhE0njlgG/+TsL2NAJ
+5h6fd/Zh+GD2WXKJhs7m5CsX5dIK8xCcY3CrZMtWay+tdTn9ZPm8fV61+dHJ/cA2
+c1MPD8ICd1iAjR+coAxkFO6nBWs64F1DC/bCVSKVltzGWcfpOS2QQVHEt9ptQ3ja
+iY51LVAdzHtUQM5DBXR7MvjsXbl9EjGahj/CRCkL95oiDr0kKjgqJXFiIgigRwWa
+JJ3WHIHD1am9m+V3bjhaSa2s6X6eTHD4XhZXkbByEz245dgR8dGFAgMBAAGjYTBf
+MB0GA1UdDgQWBBQU1Iq8GcJcBtzVSgnAblOs5nzafTA+BgNVHREENzA1gg1zaGli
+by52a29sLmN6hiRodHRwczovL3NoaWJvLnZrb2wuY3ovaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAHCLtsaQyGsVuR+Nqd+sk0qu5CdMMq3t4Dpi8AfL
+3WmzMobgZtnlT+M9k1/zQ8E/+RD9WALxFuWhywxI8An7Xvu4UShtjIOlYNlr6Xec
+t6JyKWyrPk4Lg6dhrd+Fm6OzTTYOtwDR/KoMx8O3mONzGLFp5qAvYbveEUqYlOZ5
+Y+n53tBF9hIjkOYsO/z0GUlu96PncZeZ96vc5Vm9lkW0gs7druFFc/GgUZ+1RB/R
+MrZqvpCJ8ufxMWB+d+Y0ogq5CXmYrvbVYiQf+KieHmY7jw7/oBTnYnM8JANC2pwe
+FhbZRUsHucC16PyRIVtne6BJfM1mwy6+BQTNUAl9y4KXO9U=
+ </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>
+MIIDIDCCAgigAwIBAgIVAKS9iTg+VmzdK2E7t2F4uc9lX0QAMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM4WhcN
+MzUxMDI3MTIzNDM4WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkrVwD9sKCqANF5mPXpBx8NTNogEBFFjZ
+LhxdGZrmM/VQGRtzd+Apgf6UxY6X20BPARo3TvgedQVvYhjC4TFU43J54CxepHwN
+igC0mLQ6F8K4RHmE3YzX5/ziocIqXTvbpleIDrHCX0mdIDbBPZ9JchDCXTJXiJCg
+TwVq+wKAv6ujgCsUQtDdEkVbhH/5b3VUMnLvJC6pweJ0MLTHUULHGcTtZkuS4mAV
++/xCuBNqz4AHSXPViKIfZ/eOE8c2l7USkGeKk1IyDvnF7P479cAdjw34C7gSe+1z
+8TwErZYbwbex530yZGsid0gOlKN8Chb12hKaDOU8oqhFEFCgVcQskwIDAQABo2Ew
+XzAdBgNVHQ4EFgQUNbt7QAsyt7NEHn/xvN6BEgV3900wPgYDVR0RBDcwNYINc2hp
+Ym8udmtvbC5jeoYkaHR0cHM6Ly9zaGliby52a29sLmN6L2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQBvf8Q6BumhEbT4H1K9clkLLepE8LrafTWFniv8
+2LXIqltCEcMjCerhAaXtcDBVBKFKFJx6kdO5aWQ+bdVZ45E1JMnS099aLyaj+Db2
+3wc4MiVGnsgWvJtUW4ebAWrggW4AG23NEta3Gq9bMzh4d4LVacK4Num85KlW5Ptg
+6stUJZ+7qQ2f66PByYeQ7KuIyfyYeQeC9Jdxhqh+f4eq55hfoe+xTiyqee+XjVSi
+v+8IGZJ5jUs5oKN/zYrSkLwtgg05gLGRRohYmrOenaIdvtJN7zezoZOEaq1G6scC
+EFATVycEnZXPpoVMS/L8mnJxbKmTSRcsOn8gsOBYLVIV03Zw
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibo.vkol.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="cs">Vědecká knihovna v Olomouci</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Research Library in Olomouc</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="cs">Vědecká knihovna v Olomouci</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Research Library in Olomouc</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.vkol.cz/en/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://www.vkol.cz/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Petr</md:GivenName>
+ <md:SurName>Novák</md:SurName>
+ <md:EmailAddress>petr.novak@ruk.cuni.cz</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml
index 15133c8b..d6dcdd39 100644
--- a/swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml
@@ -4,6 +4,11 @@
This is a Shibboleth IdP for Brunel University.
-->
<Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
</Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -82,7 +87,7 @@
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">Brunel University</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Brunel University</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Brunel University (Old)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.brunel.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
diff --git a/swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml b/swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml
new file mode 100644
index 00000000..36ba43ca
--- /dev/null
+++ b/swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signin.staging.studentmoneysaver.co.uk">
+ <!--
+ This is a test SP for Student Money Saver Ltd.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-20T11:21:13Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Student Money Saver (Test SP)</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This is a test­-only SP for Student Money Saver. Do not use in production.</mdui:Description>
+ <mdui:Logo height="61" width="107">https://cdn.studentmoneysaver.co.uk/assets/logos/sms-logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEKzCCAxOgAwIBAgIJAI3xfY2iDzkeMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+ VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSAwHgYD
+ VQQKDBdTdHVkZW50IE1vbmV5IFNhdmVyIExURDEPMA0GA1UECwwGRGV2T3BzMRcw
+ FQYDVQQDDA5zbXMtc2lnbmluLWFwaTEtMCsGCSqGSIb3DQEJARYeYWRyaWFuQHN0
+ dWRlbnRtb25leXNhdmVyLmNvLnVrMB4XDTE1MDYyNjA4NDcxMloXDTE3MDYyNTA4
+ NDcxMlowgasxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdFbmdsYW5kMQ8wDQYDVQQH
+ DAZMb25kb24xIDAeBgNVBAoMF1N0dWRlbnQgTW9uZXkgU2F2ZXIgTFREMQ8wDQYD
+ VQQLDAZEZXZPcHMxFzAVBgNVBAMMDnNtcy1zaWduaW4tYXBpMS0wKwYJKoZIhvcN
+ AQkBFh5hZHJpYW5Ac3R1ZGVudG1vbmV5c2F2ZXIuY28udWswggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDDh7gKf0OElHwbGJ9tCzuifS/1qfSFRxg8wBVk
+ Z8/gRSTPyr1xHRYeQMf9+W9bWejDaaDxQq/yRQDwGEOTYN/ghGlej/MD4tBlP4CS
+ qUP2stV91Vp8sSyz8Ue2F7surXWk04dav7wLNR3giwpLPL7rSBF8cG3sJiAgFnSC
+ 3uGLBlP/BHy2UzeWYPhteD80QjBnbGFSA/ETMlDIGj48HmdHyE7gATpVJ84Bw6Db
+ Ac0xiNKP4rFL0QzD55q4NR1/GQB4MqZdoTA3LXKPrO8HRkIQqEDA3WjcpCQeKuqt
+ VPU9mB/XSdzV3+iCVsIW1dSYNnC1FJWB5LBnQijEylcJSY2NAgMBAAGjUDBOMB0G
+ A1UdDgQWBBQv1uF4H7q9kZG4TSDpZBWU+yE2BjAfBgNVHSMEGDAWgBQv1uF4H7q9
+ kZG4TSDpZBWU+yE2BjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAL
+ ea2RNtk74QMKsbwzICCuADT/rllrKNzsgAkaAjcCdL+DfspFZSnav40MB7ksK16t
+ aebkpkCK6x3vE5eU3bosiOGektkVoAjbb+BVhuEQHSV17FaXQnkUe2t1httVIihx
+ WF/bCXqIzLkbz3KhMX/oYWnLvB7R4UcmaPxImRmcJ5BFA6UXHqlU+d3/9+oOErUu
+ TJBBU9BcDoIAcfgMe5MaDXNdVa2P8HD+JDeE3EWx1L7KEOVQaSfekYSTSmstnqBj
+ OL0Jr2kxldHRwhrHu50f2PMJFKwvjy4/X79YwapTCn1ee7FWft255LdEqpBFz+we
+ y3MXd8zZdHL4dhUTYdiF
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEKzCCAxOgAwIBAgIJAI3xfY2iDzkeMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+ VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSAwHgYD
+ VQQKDBdTdHVkZW50IE1vbmV5IFNhdmVyIExURDEPMA0GA1UECwwGRGV2T3BzMRcw
+ FQYDVQQDDA5zbXMtc2lnbmluLWFwaTEtMCsGCSqGSIb3DQEJARYeYWRyaWFuQHN0
+ dWRlbnRtb25leXNhdmVyLmNvLnVrMB4XDTE1MDYyNjA4NDcxMloXDTE3MDYyNTA4
+ NDcxMlowgasxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdFbmdsYW5kMQ8wDQYDVQQH
+ DAZMb25kb24xIDAeBgNVBAoMF1N0dWRlbnQgTW9uZXkgU2F2ZXIgTFREMQ8wDQYD
+ VQQLDAZEZXZPcHMxFzAVBgNVBAMMDnNtcy1zaWduaW4tYXBpMS0wKwYJKoZIhvcN
+ AQkBFh5hZHJpYW5Ac3R1ZGVudG1vbmV5c2F2ZXIuY28udWswggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDDh7gKf0OElHwbGJ9tCzuifS/1qfSFRxg8wBVk
+ Z8/gRSTPyr1xHRYeQMf9+W9bWejDaaDxQq/yRQDwGEOTYN/ghGlej/MD4tBlP4CS
+ qUP2stV91Vp8sSyz8Ue2F7surXWk04dav7wLNR3giwpLPL7rSBF8cG3sJiAgFnSC
+ 3uGLBlP/BHy2UzeWYPhteD80QjBnbGFSA/ETMlDIGj48HmdHyE7gATpVJ84Bw6Db
+ Ac0xiNKP4rFL0QzD55q4NR1/GQB4MqZdoTA3LXKPrO8HRkIQqEDA3WjcpCQeKuqt
+ VPU9mB/XSdzV3+iCVsIW1dSYNnC1FJWB5LBnQijEylcJSY2NAgMBAAGjUDBOMB0G
+ A1UdDgQWBBQv1uF4H7q9kZG4TSDpZBWU+yE2BjAfBgNVHSMEGDAWgBQv1uF4H7q9
+ kZG4TSDpZBWU+yE2BjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAL
+ ea2RNtk74QMKsbwzICCuADT/rllrKNzsgAkaAjcCdL+DfspFZSnav40MB7ksK16t
+ aebkpkCK6x3vE5eU3bosiOGektkVoAjbb+BVhuEQHSV17FaXQnkUe2t1httVIihx
+ WF/bCXqIzLkbz3KhMX/oYWnLvB7R4UcmaPxImRmcJ5BFA6UXHqlU+d3/9+oOErUu
+ TJBBU9BcDoIAcfgMe5MaDXNdVa2P8HD+JDeE3EWx1L7KEOVQaSfekYSTSmstnqBj
+ OL0Jr2kxldHRwhrHu50f2PMJFKwvjy4/X79YwapTCn1ee7FWft255LdEqpBFz+we
+ y3MXd8zZdHL4dhUTYdiF
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signin.staging.studentmoneysaver.co.uk/saml/signout/"/>
+ <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://signin.staging.studentmoneysaver.co.uk/saml/consume/" index="1"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Student Money Saver Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Student Money Saver (Test SP)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://www.studentmoneysaver.co.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Support Team</GivenName>
+ <EmailAddress>mailto:support@studentmoneysaver.co.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Adrian</GivenName>
+ <SurName>Silimon</SurName>
+ <EmailAddress>mailto:adrian@studentmoneysaver.co.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
index 4a9d1b1c..5fb83bec 100644
--- a/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
@@ -108,19 +108,19 @@ CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
<md:ContactPerson contactType="administrative">
<md:Company>Halmstad University</md:Company>
<md:SurName>Magnus Morén</md:SurName>
- <md:EmailAddress>magnus.moren@hh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
<md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Halmstad University</md:Company>
<md:SurName>Magnus Morén</md:SurName>
- <md:EmailAddress>magnus.moren@hh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
<md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Halmstad University</md:Company>
<md:SurName>Helpdesk Högskloan i Halmstad</md:SurName>
- <md:EmailAddress>helpdesk@hh.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
<md:TelephoneNumber>+35 167800</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
index 1208e2a7..e3862b92 100644
--- a/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
@@ -13,9 +13,9 @@
<mdui:DisplayName xml:lang="en">University of Groningen</mdui:DisplayName>
<mdui:Description xml:lang="nl">Rijksuniversiteit Groningen</mdui:Description>
<mdui:Description xml:lang="en">Rijksuniversiteit Groningen</mdui:Description>
- <mdui:Logo height="25" width="108">https://static.surfconext.nl/media/idp/rug.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">University of Groningen Rijksuniversiteit Groningen RUG</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">University of Groningen Rijksuniversiteit Groningen RUG</mdui:Keywords>
+ <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/rug.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">university of groningen rijksuniversiteit groningen rug</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">university of groningen rijksuniversiteit groningen rug</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..2a6df77c
--- /dev/null
+++ b/swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://slateford.edina.ac.uk/idp/shibboleth">
+ <!--
+ This is a "Slateford Test" Shibboleth IdP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-30T09:42:06Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slateford.edina.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPzCCAiegAwIBAgIUaFQBDsbQD1myaqUBq2Sfj+zNqTMwDQYJKoZIhvcNAQEL
+ BQAwIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5hLmFjLnVrMB4XDTE1MDkxNzE1
+ MTIzNloXDTM1MDkxNzE1MTIzNlowIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5h
+ LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAntjVOxkCP9da
+ ER4feMyp9emdkDLUsIyz4ER7mfzIOX3MV4kBixou796nBXc0DW1Tamh8k1+e/y/d
+ xL3hX2Mje/grZMQrCgTnUUcMb4Chs1mMgA1nrYGBZcDzeCPFNe/65yohIWlR9RLo
+ vGRitaHu2P8edI+Ax82woCD/eFq8uf25KT2mpY2PzFH3qsASR9vPE1SjVj9/IyEL
+ vaMpPhfFhQ1cwKG9WZr6FmX3oWQwNRTUyv5Oke7S/IKk4ucogtnrGsxql8zasjpL
+ 7iVVHuiFYEYPDLbuags7dJ66GMyufpXYhJiWb7VJrMuTt6jjMAdGsjkOTJtha6YF
+ +iB2m3NkWQIDAQABo3EwbzAdBgNVHQ4EFgQUxERMysccN0DYIXIaspFY2+9BNRkw
+ TgYDVR0RBEcwRYIVc2xhdGVmb3JkLmVkaW5hLmFjLnVrhixodHRwczovL3NsYXRl
+ Zm9yZC5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+ AQEAF4VaakgAejlEA4YlVymEXCstzhKpN66lZuL+lW3Y91EgoabxD5dyq0mezO+Y
+ Gt7UNGGnSRt9UxDkY7E4heeVBGmdoFPBj0wsUGXcfTOZ3/TTTJYmtEKEFLU5S5Nv
+ wF4O4IDVsT3VDy/5u5iOtNGT4F1wMXFgHjC7PCpgHL6VvYX2w5O/abZvFMMtFE3M
+ avfm9oJO4Ai+eWZXEucqZX0HS8hVAzxLRDrZOmZLiLaYBPujvqligEa++K6WJpu0
+ 495tpKxyzKlo4C5QKUDpViGUP58XSD5kJCJeS4Ymi+WV+aFs/O8lmZ5hDfewOc1g
+ 5uS5lUQuoXJ9EWaUU4yHKgG38Q==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDQDCCAiigAwIBAgIVAJXbfu0qWAZqhGmvDTbCJH2YO2I8MA0GCSqGSIb3DQEB
+ CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
+ NTEyMzRaFw0zNTA5MTcxNTEyMzRaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
+ YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ+y62JbfCH7
+ z71R9TDNbvfuuLigntMBihrLoozF2Km+yk3uLfqbQX9HDWEpQt3fS3oSdRJxR3H2
+ Mnk3/wfu4KeIMhN1avZsEbzN/BsnX+Cqw/SLi1V5OAqqSZI7yr6NmTE5TqW0/h0n
+ S7Xq4D45zrbzGZ/3/W7X+707o/9UV/V0HLb/A3HSCJJ4oIGYbHkzqfREoO6r0fDu
+ siv5KQZBmonyi7qkkzDFtOk+zyaJxJQdUymz1XuvkUAhNf50cSjyoyiObmIdCdBg
+ cPOjVFIMcbGXlb7h4q1yoCCj+eBwR8HzZ4kwHDy5M/nU0jkX9d5A3ls9Li22W3GY
+ eoAhtUO56a8CAwEAAaNxMG8wHQYDVR0OBBYEFOeXB8Kk8+DvOBzzPYfnPV/VDG4V
+ ME4GA1UdEQRHMEWCFXNsYXRlZm9yZC5lZGluYS5hYy51a4YsaHR0cHM6Ly9zbGF0
+ ZWZvcmQuZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ ggEBAIOF8rTpggkzBYuwVbvnbrlzD8tV7BgbU4QDpWCtgolHoL+qm9AYoSoxO+Uh
+ JF7049JiVNdX9TgGDHTOtQkRUBQ5uirhaeJcJMlUTs7JTmQM49hTaI1fcxZ5rD5t
+ Q5WoLcyiGNan46wVen32DBSqtuqKM3cfGciQPuRNWIKeD7a9TawyH9C4h0b84mFN
+ d+vDupXO0jo/NDCdwrG9KqSebhI6dlKerEQ5VtvAEMWBY0iAdo4SyhT3XxjLm/A8
+ 3/6MjSrnTGa+QNCQYYKgPYEcUi5O3Pzt5kqELoU4AEHS9UePQ5no+8VLaNrOanrk
+ UgdUiNZ8Ouem7SX/w7R0VgYEvno=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDQDCCAiigAwIBAgIVAKOoQhLtWEUvuc1BChPnl4v49qTyMA0GCSqGSIb3DQEB
+ CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
+ NTEyMzVaFw0zNTA5MTcxNTEyMzVaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
+ YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgms50q8J1x
+ sHNNtr5zF3cq5+K1cjdKekiDWNry+iPp1W8mNPm/ExP/CDHZrU4W9U5S7I+CrPOH
+ 1jECGhS7ezEoXs0slc9zKIetcKbOV3AcLcorQildO/y8A+Rn6qwSQ59+zGRcxccI
+ Os5EXVgpNMZy9coUPk/tnVPC9javymsodJYGX3nUT/E//YmWxRWWbLtkqPf2R8N3
+ qRVQ7e1Z4i1pvdG++ANGXjg6TvPHJivdLj2LfoGcJGu1YTbmfKC0sDbXNp86rFcY
+ YAWqrMTiAL9kaYT+UDS5ZCnxc2IH+nXQh9OwC+qLyf1ZoXN5ezODwKxagBvH9Ypt
+ 6iED7+6TA58CAwEAAaNxMG8wHQYDVR0OBBYEFOwRhkPfA8Cwo0ReFdBFgQy+WqNS
+ ME4GA1UdEQRHMEWCFXNsYXRlZm9yZC5lZGluYS5hYy51a4YsaHR0cHM6Ly9zbGF0
+ ZWZvcmQuZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ ggEBAEcHtO97dQXmxDs3IsZcIJh+XM/m07JFm6rtcPnuuyIM7Ys7cUL460h0qe2+
+ enFYdxe7FCib36zFaaSp0SYE2FWnuWMtLzg9JAIl7HBPLFdSzryJsH0gMyKOPFff
+ 2mF6of6K/AolKNP1enS0DgY0LiCY74VEh4S4COm4sUkHPRtMJTtRrkoiLuNXMUaL
+ JQdDzzK6KZ4uQucPErvQxXjhaNCAHUQRclR+QfFM9Ibr3uIbD+Zs50fFkS/ihlhk
+ 1quXSXm1737rQJwd9EsXzGhUxxdRC2H/ly3H8E0NuDgeWfmBYVkXUn4JY1J2W1Dq
+ xnuCMY0qHTFh2QuZSh0kGrs2wcY=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://slateford.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://slateford.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slateford.edina.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDPzCCAiegAwIBAgIUaFQBDsbQD1myaqUBq2Sfj+zNqTMwDQYJKoZIhvcNAQEL
+ BQAwIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5hLmFjLnVrMB4XDTE1MDkxNzE1
+ MTIzNloXDTM1MDkxNzE1MTIzNlowIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5h
+ LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAntjVOxkCP9da
+ ER4feMyp9emdkDLUsIyz4ER7mfzIOX3MV4kBixou796nBXc0DW1Tamh8k1+e/y/d
+ xL3hX2Mje/grZMQrCgTnUUcMb4Chs1mMgA1nrYGBZcDzeCPFNe/65yohIWlR9RLo
+ vGRitaHu2P8edI+Ax82woCD/eFq8uf25KT2mpY2PzFH3qsASR9vPE1SjVj9/IyEL
+ vaMpPhfFhQ1cwKG9WZr6FmX3oWQwNRTUyv5Oke7S/IKk4ucogtnrGsxql8zasjpL
+ 7iVVHuiFYEYPDLbuags7dJ66GMyufpXYhJiWb7VJrMuTt6jjMAdGsjkOTJtha6YF
+ +iB2m3NkWQIDAQABo3EwbzAdBgNVHQ4EFgQUxERMysccN0DYIXIaspFY2+9BNRkw
+ TgYDVR0RBEcwRYIVc2xhdGVmb3JkLmVkaW5hLmFjLnVrhixodHRwczovL3NsYXRl
+ Zm9yZC5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+ AQEAF4VaakgAejlEA4YlVymEXCstzhKpN66lZuL+lW3Y91EgoabxD5dyq0mezO+Y
+ Gt7UNGGnSRt9UxDkY7E4heeVBGmdoFPBj0wsUGXcfTOZ3/TTTJYmtEKEFLU5S5Nv
+ wF4O4IDVsT3VDy/5u5iOtNGT4F1wMXFgHjC7PCpgHL6VvYX2w5O/abZvFMMtFE3M
+ avfm9oJO4Ai+eWZXEucqZX0HS8hVAzxLRDrZOmZLiLaYBPujvqligEa++K6WJpu0
+ 495tpKxyzKlo4C5QKUDpViGUP58XSD5kJCJeS4Ymi+WV+aFs/O8lmZ5hDfewOc1g
+ 5uS5lUQuoXJ9EWaUU4yHKgG38Q==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDQDCCAiigAwIBAgIVAJXbfu0qWAZqhGmvDTbCJH2YO2I8MA0GCSqGSIb3DQEB
+ CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
+ NTEyMzRaFw0zNTA5MTcxNTEyMzRaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
+ YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ+y62JbfCH7
+ z71R9TDNbvfuuLigntMBihrLoozF2Km+yk3uLfqbQX9HDWEpQt3fS3oSdRJxR3H2
+ Mnk3/wfu4KeIMhN1avZsEbzN/BsnX+Cqw/SLi1V5OAqqSZI7yr6NmTE5TqW0/h0n
+ S7Xq4D45zrbzGZ/3/W7X+707o/9UV/V0HLb/A3HSCJJ4oIGYbHkzqfREoO6r0fDu
+ siv5KQZBmonyi7qkkzDFtOk+zyaJxJQdUymz1XuvkUAhNf50cSjyoyiObmIdCdBg
+ cPOjVFIMcbGXlb7h4q1yoCCj+eBwR8HzZ4kwHDy5M/nU0jkX9d5A3ls9Li22W3GY
+ eoAhtUO56a8CAwEAAaNxMG8wHQYDVR0OBBYEFOeXB8Kk8+DvOBzzPYfnPV/VDG4V
+ ME4GA1UdEQRHMEWCFXNsYXRlZm9yZC5lZGluYS5hYy51a4YsaHR0cHM6Ly9zbGF0
+ ZWZvcmQuZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ ggEBAIOF8rTpggkzBYuwVbvnbrlzD8tV7BgbU4QDpWCtgolHoL+qm9AYoSoxO+Uh
+ JF7049JiVNdX9TgGDHTOtQkRUBQ5uirhaeJcJMlUTs7JTmQM49hTaI1fcxZ5rD5t
+ Q5WoLcyiGNan46wVen32DBSqtuqKM3cfGciQPuRNWIKeD7a9TawyH9C4h0b84mFN
+ d+vDupXO0jo/NDCdwrG9KqSebhI6dlKerEQ5VtvAEMWBY0iAdo4SyhT3XxjLm/A8
+ 3/6MjSrnTGa+QNCQYYKgPYEcUi5O3Pzt5kqELoU4AEHS9UePQ5no+8VLaNrOanrk
+ UgdUiNZ8Ouem7SX/w7R0VgYEvno=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDQDCCAiigAwIBAgIVAKOoQhLtWEUvuc1BChPnl4v49qTyMA0GCSqGSIb3DQEB
+ CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
+ NTEyMzVaFw0zNTA5MTcxNTEyMzVaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
+ YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgms50q8J1x
+ sHNNtr5zF3cq5+K1cjdKekiDWNry+iPp1W8mNPm/ExP/CDHZrU4W9U5S7I+CrPOH
+ 1jECGhS7ezEoXs0slc9zKIetcKbOV3AcLcorQildO/y8A+Rn6qwSQ59+zGRcxccI
+ Os5EXVgpNMZy9coUPk/tnVPC9javymsodJYGX3nUT/E//YmWxRWWbLtkqPf2R8N3
+ qRVQ7e1Z4i1pvdG++ANGXjg6TvPHJivdLj2LfoGcJGu1YTbmfKC0sDbXNp86rFcY
+ YAWqrMTiAL9kaYT+UDS5ZCnxc2IH+nXQh9OwC+qLyf1ZoXN5ezODwKxagBvH9Ypt
+ 6iED7+6TA58CAwEAAaNxMG8wHQYDVR0OBBYEFOwRhkPfA8Cwo0ReFdBFgQy+WqNS
+ ME4GA1UdEQRHMEWCFXNsYXRlZm9yZC5lZGluYS5hYy51a4YsaHR0cHM6Ly9zbGF0
+ ZWZvcmQuZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ ggEBAEcHtO97dQXmxDs3IsZcIJh+XM/m07JFm6rtcPnuuyIM7Ys7cUL460h0qe2+
+ enFYdxe7FCib36zFaaSp0SYE2FWnuWMtLzg9JAIl7HBPLFdSzryJsH0gMyKOPFff
+ 2mF6of6K/AolKNP1enS0DgY0LiCY74VEh4S4COm4sUkHPRtMJTtRrkoiLuNXMUaL
+ JQdDzzK6KZ4uQucPErvQxXjhaNCAHUQRclR+QfFM9Ibr3uIbD+Zs50fFkS/ihlhk
+ 1quXSXm1737rQJwd9EsXzGhUxxdRC2H/ly3H8E0NuDgeWfmBYVkXUn4JY1J2W1Dq
+ xnuCMY0qHTFh2QuZSh0kGrs2wcY=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://slateford.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Slateford Test IdP</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://ukfederation.org.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Alex</GivenName>
+ <SurName>Stuart</SurName>
+ <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Alex</GivenName>
+ <SurName>Stuart</SurName>
+ <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index 1cfa40b1..31692a11 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -22,7 +22,7 @@
<mdui:Description xml:lang="en">For the Component Registry, Virtual Language Observatory.</mdui:Description>
<mdui:Logo height="220" width="195">https://www.clarin.eu/sites/default/files/clarin-logo.png</mdui:Logo>
<mdui:InformationURL xml:lang="en">https://www.clarin.eu/applications</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.xhtml</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml b/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml
index 3e8d2b56..efed8895 100644
--- a/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml
+++ b/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml
@@ -6,26 +6,34 @@
</mdrpi:RegistrationInfo>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">NTUU KPI SP</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Service Provider for NTUU KPI</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://sp.kpi.ua</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://sp.kpi.ua/privacy-policy.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIFjDCCBHSgAwIBAgIQJdpkZjptOQA5pnowv0xMuDANBgkqhkiG9w0BAQsFADCB
+MIIFjDCCBHSgAwIBAgIQEUOHKK6sc4pWmFK5HgFIITANBgkqhkiG9w0BAQsFADCB
kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
-QTAeFw0xNDEyMDcwMDAwMDBaFw0xNTEyMDcyMzU5NTlaMIGZMSEwHwYDVQQLExhE
+QTAeFw0xNTEyMDMwMDAwMDBaFw0xNzAzMDUyMzU5NTlaMIGZMSEwHwYDVQQLExhE
b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxQjBABgNVBAsTOVByb3ZpZGVkIGJ5IENl
bnRlciBvZiBVa3JhaW5pYW4gSW50ZXJuZXQgTmFtZXMgKFVLUk5BTUVTKTEcMBoG
A1UECxMTVWtybmFtZXMgRG9tYWluIFNTTDESMBAGA1UEAxMJc3Aua3BpLnVhMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvDCTRNYQM7vSTaGu1nbVBN9a
-Azcw9xuIhWFQRR3gU4oJEInF/81viGwj3p5Y9e4mtLcUL4dizEE20+HCix/wBhbQ
-m1s9WqPG41sGx1/O5Rr8uGBghHMrINUODIADfovTI5fND8r9ViOzKqKY2fH8i+jL
-EsQISAsg6l43+rHNKikmmA+P7a/WB95QIiYbUjWZEQ8X/LP0TkGCxf4iBjxmVQKA
-L9wQZIn1cFY2tsEGU9//DCUxBwr99XKR2HP+WRM19uR/pTYqa8tGwfzwpBLkYnwU
-i2+WE91TC354idQGdl8wxNf7WC9MRMLQ9tkEnb6z3viEC2bZlG5OiFvP4+n7mQID
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvonPE5+8bja2hn3MFzSwhuAB
+vFZBdpUq7//hvcpNsdHSjNBL5oWTT99bO+E4hIjf5HaSl1T6ZcH2KNl1AWHFKZnO
+pLoi57mX0e8iMYXkOC5SCxSOEURgyBzjDO0bg26NuxWKnTHNjcRqTt3X+aI8qOHa
+EbvokM6E4MmKUErQqBlC85KrNS6Mn6oclRjNP/QYfKk5LE1wQwEa9WEGIMfzXwbz
+IFA61/Shscrq2LOEYAo1L/2Lp6xWPgnPrHXJNN1jj8tvINnslAJ6qTVNPbGWDgni
+zY5rAhcNSJOeWfaKsJdSD4vrcFWhMsf34HI+/EYyn99mjSzU5FtAoEzAcjqFiQID
AQABo4IB1TCCAdEwHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYD
-VR0OBBYEFNXV2PBr83lrigDkN00nOuovjpIZMA4GA1UdDwEB/wQEAwIFoDAMBgNV
+VR0OBBYEFIMTyzQx9IadYPh9b4ApSthFUYIFMA4GA1UdDwEB/wQEAwIFoDAMBgNV
HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAE
SDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJl
LmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmgR6BFhkNodHRw
@@ -34,50 +42,12 @@ dXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYBBQUHMAKGQ2h0
dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25T
ZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k
b2NhLmNvbTAjBgNVHREEHDAagglzcC5rcGkudWGCDXd3dy5zcC5rcGkudWEwDQYJ
-KoZIhvcNAQELBQADggEBAB22SGBsT56eFD18+OlzpV5ekVZu3dLFCeXqQs+2laap
-ohp21Jz4ALszsiaXTBw3ncRiPeietPSt5fAcRQhHIlxFLbvlIyul09K94mPxIVWz
-fh3lssluP1PBZQWwfWX4UuOJ9VoRxu7rRMQhPqVEyBisExHRzE4GutKe232yaLOS
-XePBGsw/FmCCGfQUh/qze9M5RTp7cae7jGT7NvKKjQm1Rzp3zjHlJrERrhewwABW
-pZu1QnDsbEyaNXKrlp4NpVX38A9yWwJH9kjrJauIf9zXFsvUFKL3WxfcnvvdTWBQ
-10LU/OxaUIfI2PtYbA2WWTMz5DxjI3qyYd2/MSO0BKc=
-</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>
-MIIFjDCCBHSgAwIBAgIQJdpkZjptOQA5pnowv0xMuDANBgkqhkiG9w0BAQsFADCB
-kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
-BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
-QTAeFw0xNDEyMDcwMDAwMDBaFw0xNTEyMDcyMzU5NTlaMIGZMSEwHwYDVQQLExhE
-b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxQjBABgNVBAsTOVByb3ZpZGVkIGJ5IENl
-bnRlciBvZiBVa3JhaW5pYW4gSW50ZXJuZXQgTmFtZXMgKFVLUk5BTUVTKTEcMBoG
-A1UECxMTVWtybmFtZXMgRG9tYWluIFNTTDESMBAGA1UEAxMJc3Aua3BpLnVhMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvDCTRNYQM7vSTaGu1nbVBN9a
-Azcw9xuIhWFQRR3gU4oJEInF/81viGwj3p5Y9e4mtLcUL4dizEE20+HCix/wBhbQ
-m1s9WqPG41sGx1/O5Rr8uGBghHMrINUODIADfovTI5fND8r9ViOzKqKY2fH8i+jL
-EsQISAsg6l43+rHNKikmmA+P7a/WB95QIiYbUjWZEQ8X/LP0TkGCxf4iBjxmVQKA
-L9wQZIn1cFY2tsEGU9//DCUxBwr99XKR2HP+WRM19uR/pTYqa8tGwfzwpBLkYnwU
-i2+WE91TC354idQGdl8wxNf7WC9MRMLQ9tkEnb6z3viEC2bZlG5OiFvP4+n7mQID
-AQABo4IB1TCCAdEwHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYD
-VR0OBBYEFNXV2PBr83lrigDkN00nOuovjpIZMA4GA1UdDwEB/wQEAwIFoDAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAE
-SDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJl
-LmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmgR6BFhkNodHRw
-Oi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2Vj
-dXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYBBQUHMAKGQ2h0
-dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25T
-ZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k
-b2NhLmNvbTAjBgNVHREEHDAagglzcC5rcGkudWGCDXd3dy5zcC5rcGkudWEwDQYJ
-KoZIhvcNAQELBQADggEBAB22SGBsT56eFD18+OlzpV5ekVZu3dLFCeXqQs+2laap
-ohp21Jz4ALszsiaXTBw3ncRiPeietPSt5fAcRQhHIlxFLbvlIyul09K94mPxIVWz
-fh3lssluP1PBZQWwfWX4UuOJ9VoRxu7rRMQhPqVEyBisExHRzE4GutKe232yaLOS
-XePBGsw/FmCCGfQUh/qze9M5RTp7cae7jGT7NvKKjQm1Rzp3zjHlJrERrhewwABW
-pZu1QnDsbEyaNXKrlp4NpVX38A9yWwJH9kjrJauIf9zXFsvUFKL3WxfcnvvdTWBQ
-10LU/OxaUIfI2PtYbA2WWTMz5DxjI3qyYd2/MSO0BKc=
+KoZIhvcNAQELBQADggEBAIFHyhglkkb80erci5a4pK6Vgsi2C34WxnUZzcwWmD3G
+m3UJsOkNPDAv3E1bifayu05nZQdLHy1crtgKs0q5FkqhPSBs6iOzr5YObCZOCVl7
+rYyarYeMXdqcPYKuRYXPO3Z8RGoVPYRyUU7gi5lyz+5i1EeSFqEkwVGTV7EzjBtr
+scGwj5R7R1F8+6m+zW6wLnJqIIYUZ8UpxtF7n/Mtza8bdJQJ+39JeHX+ZErdYh3e
+2a7XcvfmOg9UBEhd/UhzCegDplloCmxzt2dmmlFEPj/IA5wJCtc0nUmeirxhYoZx
+5GHTzCwt0Z2osUZDlKP/lZr+nSBukUtRYtyoNNJoUJ0=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -88,9 +58,8 @@ pZu1QnDsbEyaNXKrlp4NpVX38A9yWwJH9kjrJauIf9zXFsvUFKL3WxfcnvvdTWBQ
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml2-acs.php/ntuu-kpi-sp" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml1-acs.php/ntuu-kpi-sp/artifact" index="3"/>
<md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="ru">НТУУ "КПИ"</md:ServiceName>
- <md:ServiceName xml:lang="uk">НТУУ "КПІ"</md:ServiceName>
- <md:ServiceName xml:lang="en">NTUU "KPI"</md:ServiceName>
+ <md:ServiceName xml:lang="en">NTUU KPI SP</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Service Provider for NTUU KPI</md:ServiceDescription>
<md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml
new file mode 100644
index 00000000..37f75852
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/asme/development/shibboleth">
+ <!--
+ This is a "ASME Digital Collection" Shibboleth SP for Silverchair Science + Communications, LLC.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-14T10:40:52Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://asmedevscm6.asme.org/Shibboleth.sso/Login"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDOzCCAiOgAwIBAgIJAMfTOFohtsoAMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+ BAMTFGFzbWVkZXZzY202LmFzbWUub3JnMB4XDTE1MDgzMTE0NTMzMVoXDTI1MDgy
+ ODE0NTMzMVowHzEdMBsGA1UEAxMUYXNtZWRldnNjbTYuYXNtZS5vcmcwggEiMA0G
+ CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSIr0BKju2k50Sy1RXMDOr8FwVVvpb
+ vKu9UV48mmpSofl2iUvfohhDIahO0GxZGpUElfobckm37ON6CPZW/Qzeu3mO/Lsq
+ Czg92js9dRZ/NSvE6xMrZEt46VxsND8lWrepU0E/k7HsexZnh4U2itZ5e8gpzyRP
+ xAueR3SKDEtpPhoabGKqRD1LfzevS7ozGwQ02r/YysMYV/M+l86zREKMSfQijRFk
+ UYQj5O2Pf78zX7cbuPFJJFNeCns74GV5+ILgia0STTRNRiigBGDFq1xFltxLarZD
+ j5cPQdMGPoFjDsJc5CNv2jsfvMiC7zl8qQ/ZHJk8h7J0L2wTZDe9S56bAgMBAAGj
+ ejB4MFcGA1UdEQRQME6CFGFzbWVkZXZzY202LmFzbWUub3JnhjZodHRwczovL3Nw
+ LnNpbHZlcmNoYWlyLmNvbS9hc21lL2RldmVsb3BtZW50L3NoaWJib2xldGgwHQYD
+ VR0OBBYEFOO5r/GmeZWnFDh7lRQxNgZdZycRMA0GCSqGSIb3DQEBBQUAA4IBAQBw
+ wnbyHm+pB8WR8Aj7C1QXUVDXW8G1ZOj7Ltgw9c58MaaZttNqk1euI/E4F6JNYIoe
+ kmqrLXxaQodFgXVzbzA+qZ5wMoe7Z1mrc6tipT4HKLwwqxbv7IQ/8yhtyUGhjcKl
+ PhNsNc5YO9/rLGO6XDBniny2MelwT+lXV2iQaKp/BUKq8+Wb55q9mW+/uu1KUIuq
+ FMt+UCEZxiIeWk2XvifgntDR8BGvoLx8Ofu6aGjUQm75XLxmKqXkC8Z5gPs4rxZ4
+ rMp9E87N8wIkNyEvWdd5YgDwtMqHgcFSuzv0r1aEr8AbTxKU4cNTiHMYd/8DJDSI
+ bSaO7kJ1d0p5tmwRU8PK
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedevscm6.asme.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/POST" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Silverchair Development: ASME Digital Collection</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.asme.org/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Shibboleth Admin</GivenName>
+ <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Ben</GivenName>
+ <SurName>Call</SurName>
+ <EmailAddress>mailto:benc@silverchair.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml b/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
index c52e5800..e58480e2 100644
--- a/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp24-test.garr.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp24-test.garr.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-07T12:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
diff --git a/swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml b/swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml
index 66a6eaf1..c1e19f71 100644
--- a/swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml
@@ -15,32 +15,23 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEtTCCA52gAwIBAgIRAL/UEGcEJdNoENNZxjwllnswDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjEyMDQwMDAwMDBaFw0xNTEyMDQyMzU5NTlaMIGCMQswCQYD
- VQQGEwJHQjEWMBQGA1UECBMNSGVydGZvcmRzaGlyZTESMBAGA1UEBxMJSGlueHdv
- cnRoMSowKAYDVQQKEyFFYXN0IG9mIEVuZ2xhbmQgQnJvYWRiYW5kIE5ldHdvcmsx
- GzAZBgNVBAMTEnNwcm92dGVzdC5lMmJuLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
- ggEPADCCAQoCggEBANi6wBjpI+9v4mtgwak4/6Ykh8fULaEyxwuSNG4lIHcEjny9
- Yy1+1A9jGF1TZybUPeHYAysVGu0Y5q7Tgf03IA6ERR5/UDb1OvWJCY9QVQg1riyN
- 6pjc+tiXRKbgrD9NLxUb3cS6i/KbkOsYb67y8E22HHpW1+GQr43maTv344MkF4ps
- rrMsZynKh0UU9SfyLrifY5vIGosP1Jv5H3Vwg7lfspV2R1l1ygGLAmAlZclq/P23
- bFGaIFkt1S20oGFd2J/XXt7a5Akmv0qopx1PPwWynQktVKPT6TEelGdI+jigkNew
- hICxngBHXVbMKWF/LIiOnRkj5u4GqDecNftH9K8CAwEAAaOCAW8wggFrMB8GA1Ud
- IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRwMgOxyc7vDLfY
- 1VUuMJsc1HQgvTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
- FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
- HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
- ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
- BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
- BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYw
- FIISc3Byb3Z0ZXN0LmUyYm4ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBy6YBtW4u2
- ZUwPqkdCJFqeVKpvBO9viQUKfvW5DoPfZPTHPWCDGaLZPG0KgWcTZhagUaKwDVoK
- lBSr4+N+ASc9UxLeWRcm5UEJdKT8GZx1xTtfYnla9hTd4uG2k6uAL06p/MmsKAQL
- nHid0QBJ0CWvvVKFNuUCusEhUgRP4vlSR6dYmHcXP0o3TCk2diFGS8MIAEJhULTH
- 2I8C0E8ig5uIfjiR1LD22/QWsZZJ5Ij8CJ/DhcW4Vlwk9cJpdbxZi69Q4OGFyuEb
- s+Ov/y9lDqjYhtuYOBRcsp7WwbGlTubBX0E2iCXxgkCd0w7FBs7gzRgQnOqcfWI8
- qKjQKYBJZIJI
+ MIIDCTCCAfGgAwIBAgIJAME6p5J6275MMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+ BAMTCXNwcm92dGVzdDAeFw0xNTExMjMxMTE0NTZaFw0yNTExMjAxMTE0NTZaMBQx
+ EjAQBgNVBAMTCXNwcm92dGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ ggEBAMrP3s/YWGdpfZ8vpuUJ84u01pPdN5TPCsMbNdvCTg02ICxUcCxVhCvEu6XO
+ j1XMxmShOfsK7yjQwkGW78aq3N4mu174ge693YA+cr5aQ/bRyD3ivQL6pdZ0JZjJ
+ b8WQlymZD1DDFQzYTsGbUO4Ehle/xcg4VsfGnsL9+oMdBu1do2hT5YlCX/i6t46J
+ yGs7hwNdMa3lzykQgvjBwqtXNgh5YE7vuPq71kwLS92tdwBT5McOvBU0SvcRSvdf
+ xDFk+VdtEXtqwRpQfSnHC3bs70x+o7S0Di1aiBtxsP8cHXNBv5fWvYPMQ+qvhHVD
+ JBffRvOjPpEJlFqVgz9mv4UuSsUCAwEAAaNeMFwwOwYDVR0RBDQwMoIJc3Byb3Z0
+ ZXN0hiVodHRwczovL3Nwcm92dGVzdC5lMmJuLm9yZy9zaGliYm9sZXRoMB0GA1Ud
+ DgQWBBRtUHrPUHw7pov+Xhic3y7uDHQ96jANBgkqhkiG9w0BAQUFAAOCAQEAPKSS
+ mAPt6VhYv6yRE2kPEHJQvsXsBLH8tHrhF904HNgXghMoFGYQGPsLY7hAKXijh469
+ V5R7baZoSau5jrVM5P2GlZZvnNedPMzYSZzYuIYdfDBVRJcfGAzSvMgs+J2Xy0p1
+ DSzEBbWkV90tD+9rrW8cwrFL0WI9DZdbTNt+o2f0EtS2BSBP47UibVmftEs+6tN0
+ BgWhJ7OiNUofH0OasFSwFCoPNnKR0DfPSIA2qDVozOAqx/jrv96p+ukWNoK3g49B
+ lnJgP9/GxoLuoFpcJ0el9dqriqw9dcFw7IhWG/SZmZKD6XslLE6YcvKhduBUgBNX
+ Tx92z7ahaw1BOYPfpw==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
index e02be295..8468c963 100644
--- a/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
@@ -8,15 +8,18 @@
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">MENJE-CGIE IAM Users</mdui:DisplayName>
- <mdui:DisplayName xml:lang="fr">MENJE-CGIE IAM Utilisateurs</mdui:DisplayName>
- <mdui:DisplayName xml:lang="de">MENJE-CGIE IAM Benutzer</mdui:DisplayName>
- <mdui:DisplayName xml:lang="lb">MENJE-CGIE IAM Benotzer</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">MENJE - CGIE IAM Users</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">MENJE - CGIE IAM Utilisateurs</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="de">MENJE - CGIE IAM Benutzer</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="lb">MENJE - CGIE IAM Benotzer</mdui:DisplayName>
<mdui:Description xml:lang="en">Identity Provider for IAM end users of the Ministry of Education</mdui:Description>
<mdui:Description xml:lang="fr">Fournisseur d'Identité IAM pour les utilisateurs du Ministère de l'Éducation nationale</mdui:Description>
<mdui:Description xml:lang="de">Identitätsprovider für die IAM Nutzer des Ministeriums für Bildung</mdui:Description>
<mdui:Keywords xml:lang="en">IAM CGIE MENJE luxembourg user users login education</mdui:Keywords>
- <mdui:Logo width="36" height="151" xml:lang="en">https://ssl.education.lu/saml/resources/button_IAM.png</mdui:Logo>
+ <mdui:Logo width="16" height="16" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0DN9GR/zoAAAEZSURBVDjLndO9SgNBFAXgb0OwFythOxf8IY2ljaQRax/Al7AUQfRRfAAbCxHTCEIQLEVUIiikXbATDDE2WbkZRghON3PmnHvuuTNFXVZn2Pe/dVvUZTXBBEUA0r2/7rSmmyIcxotf+Ax3GvyX004UG+AdPTxjhFV0sZa6aSc2C/RxvDQcXEegLqstnGAnttJKFN9yZFgaDvo4xEN0nGZw05DrsorVG5F7XEZOKxQZ4SlUjNWj4CM+0hYaS+M5Zv8dAp8RWJimLddCcLSOxVyI0K3LajvajuS6rDrYjZzmJcZJ9HCEu0CEDk6xNzP3jAC84gAX0/MNnIcWJ7kpxKe6gs2AL+fIuQyKAI6T5GX+jRauMj9vnlXg5QcATWTFHAxLwAAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo width="50" height="50" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0EFUuwKBkAAASRSURBVGje7ZpLjxRlFIaft6Z1JgoZkm7AgdKg02JUMKIbo1ujiQlRkSAiiRsJ6B/QhXGhW1f+ATQBE5SAstGFt40JMSLBEF1YiGi1w8gUlxHkMsO8Lqr6IghUT1e304Rv2zXd3/Od77znnLdGSTgqm1ckbTGsxEYSc3zNAOOYN4Ad5Vp0JsDaLOkp4E7B3IewMciwAHkL8DyAkrB6ALgLmAc4e3wu0xiQDdmZ78TeWAIeyEj74k5lEM52KmAY6cGg+XE/MLRu1c0IGZdaP6d/li7ZrgOukxUUnIS++gNufXbOgly2O192H9QNBgBKhQg7km1Jwhihc8BJQQ2YAgaBYUMZa1h1pksk9f8Ayfbb0JCLoEnsU5JqwFHbY0I/IM4C84ERYJnEcswS4FZgQXYr1GkNK836Ekmt5xhLfAzaCRzETAIDWSvRvFk2FsOSVgKrgfXAkiKCUppFJEAoq58XgG3AHpv9EuPlODrf0g/910omwupewRHgc2AjsNpovjogKrWbCwhsIYiBD4EPynG0r50frcTROeAwcDgJR08YJgRrQCFpH2W1ec3yg1hC6WlJjAG7bV6r1KLpTpK0HB/amyytHkKeAjYAI0phUBvRyS+/zXSctr0VeL1TiAZMLTpm9BbwCfDnbDI+yJ/daYoD2wS7ynH0d5F1oBJHk8bvAl91syDWO87fDTuQ9nejqFXiQz8BnwK/ZMqSu4IGOSLhVKFIgD2CA+U4muni3PS1YSswozTli8wRAZwAPjOc6mbzV6lFRwRfAmdThXQhV0tN8WAC2FspODeusMaA7+owhUTEWRW3/Uc5jiZ61JVfAA5gTisnSZBHrwTjkn7r4VA+BRxDTBWiWvXqZ3sc+LV3459PA/uAv0xBVysbkiezHOkVyrQhyUaAzkHUDM1N2UzRq6tVEgy300JdO9nTGrLMZmUPR/Ah4B7gFgqS37r3MixR6aFFMuTUNBzKa7UFOb60fkIjSVid1yOWm4EV2RRZCEjTGTEhsCoJq73IlYWC++3iQFpmKirAOkO5mwRJWF0MPGp7sdowXfK1KBLYZcMzaszYXVuPgF+SNNCOB5Z/HkkrYwismQhHl3UpGouAJ0CrGu2iip0QlbEY8yrWc4VDLK0OAZuAxzHYqvs0hQ5WDTvAqRS/kITVTQVCDCKeBL8ILPcsXKHcldOpd6LMm1sBbE7C6jzD+5U4Oj5biIlwNATWGtYJ3U3q/Lne6RUOImUakhr6g4aHbRYCQRJWvwDGynE0njMCQaaCI9hPI9YL7q1P1Q2B6aJBpyz3nFk2d0i8g/kWsT0Jqx8BR8tx5Gtk3G2GtYKXQfcBA7PxsjoBaW3wG4dmeAg8IvQY8DZw8CrKVAaeFbwJLEAMNHbfgWs6SxBdYjq7BLodOEn6UvVqaxCzCKWFNfMvnV9oO1WtK87zdbH3eeAMcPEafzeDuPDvnrTz1343Xr3dAOkWSIsB5j7mUMD1gAEKJEXAGdf7AvcFUsOTtplG/BwA24EfsdNqLfrl/1EEqgm+KcfR8cDwHvC9pLP1J/oiIGkV24XYzfW0/gHhg7VpVb73tQAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo width="80" height="80" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0FC6ikJDsAAASPSURBVHja7ZhdaBxVFMd/ZzepWGlt2SrUbiO2i1oTpIpWoi8FtVoE9cEaM7Pz0ocIFQWxWKkFKVq1BakPgh8PPnQzs4If4DcRBOmDaJE+qEUrmyKy0aRmK0jUptnk+DA37WJ2N9nNsgg5PxhY7t45c87/nnvOnQHDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAyj9UgpnTkA7G2Bra9SxULvUhRQW2gvkyoWhpeSgImWWlOml1oGJurKETOtMAFMnh9RVQwAOuptb1XuXTNS+HB2oJTOdANfIrISRRGkmYd6fpAEiMLcdLP3qyoiMhOFOW3ShgAJVchH8/vR72dFkDnzEzUyrwgkK8UDSBULJ1LFwqUo+WbFc5QVPef52Y4mAr8BKAtSRvXzRfiwC6UsQtnzg+fmbRbIx3B+/qZaAqoqgrIhVSzM1DKWGil4wOiiuhfSbB140hkAkVsX4UK3SwEFfax+9gWrQLfrBY1uryWgCHipkcLUAhzoanch9PxgOfCQwinQELjI84Onmup3ymZgHNXfQVZ4fnB17cWmj3jLvaWqgnBfLQFnUiOF/EIcSBULUwLjbdbweRfQOyAvurEX+l1NbWgHCFtAJxB5wpWtT+tMfxWYisJcv4ggcEctAScbPLacabOAO13z2ROFue+BibiXcX1DmewFy4AkKqeBDwBBucrzg84qWX+zKgL86IbOuaayeo6ACssaLGSr2rh9BxRWAG9WDrtOdqyxdec25/9oFOb+BD0e71DdVWXufhFQ1R1uZMrtgnVzBBRIltKZexbixHh6Y0Lh8vYlnz4tcUAHK6L7LO4mdHh+cGUDC3+LqoLydVwPpS/exfKyO97MLtpKQbcDY/lo8GT8TPnHGVlftQuDflRKZ2R+H+RE+7Iv2wPShXI0H+Z+mh2PotwkcFhRUM03sBjdLtjj7sT7M4g7deh1F8TQAVQA3q0IfMj96q3ahTVeik/qPb6UzjwMXCttyz4Zcs4/63lBp+fHV7+f7QT2ClJGpNfzg66F6SebBEGEbwHy4WAZ2OdUe6UiSfYjEIW5RypuftuJf1fVg7QgAtxdWpf52715VAp3SSmd+QX0tYpXvXZwhQtuCOEsxJcgZ4G/gKQL6tGFdWDdgChRmPu1ItsOAmVEtnp+sNbzgwdQXY5ytPLeKBx835W7LfO9C19cpbX3AevjRKUtCeh5wTG3UocQdgAPVrnuj98A2O3OivWaUQJkNcgfleP5cHBGYThOC70TGHAZ9czcM6ROAvR72cs66hQ5gJkaHxikTbUviXKjxAX+QNwxawozDqwBssAbdcxucyL8UCXkrQi/gTwO9CAyFoW5L+ZmsJxR1bUi0pPQ1u7EZCuNqcoehCTIkXriOfa5SF6ax+hNKIjIyf/+FYW5UeA0sBmlQ2svxITEKbQxIciRFn0LLKZGFvYxVWFMoSB16mi/F3SI6E5gGHT3fDajMPe6wHegJc8PttUpgNcgFIBvavh2WOEUwiiqh2rMeQ9kGI3PgoZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIbxP+NfTtmklCc4oeQAAAAASUVORK5CYII=</mdui:Logo>
+ <mdui:Logo width="320" height="240" xml:lang="en">data:image/png;base64,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0bgAZL81rBfVhPg5a3AakdB+uKVzLw5QKd7FBSTvpOKnqAVYPStwZ9xiaq9yLsIlKLiyralrVi/Pv5U05P/Df53s3W1NXUfVZAU5f90huFi7g/rheT6FS7N0W1l+RUVRAey1CCZZkbnWi8W4BAqPypDsXdwypFwDHcqKfR7G4tbCbiNDyGIzpi8C+0pwdG2Tzm6KywByJC5YtVLP9kWxxDuIhF7VJqOoAPavAK6Gm4D4dj9f+p/AEbKkr75IZzcQgd8HN6mxFaXNns/EReq/JPf/+IDvKqcoq7IAigiOwKXKau6Hyy3FLey/oB+3++wPURyKCy5fH5deahhuAft83FKoj4iEFmmTUFQAa1cIw7g1k9VYl2tx+9Re1NbU9Yq+GoqiAliLIjgclyoowpc3pukt03ALyCf3JbegoigqgP0thg24PH274YJ4N5dhXuH+GvNxmTY+xqVGegM3u1x2FmlFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRlleb/A7hhlB7cvnMAAAAAAElFTkSuQmCC</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:IPHint>158.64.0.0/16</mdui:IPHint>
@@ -50,14 +53,9 @@
<md:Organization>
<md:OrganizationName xml:lang="en">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
<md:OrganizationName xml:lang="fr">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
- <md:OrganizationName xml:lang="de">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
- <md:OrganizationName xml:lang="lb">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="fr">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="de">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="lb">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.cgie.lu</md:OrganizationURL>
- <md:OrganizationURL xml:lang="fr">http://www.cgie.lu</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
<md:SurName>CGIE</md:SurName>
diff --git a/swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..fc00c26d
--- /dev/null
+++ b/swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+ <!--
+ This is a "Aluminati Engagement Portal (Dev)" simpleSAMLphp SP for Aluminati Network Group Limited.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T14:43:37Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Aluminati Engagement Portal (Dev)</mdui:DisplayName>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIE0zCCA7ugAwIBAgIJAI9tj6IHmTuYMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
+ VQQGEwJHQjEQMA4GA1UECBMHU3VmZm9sazESMBAGA1UEBxMJTmV3bWFya2V0MSQw
+ IgYDVQQKExtBbHVtaW5hdGkgTmV0d29yayBHcm91cCBMdGQxHTAbBgNVBAMTFHNz
+ by11a2ZlZC5hbmdkZXYuY29tMScwJQYJKoZIhvcNAQkBFhhwb3N0bWFzdGVyQGFs
+ dW1pbmF0aS5uZXQwHhcNMTUxMTAyMTMwNzAzWhcNMjUxMTAxMTMwNzAzWjCBoTEL
+ MAkGA1UEBhMCR0IxEDAOBgNVBAgTB1N1ZmZvbGsxEjAQBgNVBAcTCU5ld21hcmtl
+ dDEkMCIGA1UEChMbQWx1bWluYXRpIE5ldHdvcmsgR3JvdXAgTHRkMR0wGwYDVQQD
+ ExRzc28tdWtmZWQuYW5nZGV2LmNvbTEnMCUGCSqGSIb3DQEJARYYcG9zdG1hc3Rl
+ ckBhbHVtaW5hdGkubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ uZ3sg8LNh276Gxz1fiYkQ9ENHNZosCnpklSscs5fYWr1huads4l3IE2enTDJ/VKM
+ kIWtjDuq/EIs7tQtRphsR1zwMtFCg5dKDSwLEIyk6FEH4vouYwRSVmPYh+zvQlPI
+ qadMp3lYsFUcyy2zUbGNSqOSLLaGzEEogihxm3zhPsLafiP4sECNLQ10qoOHgflS
+ yhXkxOQHIIOk01Qishi74opjtxvJGesfrOyTmf4UF/fQS0fIiDKDpT72+haFUksO
+ OaM4SJ1/JJPAAN9/+HsUsVTsfk4a+X89US4F30TAtwDHfcYKi3tDIC6IY1Hf1Rcs
+ KmZtSeUkZVT3lsVlOhvIcwIDAQABo4IBCjCCAQYwHQYDVR0OBBYEFHrH1l9rGVqt
+ gopdiAtWLJXrYQRWMIHWBgNVHSMEgc4wgcuAFHrH1l9rGVqtgopdiAtWLJXrYQRW
+ oYGnpIGkMIGhMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHU3VmZm9sazESMBAGA1UE
+ BxMJTmV3bWFya2V0MSQwIgYDVQQKExtBbHVtaW5hdGkgTmV0d29yayBHcm91cCBM
+ dGQxHTAbBgNVBAMTFHNzby11a2ZlZC5hbmdkZXYuY29tMScwJQYJKoZIhvcNAQkB
+ Fhhwb3N0bWFzdGVyQGFsdW1pbmF0aS5uZXSCCQCPbY+iB5k7mDAMBgNVHRMEBTAD
+ AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBMNi3aujogjGwWmyNITPCGf+p/x5G0JSpe
+ g47Au5pdKSCABlXBE+O4JWSPENtETFAEgirLyjt/pyPM3wBUuK22A4YID9ZSWkKh
+ KGxmpqcFNfYycFVEm6yLspDSYZpsvO6n+aFfN2YSOZwg9wSwkDmYd5zbW2AZk21d
+ dMf8w+pSo/RU1GgSb9y5LwwipMJ/GrPI1ifCWvgXVFWXkJYya1do5BIh7yZ33Gna
+ M/Ph+msHdZ8pexkctO10JpmiXk3mhKiEmq5QsoVPbifRK4MSm8l9aCcItsOzFzPE
+ SP/Ojg/mfRnlJrCIKN6VuP8hAAJfn5OHrTSYqDwMwGj9zZ6NdXAG
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIE0zCCA7ugAwIBAgIJAI9tj6IHmTuYMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
+ VQQGEwJHQjEQMA4GA1UECBMHU3VmZm9sazESMBAGA1UEBxMJTmV3bWFya2V0MSQw
+ IgYDVQQKExtBbHVtaW5hdGkgTmV0d29yayBHcm91cCBMdGQxHTAbBgNVBAMTFHNz
+ by11a2ZlZC5hbmdkZXYuY29tMScwJQYJKoZIhvcNAQkBFhhwb3N0bWFzdGVyQGFs
+ dW1pbmF0aS5uZXQwHhcNMTUxMTAyMTMwNzAzWhcNMjUxMTAxMTMwNzAzWjCBoTEL
+ MAkGA1UEBhMCR0IxEDAOBgNVBAgTB1N1ZmZvbGsxEjAQBgNVBAcTCU5ld21hcmtl
+ dDEkMCIGA1UEChMbQWx1bWluYXRpIE5ldHdvcmsgR3JvdXAgTHRkMR0wGwYDVQQD
+ ExRzc28tdWtmZWQuYW5nZGV2LmNvbTEnMCUGCSqGSIb3DQEJARYYcG9zdG1hc3Rl
+ ckBhbHVtaW5hdGkubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ uZ3sg8LNh276Gxz1fiYkQ9ENHNZosCnpklSscs5fYWr1huads4l3IE2enTDJ/VKM
+ kIWtjDuq/EIs7tQtRphsR1zwMtFCg5dKDSwLEIyk6FEH4vouYwRSVmPYh+zvQlPI
+ qadMp3lYsFUcyy2zUbGNSqOSLLaGzEEogihxm3zhPsLafiP4sECNLQ10qoOHgflS
+ yhXkxOQHIIOk01Qishi74opjtxvJGesfrOyTmf4UF/fQS0fIiDKDpT72+haFUksO
+ OaM4SJ1/JJPAAN9/+HsUsVTsfk4a+X89US4F30TAtwDHfcYKi3tDIC6IY1Hf1Rcs
+ KmZtSeUkZVT3lsVlOhvIcwIDAQABo4IBCjCCAQYwHQYDVR0OBBYEFHrH1l9rGVqt
+ gopdiAtWLJXrYQRWMIHWBgNVHSMEgc4wgcuAFHrH1l9rGVqtgopdiAtWLJXrYQRW
+ oYGnpIGkMIGhMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHU3VmZm9sazESMBAGA1UE
+ BxMJTmV3bWFya2V0MSQwIgYDVQQKExtBbHVtaW5hdGkgTmV0d29yayBHcm91cCBM
+ dGQxHTAbBgNVBAMTFHNzby11a2ZlZC5hbmdkZXYuY29tMScwJQYJKoZIhvcNAQkB
+ Fhhwb3N0bWFzdGVyQGFsdW1pbmF0aS5uZXSCCQCPbY+iB5k7mDAMBgNVHRMEBTAD
+ AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBMNi3aujogjGwWmyNITPCGf+p/x5G0JSpe
+ g47Au5pdKSCABlXBE+O4JWSPENtETFAEgirLyjt/pyPM3wBUuK22A4YID9ZSWkKh
+ KGxmpqcFNfYycFVEm6yLspDSYZpsvO6n+aFfN2YSOZwg9wSwkDmYd5zbW2AZk21d
+ dMf8w+pSo/RU1GgSb9y5LwwipMJ/GrPI1ifCWvgXVFWXkJYya1do5BIh7yZ33Gna
+ M/Ph+msHdZ8pexkctO10JpmiXk3mhKiEmq5QsoVPbifRK4MSm8l9aCcItsOzFzPE
+ SP/Ojg/mfRnlJrCIKN6VuP8hAAJfn5OHrTSYqDwMwGj9zZ6NdXAG
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-ukfed.angdev.com/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://sso-ukfed.angdev.com/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://sso-ukfed.angdev.com/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://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Aluminati Network Group Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Aluminati Engagement Portal (Dev)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.aluminati.net/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Emily</GivenName>
+ <SurName>Grant</SurName>
+ <EmailAddress>mailto:help@aluminati.net</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Roger</GivenName>
+ <SurName>Garner</SurName>
+ <EmailAddress>mailto:roger@aluminati.net</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.eur.nl-opensso.xml b/swamid-interfederations-2.0/sso.eur.nl-opensso.xml
index ca50e5ae..45296685 100644
--- a/swamid-interfederations-2.0/sso.eur.nl-opensso.xml
+++ b/swamid-interfederations-2.0/sso.eur.nl-opensso.xml
@@ -13,9 +13,9 @@
<mdui:DisplayName xml:lang="en">Erasmus University Rotterdam</mdui:DisplayName>
<mdui:Description xml:lang="nl">Erasmus Universiteit Rotterdam</mdui:Description>
<mdui:Description xml:lang="en">Erasmus University Rotterdam</mdui:Description>
- <mdui:Logo height="25" width="108">https://static.surfconext.nl/media/idp/eur.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">Erasmus Universiteit Rotterdam Erasmus University Rotterdam EUR</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">Erasmus Universiteit Rotterdam Erasmus University Rotterdam EUR</mdui:Keywords>
+ <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/eur.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">erasmus universiteit rotterdam erasmus university rotterdam eur</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">erasmus universiteit rotterdam erasmus university rotterdam eur</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sso.han.nl-ssp.xml b/swamid-interfederations-2.0/sso.han.nl-ssp.xml
index dc290ad5..e91b978b 100644
--- a/swamid-interfederations-2.0/sso.han.nl-ssp.xml
+++ b/swamid-interfederations-2.0/sso.han.nl-ssp.xml
@@ -13,9 +13,9 @@
<mdui:DisplayName xml:lang="en">HAN University of Applied Sciences</mdui:DisplayName>
<mdui:Description xml:lang="nl">Hogeschool van Arnhem en Nijmegen</mdui:Description>
<mdui:Description xml:lang="en">Hogeschool van Arnhem en Nijmegen</mdui:Description>
- <mdui:Logo height="21" width="108">https://static.surfconext.nl/media/idp/han.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">HAN University of Applied Sciences Hogeschool van Arnhem en Nijmegen HBO</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">HAN University of Applied Sciences Hogeschool van Arnhem en Nijmegen HBO</mdui:Keywords>
+ <mdui:Logo height="21" width="108">https://static.surfconext.nl/logos/idp/han.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">han university of applied sciences hogeschool van arnhem en nijmegen hbo</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">han university of applied sciences hogeschool van arnhem en nijmegen hbo</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
index 898ff605..62916a97 100644
--- a/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
@@ -4,6 +4,11 @@
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-11-18T00:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
@@ -13,7 +18,7 @@
<mdui:DisplayName xml:lang="en">Nikhef</mdui:DisplayName>
<mdui:Description xml:lang="nl">Nikhef</mdui:Description>
<mdui:Description xml:lang="en">Nikhef - samenwerkingsverband Stichting voor Fundamenteel Onderzoek der Materie, Universiteit van Amsterdam, Vrije Universiteit Amsterdam, Universiteit Utrecht, en Radboud Universiteit Nijmegen</mdui:Description>
- <mdui:Logo height="48" width="108">https://static.surfconext.nl/media/idp/nikhef.png</mdui:Logo>
+ <mdui:Logo height="48" width="108">https://static.surfconext.nl/logos/idp/nikhef.png</mdui:Logo>
<mdui:Keywords xml:lang="en">national institute subatomic physics Nikhef Research</mdui:Keywords>
<mdui:Keywords xml:lang="nl">nationaal instituut subatomaire fysica Nikhef Research</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/sso.saxion.nl-opensso.xml b/swamid-interfederations-2.0/sso.saxion.nl-opensso.xml
index 0ec126c0..1f12cbb7 100644
--- a/swamid-interfederations-2.0/sso.saxion.nl-opensso.xml
+++ b/swamid-interfederations-2.0/sso.saxion.nl-opensso.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Saxion University of Applied Sciences</mdui:DisplayName>
<mdui:Description xml:lang="nl">Saxion</mdui:Description>
<mdui:Description xml:lang="en">Saxion University of Applied Sciences</mdui:Description>
- <mdui:Logo height="46" width="108">https://static.surfconext.nl/media/idp/saxion.png</mdui:Logo>
+ <mdui:Logo height="46" width="108">https://static.surfconext.nl/logos/idp/saxion.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Saxion University of Applied Sciences</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Saxion University of Applied Sciences</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml
index 8fb79708..00a2d0a6 100644
--- a/swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml
@@ -14,7 +14,7 @@
<mdui:DisplayName xml:lang="en">SURFsara</mdui:DisplayName>
<mdui:Description xml:lang="nl">SURFsara (test)</mdui:Description>
<mdui:Description xml:lang="en">SURFsara (test)</mdui:Description>
- <mdui:Logo height="77" width="204">https://static.surfconext.nl/media/idp/SURFsara.png</mdui:Logo>
+ <mdui:Logo height="77" width="204">https://static.surfconext.nl/logos/idp/SURFsara.png</mdui:Logo>
<mdui:Keywords xml:lang="en">computing center surfsara</mdui:Keywords>
<mdui:Keywords xml:lang="nl">rekencentrum surfsara</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/sso.vito.be.xml b/swamid-interfederations-2.0/sso.vito.be.xml
new file mode 100644
index 00000000..f7cf74d2
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.vito.be.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.vito.be">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">VITO</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">VITO</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Vlaamse Instelling voor Technologisch Onderzoek</mdui:Description>
+ <mdui:Logo height="16" width="16">https://bsds2015.vito.be/sites/bsds2015.vito.be/files/vito_smaller.jpg</mdui:Logo>
+ <mdui:Logo height="75" width="153">https://bsds2015.vito.be/sites/bsds2015.vito.be/files/vito_larger.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:IPHint>193.190.188.0/22</mdui:IPHint>
+ <mdui:IPHint>2001:06a8:0a50:8000::0/49</mdui:IPHint>
+ <mdui:DomainHint>vito.be</mdui:DomainHint>
+ <mdui:GeolocationHint>geo:51.218543,5.090905</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIID3TCCAsWgAwIBAgIJALl3yBmvtc6zMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNVBAYTAkJFMRAwDgYDVQQIEwdBbnR3ZXJwMQwwCgYDVQQHEwNNb2wxDTALBgNVBAoTBFZpdG8xFDASBgNVBAMTC3Nzby52aXRvLmJlMB4XDTE1MDkxNTA3MzgyMloXDTQzMDEzMTA3MzgyMlowUjELMAkGA1UEBhMCQkUxEDAOBgNVBAgTB0FudHdlcnAxDDAKBgNVBAcTA01vbDENMAsGA1UEChMEVml0bzEUMBIGA1UEAxMLc3NvLnZpdG8uYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhiX+4KHkneW8gdSKV+2piklMrolgprQ7anUqP8znpOznPaBH9060ECJQUw4k+PQ1O92NUEODgQe35/K2DuA6vuiMFlmwce87O5kq1ri6VHeIjTF5jxtLZ9o6EHXFR0W1WuC5AWTsVg3sjdVVQc0EoWXOCn0cwwR24Ni6B7G9PT3VIFI/UuNxD5nAR564H2yCOSbEVdasN9xvjO5wSzIgmuxLQT4IDy4Ez3L5RDK7OZTAjVwHwKCkLe0Ndx89BY/WzTrZCa/dMDIbGeee1bDeQ5fjqXqUssZwrXqNJkL27KYOJZv+UWEmEyhzaSGpyGiPZHlN0liHarpR3Hb0MSYcDAgMBAAGjgbUwgbIwHQYDVR0OBBYEFDzHYTGcKe8VZxOVMTvIK5UMRMtDMIGCBgNVHSMEezB5gBQ8x2ExnCnvFWcTlTE7yCuVDETLQ6FWpFQwUjELMAkGA1UEBhMCQkUxEDAOBgNVBAgTB0FudHdlcnAxDDAKBgNVBAcTA01vbDENMAsGA1UEChMEVml0bzEUMBIGA1UEAxMLc3NvLnZpdG8uYmWCCQC5d8gZr7XOszAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQABXKgnPs452tJLsfw4kzCF2lO0ZsUfInFoU+o9EK+JO1i6Hzn1euFb5LzCWSDBtwJuqRVpOkyAmjZ3CQrR4DY/Zlbffki701nAoSSS1S56aggOYF6DvqYfoxuyiF6I89NvjC1LP+RX1IoIsljRr6aeKu1Jfp+vT2yr3PnhAP0Cn+3sGIbaOyF9Y9ZLXo4BTQmpQhsnBwrXy5zJ6oeVZI1xsNNbdMacNIcCffsyYhJGLB7/M7YuUtZR0qZmeyjdR8Clxd7uLx0k9qOs6SYIGWRWeBuhXShDvAx4JNNQc9kkhOEOJyK0v4PpF6m19d/aVSuQCeJsaK553npGMhYSj64q</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.vito.be/saml/idp/profile/redirectorpost/sso"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vito.be/saml/idp/profile/redirectorpost/sso"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Vito</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Vito</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.vito.be/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>SAML IdP Support</md:SurName>
+ <md:EmailAddress>mailto:snb@vito.be</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..67eb7a91
--- /dev/null
+++ b/swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/metadata.php/default-sp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie"/>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Qualtrics Test SP</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Qualtrics Surveys Test instance</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://ssotesteu.eu.qualtrics.com/</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIFbDCCA1QCCQC8OqKPlGUkRDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJV
+UzENMAsGA1UECBMEVXRhaDEOMAwGA1UEBxMFUHJvdm8xGDAWBgNVBAoTD1F1YWx0
+cmljcywgSW5jLjEgMB4GCSqGSIb3DQEJARYRZGJhQHF1YWx0cmljcy5jb20wHhcN
+MTAwNDA3MTkzMzA0WhcNMjAwNDA3MTkzMzA0WjCBhzELMAkGA1UEBhMCVVMxDTAL
+BgNVBAgTBFV0YWgxDjAMBgNVBAcTBVByb3ZvMRgwFgYDVQQKEw9RdWFsdHJpY3Ms
+IEluYy4xGDAWBgNVBAMMDyoucXVhbHRyaWNzLmNvbTElMCMGCSqGSIb3DQEJARYW
+c3NvYWRtaW5AcXVhbHRyaWNzLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAM7T6YYEDd91lehKK/51V3Li6zk/wqHZ1OZ4rHw22AtTasl0qrEwdXbL
+sCUmO4rEXhAnjgpIZPFHs+1sFpSCalerYa+ROJX5B5N9MnENYr6E8KHa8spbVBEl
+2/ZE6RlPdHBs+iCDuoTTqOa2sZ8vqTpTF3grVdgeW3KfBOO9yENa04lA6xhPAQs3
+kihDQvPoWnlXtQA3gmtb+sGZmKYXonBVwIDsrDbhpoFcHJJRrFEEawSHOI3IeHBo
+hR1jhfb95E3cQ0s7gQ+FbR+lkzwb3i3WrCkZr3w2KpudJEzy/kT7JBLvfELW8eR4
+j2XRKyRhxNHOKc/AC8fNIrGam0CAqK9elpJnB6zmALQUYXVGddv3sd9ITIfZQ9Ox
+g9ChVqsNAY6VIlg5+/Q3Ega+BR/P/OpMnG9xW+cyLslzjiUf4c0K6I2pObcJkJMw
+qGHOSbD9lGa/WxaEAFC1+6oDNRbC3S2mbo4gW6LPVbtCxC0IMxOyaOKBwe3sW9v+
+rumd02ZuJRtbTbarde7N6aUmm2hXfDQntCIXWUJ+9b+YvjcWUlUN0KvVq8jFn1Z7
+kD1po2eY+lc9VHYoh1jdP08G9H8CZdJTDwR4KDPG0U2rD+xXmxO+9CEeQev1d/Iu
+qcadQxRka7hbhIijtVJgjO3jP6AwiHXFGpBvApyIuuXJU8CyKSsXAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggIBAAcXtiFXJ5Vm0mwhiDRoTGwIGz+Ryg13X6X9w6GfVENt
+NexDExwzPgxnW1gG7u9FUx2tl2geZ8BJOqk3pGnLSZI4QF/nVnB+hTPMLOwXjtMk
+MF5FXlM7QvOKOTzzK7+2wug2ssZi5ZpQVGODhPsytu+GjMJwydLj6RRAnJV/9wmu
+ivZhIbQyrOs0XBxuYO0n9OzlOa9JVFtUxnckT93UYIjcCVEu2r+m20Zm8BEofKTr
+Tz3vodizFV5uHbmQ19iLxDrZsu9rbpEHojWMgnKnq1XoC7TmlxB1/OQctUnjpRPT
+WySZkTdWX4cKBjQHzCHJyl0Z4hAP4m3fWFLXVK3w8U1e+Mbfm0jUT9+amUfdzL+8
+9ZjwnFvpuFNWsS33yYWp51+rVdtU0jYII1f8XWNRn4EV54MwoOWrEXKDZ0qmbxi5
+nVR/F5QofEGv/ZYMgcFaX5OMP5lRE8IjQu9Eq26zZA6YuR5fZfiTHZppwc6Ey9Zc
+GpRsLwFSwma0/Vtlfxr/KtaKsk2zlOOJ6RF33MUyZvw8N+tybY0yHJ40aBZKFr9r
+r3j//DUU8zi4qvNP5z19kS08sZ7mtNK2sKBPWVSYB2HDtyrBSRupHBYeIxlfGKd6
+uVUusHTyyVjDKbuMHCw+DEp0VXmCIAv5Jf+SKZ7DOkw8cxcdL67gEc9NjAmsfmKy
+</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>
+MIIFbDCCA1QCCQC8OqKPlGUkRDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJV
+UzENMAsGA1UECBMEVXRhaDEOMAwGA1UEBxMFUHJvdm8xGDAWBgNVBAoTD1F1YWx0
+cmljcywgSW5jLjEgMB4GCSqGSIb3DQEJARYRZGJhQHF1YWx0cmljcy5jb20wHhcN
+MTAwNDA3MTkzMzA0WhcNMjAwNDA3MTkzMzA0WjCBhzELMAkGA1UEBhMCVVMxDTAL
+BgNVBAgTBFV0YWgxDjAMBgNVBAcTBVByb3ZvMRgwFgYDVQQKEw9RdWFsdHJpY3Ms
+IEluYy4xGDAWBgNVBAMMDyoucXVhbHRyaWNzLmNvbTElMCMGCSqGSIb3DQEJARYW
+c3NvYWRtaW5AcXVhbHRyaWNzLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAM7T6YYEDd91lehKK/51V3Li6zk/wqHZ1OZ4rHw22AtTasl0qrEwdXbL
+sCUmO4rEXhAnjgpIZPFHs+1sFpSCalerYa+ROJX5B5N9MnENYr6E8KHa8spbVBEl
+2/ZE6RlPdHBs+iCDuoTTqOa2sZ8vqTpTF3grVdgeW3KfBOO9yENa04lA6xhPAQs3
+kihDQvPoWnlXtQA3gmtb+sGZmKYXonBVwIDsrDbhpoFcHJJRrFEEawSHOI3IeHBo
+hR1jhfb95E3cQ0s7gQ+FbR+lkzwb3i3WrCkZr3w2KpudJEzy/kT7JBLvfELW8eR4
+j2XRKyRhxNHOKc/AC8fNIrGam0CAqK9elpJnB6zmALQUYXVGddv3sd9ITIfZQ9Ox
+g9ChVqsNAY6VIlg5+/Q3Ega+BR/P/OpMnG9xW+cyLslzjiUf4c0K6I2pObcJkJMw
+qGHOSbD9lGa/WxaEAFC1+6oDNRbC3S2mbo4gW6LPVbtCxC0IMxOyaOKBwe3sW9v+
+rumd02ZuJRtbTbarde7N6aUmm2hXfDQntCIXWUJ+9b+YvjcWUlUN0KvVq8jFn1Z7
+kD1po2eY+lc9VHYoh1jdP08G9H8CZdJTDwR4KDPG0U2rD+xXmxO+9CEeQev1d/Iu
+qcadQxRka7hbhIijtVJgjO3jP6AwiHXFGpBvApyIuuXJU8CyKSsXAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggIBAAcXtiFXJ5Vm0mwhiDRoTGwIGz+Ryg13X6X9w6GfVENt
+NexDExwzPgxnW1gG7u9FUx2tl2geZ8BJOqk3pGnLSZI4QF/nVnB+hTPMLOwXjtMk
+MF5FXlM7QvOKOTzzK7+2wug2ssZi5ZpQVGODhPsytu+GjMJwydLj6RRAnJV/9wmu
+ivZhIbQyrOs0XBxuYO0n9OzlOa9JVFtUxnckT93UYIjcCVEu2r+m20Zm8BEofKTr
+Tz3vodizFV5uHbmQ19iLxDrZsu9rbpEHojWMgnKnq1XoC7TmlxB1/OQctUnjpRPT
+WySZkTdWX4cKBjQHzCHJyl0Z4hAP4m3fWFLXVK3w8U1e+Mbfm0jUT9+amUfdzL+8
+9ZjwnFvpuFNWsS33yYWp51+rVdtU0jYII1f8XWNRn4EV54MwoOWrEXKDZ0qmbxi5
+nVR/F5QofEGv/ZYMgcFaX5OMP5lRE8IjQu9Eq26zZA6YuR5fZfiTHZppwc6Ey9Zc
+GpRsLwFSwma0/Vtlfxr/KtaKsk2zlOOJ6RF33MUyZvw8N+tybY0yHJ40aBZKFr9r
+r3j//DUU8zi4qvNP5z19kS08sZ7mtNK2sKBPWVSYB2HDtyrBSRupHBYeIxlfGKd6
+uVUusHTyyVjDKbuMHCw+DEp0VXmCIAv5Jf+SKZ7DOkw8cxcdL67gEc9NjAmsfmKy
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/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://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/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://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/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://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">Qualtrics Test SP</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Qualtrics Surveys Test instance</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Qualtrics LLC</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Qualtrics</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.qualtrics.com</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Administrator</md:GivenName>
+ <md:EmailAddress>mailto:shibboleth@qualtrics.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml
index 32ce84dc..2c84f7e5 100644
--- a/swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Deltion College</mdui:DisplayName>
<mdui:Description xml:lang="nl">Deltion College</mdui:Description>
<mdui:Description xml:lang="en">Deltion College</mdui:Description>
- <mdui:Logo height="38" width="108">https://static.surfconext.nl/media/idp/deltion-companylogo.png</mdui:Logo>
+ <mdui:Logo height="38" width="108">https://static.surfconext.nl/logos/idp/deltion-companylogo.png</mdui:Logo>
<mdui:Keywords xml:lang="en">ROC MBO Zwolle Deltion College</mdui:Keywords>
<mdui:Keywords xml:lang="nl">ROC MBO Zwolle Deltion College</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml
index 7bb5ac28..6eef2be1 100644
--- a/swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">ROC Nijmegen</mdui:DisplayName>
<mdui:Description xml:lang="nl">ROC Nijmegen</mdui:Description>
<mdui:Description xml:lang="en">ROC Nijmegen</mdui:Description>
- <mdui:Logo height="15" width="108">https://static.surfconext.nl/media/idp/roc-nijmegen.png</mdui:Logo>
+ <mdui:Logo height="15" width="108">https://static.surfconext.nl/logos/idp/roc-nijmegen.png</mdui:Logo>
<mdui:Keywords xml:lang="en">MBO ROC Nijmegen</mdui:Keywords>
<mdui:Keywords xml:lang="nl">MBO ROC Nijmegen</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml
index c7a1db59..2028571c 100644
--- a/swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml
@@ -10,9 +10,9 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:Description xml:lang="nl">ROC van Amsterdam</mdui:Description>
<mdui:Description xml:lang="en">ROC van Amsterdam</mdui:Description>
- <mdui:Logo height="288" width="263">https://static.surfconext.nl/media/idp/ROCvA_logo2.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">ROC ROCvA Flevoland VOvA Amsterdam</mdui:Keywords>
- <mdui:Keywords xml:lang="nl">ROC ROCvA Flevoland VOvA Amsterdam</mdui:Keywords>
+ <mdui:Logo height="288" width="263">https://static.surfconext.nl/logos/idp/ROCvA_logo2.png</mdui:Logo>
+ <mdui:Keywords xml:lang="en">ROC rocva Flevoland VOvA Amsterdam</mdui:Keywords>
+ <mdui:Keywords xml:lang="nl">ROC rocva Flevoland VOvA Amsterdam</mdui:Keywords>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml
index 61d100b9..5348925a 100644
--- a/swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">Windesheim University of Applied Sciences</mdui:DisplayName>
<mdui:Description xml:lang="nl">Hogeschool Windesheim</mdui:Description>
<mdui:Description xml:lang="en">Hogeschool Windesheim</mdui:Description>
- <mdui:Logo height="25" width="108">https://static.surfconext.nl/media/idp/windesheim.png</mdui:Logo>
+ <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/windesheim.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Hogeschool Windesheim University of Applied Sciences HBO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Hogeschool Windesheim University of Applied Sciences HBO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml
index 36d86ccb..5171254d 100644
--- a/swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml
@@ -13,7 +13,7 @@
<mdui:DisplayName xml:lang="en">Wageningen UR</mdui:DisplayName>
<mdui:Description xml:lang="nl">Wageningen UR</mdui:Description>
<mdui:Description xml:lang="en">Wageningen UR</mdui:Description>
- <mdui:Logo height="17" width="108">https://static.surfconext.nl/media/idp/wur.png</mdui:Logo>
+ <mdui:Logo height="17" width="108">https://static.surfconext.nl/logos/idp/wur.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Wageningen Universiteit university WUR UR</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Wageningen Universiteit WUR UR</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml
index ced76616..64b6c384 100644
--- a/swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml
@@ -10,7 +10,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:Description xml:lang="nl">Zadkine (nieuw)</mdui:Description>
<mdui:Description xml:lang="en">Zadkine (nieuw)</mdui:Description>
- <mdui:Logo height="86" width="86">https://static.surfconext.nl/media/idp/zadkine.gif</mdui:Logo>
+ <mdui:Logo height="86" width="86">https://static.surfconext.nl/logos/idp/zadkine.gif</mdui:Logo>
<mdui:Keywords xml:lang="en">Zadkine ROC MBO</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Zadkine ROC MBO</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml
index 1b312272..666ab3a1 100644
--- a/swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">VU University Amsterdam</mdui:DisplayName>
<mdui:Description xml:lang="nl">Vrije Universiteit (login)</mdui:Description>
<mdui:Description xml:lang="en">VU University Amsterdam</mdui:Description>
- <mdui:Logo height="51" width="107">https://static.surfconext.nl/media/idp/vu.png</mdui:Logo>
+ <mdui:Logo height="51" width="107">https://static.surfconext.nl/logos/idp/vu.png</mdui:Logo>
<mdui:Keywords xml:lang="en">VU University Amsterdam</mdui:Keywords>
<mdui:Keywords xml:lang="nl">VU Vrije Universiteit Amsterdam</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
index c73d31d2..b2d4265d 100644
--- a/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
<md:ContactPerson contactType="administrative">
<md:Company>Sophiahemmet University</md:Company>
<md:SurName>Sophiahemmet IT</md:SurName>
- <md:EmailAddress>itsupport@sophiahemmet.se</md:EmailAddress>
+ <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Sophiahemmet University</md:Company>
<md:SurName>Sophiahemmet IT</md:SurName>
- <md:EmailAddress>itsupport@sophiahemmet.se</md:EmailAddress>
+ <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Sophiahemmet University</md:Company>
<md:SurName>Sophiahemmet IT</md:SurName>
- <md:EmailAddress>itsupport@sophiahemmet.se</md:EmailAddress>
+ <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml b/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
index 85bbc036..aea1c055 100644
--- a/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
@@ -23,8 +23,8 @@
<mdui:DisplayName xml:lang="en">eduID.at Demo Service</mdui:DisplayName>
<mdui:Description xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</mdui:Description>
<mdui:Description xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</mdui:Description>
- <mdui:InformationURL xml:lang="en">https://wiki.univie.ac.at/display/federation/SAML+Test+SP</mdui:InformationURL>
- <mdui:Logo width="234" height="60">https://www.aco.net/fileadmin/aconet/Logos/Banner/234x60.gif</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">https://wiki.univie.ac.at/display/federation/SAML+Demo+SP</mdui:InformationURL>
+ <mdui:Logo width="195" height="94">https://www.aco.net/fileadmin/aconet/Logos/aconetlogo.gif</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml
index 73f29d21..95e97156 100644
--- a/swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml
@@ -21,33 +21,31 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIE3TCCA8WgAwIBAgIQJ6xm1LTElUlmA4yZoROJdDANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMTEyMjAwMDAwMFoXDTE1MTEyMjIzNTk1OVowgaUxCzAJBgNV
- BAYTAkdCMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNVBAcTCk5vdHRp
- bmdoYW0xJTAjBgNVBAoTHFRoZSBVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAb
- BgNVBAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSEwHwYDVQQDExh0ZXN0aWRwLm5v
- dHRpbmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ
- iTjMdWPuQtFIVzw9OKgJ3UjhfSZ6DXxs4ALjaDzpfRni4jUcrdjOdkb2o6nrwNbx
- qy4HhbZAPgG5qneqnmn4VVnbBOcTBuG3EWsI33Vl1el74O90OTk4Ti9VI0ElNsFm
- yYsNNS51K1E6dxl7IRpPs8LwsVV+GdNkLqXwEBAO6Oa5GnJHbnvPFkfo1p+JA7wa
- DE1doGkDZxyW1H5wcIKgvV26oemhUK9wHIgHC/wchGB+oKW2y4etmXM6KpABcN2t
- /2Jfb62yn3ipyZrLwmykRGubkk07fANfrUDe6bryqkdudztmNhgw9e3Vvnh6vdZe
- ME0tmtJKCRpkulxaxrHNAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQMvZNoDPPe
- q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUMmN2nPdOhQzxgbeyF4RXLeKz2wowDgYD
- VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
- CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoG
- A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
- U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
- dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
- dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGHRlc3RpZHAubm90
- dGluZ2hhbS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAGtpBh/RFxZSa7veOmGe1
- STxrmdNWUh7G1NiS0AqHcHLFULQdX2eXEnCsm2N9LkqfgFDof3UW6WmwpdSq2eVX
- 7Ot/bndokCySHXW9dFpGiOE7pjw+XKJzuDkPULfvXU2wwHXdlzY/YP0GmVUljuyi
- 12HUDv9J1053FiAgggcfKEHD718KFAvd/miYlRjfV96riqydo9017C+68i0oRa1O
- gSHWR1aXtFAxHrqQ5Y97N2zMnDd+orx52YopWPm+iFJgW4coN1hjesPZNE/TE5KL
- mjtsVdskDH5UQmR1Jz+94QkZ62EJ5mbzCFRxqT5rmKSE4h0wSJl1645Jbb0LeXUW
- LA==
+ MIIEpDCCA4ygAwIBAgIJAPJoOXh5jZZuMA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
+ VQQGEwJHQjEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3R0
+ aW5naGFtMSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0eSBvZiBOb3R0aW5naGFtMR0w
+ GwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEhMB8GA1UEAxMYdGVzdGlkcC5u
+ b3R0aW5naGFtLmFjLnVrMSswKQYJKoZIhvcNAQkBFhxjcmFpZy5iZXR0c0Bub3R0
+ aW5naGFtLmFjLnVrMB4XDTE1MTExODE0MDIwOVoXDTI1MTExNTE0MDIwOVowgdIx
+ CzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNVBAcT
+ Ck5vdHRpbmdoYW0xJTAjBgNVBAoTHFRoZSBVbml2ZXJzaXR5IG9mIE5vdHRpbmdo
+ YW0xHTAbBgNVBAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSEwHwYDVQQDExh0ZXN0
+ aWRwLm5vdHRpbmdoYW0uYWMudWsxKzApBgkqhkiG9w0BCQEWHGNyYWlnLmJldHRz
+ QG5vdHRpbmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+ AQCd7jf9JyWXG2cZFcseqidGD90cIOQ/VXEwP0rYgkE1d93JBcKVB1gIHZWcRR1m
+ 6C1yJDT59ELfG6lW+lWiwl0mz+eSe1H/qHWvRYclN1d4idwjGH0+HI2Z6wCcI7AE
+ B+KtkNmmyll6UnKZCmaLTlA7RZldngNBnm4j+rse5Y6PzM09lFSUkI6uPd/pKOn7
+ bQ2GZxRe6XIvYXy5I+YPXA0KepdD+q6aMvcqfAnyBuNeYEBUWmp96FKkyDOq6U0O
+ 2pcJsyk2afhYKfxgUr2xDKMGkV9aQ2lo2lKj/uOzeJrBkLLUFBfzX+hcsbNpog7L
+ bokGDaTrqteA+2GrMb4o3r61AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4
+ QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBR+
+ P4B1PFw8wFWK77RhxhNqJRWqZjAfBgNVHSMEGDAWgBR+P4B1PFw8wFWK77RhxhNq
+ JRWqZjANBgkqhkiG9w0BAQUFAAOCAQEAThuXjvL1gTZD3zvYWg6wQ8jc1CuVk+Av
+ kW03jrIn3G86ccKflFOlxqUea9hno7fFnTRI+Hkw6pLUbpomiXc2EfNsEqJCM9Mu
+ XyFchYKv8PAfMg9229uJbm8OwUAXY1C4t83h4usuu08rLvm3VUUV9lGMePSjkI6G
+ L0gMXhO1qS6b+14oG8BwxjMXkK80aDlB1NDwRxTpBCBNQNRBG3H1CUwZuPLYrnGJ
+ sGNabQO4+KddI+mjILyUTXkJmairCoNWz8TdyAvK/kcWjVku8pA3I75NUucMb254
+ 7oz4jJB8gYgsY42b/0ls6sHuUILxKUZ4gTneeYN6L/MPfCAO74kEAQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -69,33 +67,31 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIE3TCCA8WgAwIBAgIQJ6xm1LTElUlmA4yZoROJdDANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEyMTEyMjAwMDAwMFoXDTE1MTEyMjIzNTk1OVowgaUxCzAJBgNV
- BAYTAkdCMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNVBAcTCk5vdHRp
- bmdoYW0xJTAjBgNVBAoTHFRoZSBVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAb
- BgNVBAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSEwHwYDVQQDExh0ZXN0aWRwLm5v
- dHRpbmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ
- iTjMdWPuQtFIVzw9OKgJ3UjhfSZ6DXxs4ALjaDzpfRni4jUcrdjOdkb2o6nrwNbx
- qy4HhbZAPgG5qneqnmn4VVnbBOcTBuG3EWsI33Vl1el74O90OTk4Ti9VI0ElNsFm
- yYsNNS51K1E6dxl7IRpPs8LwsVV+GdNkLqXwEBAO6Oa5GnJHbnvPFkfo1p+JA7wa
- DE1doGkDZxyW1H5wcIKgvV26oemhUK9wHIgHC/wchGB+oKW2y4etmXM6KpABcN2t
- /2Jfb62yn3ipyZrLwmykRGubkk07fANfrUDe6bryqkdudztmNhgw9e3Vvnh6vdZe
- ME0tmtJKCRpkulxaxrHNAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQMvZNoDPPe
- q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUMmN2nPdOhQzxgbeyF4RXLeKz2wowDgYD
- VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
- CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoG
- A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
- U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
- dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
- dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGHRlc3RpZHAubm90
- dGluZ2hhbS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAGtpBh/RFxZSa7veOmGe1
- STxrmdNWUh7G1NiS0AqHcHLFULQdX2eXEnCsm2N9LkqfgFDof3UW6WmwpdSq2eVX
- 7Ot/bndokCySHXW9dFpGiOE7pjw+XKJzuDkPULfvXU2wwHXdlzY/YP0GmVUljuyi
- 12HUDv9J1053FiAgggcfKEHD718KFAvd/miYlRjfV96riqydo9017C+68i0oRa1O
- gSHWR1aXtFAxHrqQ5Y97N2zMnDd+orx52YopWPm+iFJgW4coN1hjesPZNE/TE5KL
- mjtsVdskDH5UQmR1Jz+94QkZ62EJ5mbzCFRxqT5rmKSE4h0wSJl1645Jbb0LeXUW
- LA==
+ MIIEpDCCA4ygAwIBAgIJAPJoOXh5jZZuMA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
+ VQQGEwJHQjEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3R0
+ aW5naGFtMSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0eSBvZiBOb3R0aW5naGFtMR0w
+ GwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEhMB8GA1UEAxMYdGVzdGlkcC5u
+ b3R0aW5naGFtLmFjLnVrMSswKQYJKoZIhvcNAQkBFhxjcmFpZy5iZXR0c0Bub3R0
+ aW5naGFtLmFjLnVrMB4XDTE1MTExODE0MDIwOVoXDTI1MTExNTE0MDIwOVowgdIx
+ CzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNVBAcT
+ Ck5vdHRpbmdoYW0xJTAjBgNVBAoTHFRoZSBVbml2ZXJzaXR5IG9mIE5vdHRpbmdo
+ YW0xHTAbBgNVBAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSEwHwYDVQQDExh0ZXN0
+ aWRwLm5vdHRpbmdoYW0uYWMudWsxKzApBgkqhkiG9w0BCQEWHGNyYWlnLmJldHRz
+ QG5vdHRpbmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+ AQCd7jf9JyWXG2cZFcseqidGD90cIOQ/VXEwP0rYgkE1d93JBcKVB1gIHZWcRR1m
+ 6C1yJDT59ELfG6lW+lWiwl0mz+eSe1H/qHWvRYclN1d4idwjGH0+HI2Z6wCcI7AE
+ B+KtkNmmyll6UnKZCmaLTlA7RZldngNBnm4j+rse5Y6PzM09lFSUkI6uPd/pKOn7
+ bQ2GZxRe6XIvYXy5I+YPXA0KepdD+q6aMvcqfAnyBuNeYEBUWmp96FKkyDOq6U0O
+ 2pcJsyk2afhYKfxgUr2xDKMGkV9aQ2lo2lKj/uOzeJrBkLLUFBfzX+hcsbNpog7L
+ bokGDaTrqteA+2GrMb4o3r61AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4
+ QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBR+
+ P4B1PFw8wFWK77RhxhNqJRWqZjAfBgNVHSMEGDAWgBR+P4B1PFw8wFWK77RhxhNq
+ JRWqZjANBgkqhkiG9w0BAQUFAAOCAQEAThuXjvL1gTZD3zvYWg6wQ8jc1CuVk+Av
+ kW03jrIn3G86ccKflFOlxqUea9hno7fFnTRI+Hkw6pLUbpomiXc2EfNsEqJCM9Mu
+ XyFchYKv8PAfMg9229uJbm8OwUAXY1C4t83h4usuu08rLvm3VUUV9lGMePSjkI6G
+ L0gMXhO1qS6b+14oG8BwxjMXkK80aDlB1NDwRxTpBCBNQNRBG3H1CUwZuPLYrnGJ
+ sGNabQO4+KddI+mjILyUTXkJmairCoNWz8TdyAvK/kcWjVku8pA3I75NUucMb254
+ 7oz4jJB8gYgsY42b/0ls6sHuUILxKUZ4gTneeYN6L/MPfCAO74kEAQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml b/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
index 1884cda1..03fe5daa 100644
--- a/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
@@ -142,8 +142,8 @@
<EmailAddress>mailto:Chris.Hayes@iop.org</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Bruce</GivenName>
- <SurName>Ferguson</SurName>
- <EmailAddress>mailto:bruce.ferguson@iop.org</EmailAddress>
+ <GivenName>Estela</GivenName>
+ <SurName>Garcia</SurName>
+ <EmailAddress>mailto:estela.garcia@iop.org</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml b/swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml
new file mode 100644
index 00000000..64668498
--- /dev/null
+++ b/swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tickets.sheffieldstudentsunion.com/shibboleth">
+ <!--
+ This is a "Sheffield Students Union Tickets" Shibboleth SP for Membership Solutions Limited.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-14T15:02:52Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/Login"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+ BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+ WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+ AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+ FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+ Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+ kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+ 0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+ 5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+ gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+ BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+ EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+ 70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+ QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+ MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
+ Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/POST" index="0"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML/POST" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Sheffield Students Union Tickets</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://tickets.sheffieldstudentsunion.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>MSL support</GivenName>
+ <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>James</GivenName>
+ <SurName>Bonsall</SurName>
+ <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml
new file mode 100644
index 00000000..46941e99
--- /dev/null
+++ b/swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://topsy.ncl.ac.uk/shibboleth/metadata">
+ <!--
+ This is a Shibboleth SP for the University of Newcastle upon Tyne.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-09T15:37:31Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/Login"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC9DCCAdygAwIBAgIJAPBsTOlcp3T8MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+ BAMTD3RvcHN5Lm5jbC5hYy51azAeFw0xNTExMDIwODU0MzVaFw0yNTEwMzAwODU0
+ MzVaMBoxGDAWBgNVBAMTD3RvcHN5Lm5jbC5hYy51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBAKDhYFk6OSQnhkHbK1COfMG79uS7/1DgsBv9kzGrhZsA
+ a0xW/VyH5k7zSsxKHahopVaoYiMJx/P7xd5EhT5zE2qlhY4kMUOpQJHn0liHgz/0
+ 8IYtWo/Y0hB9g8QfseEJw/w3gqvEioU4W6ZHNlBVGPkjhUNM4zMpJ7B5katrMpPV
+ rFt+EV03n+zvEe4pJDf1qurX5zx1uiCVgRHGSY/QJMtgRKGjghJfKNSb2+9tR0ul
+ zIMnjB4L9jpETY1tOSUUBxw1C1f2rBR+NQJgwHdljlJmmcFNKveOVGFAM5x3dKzN
+ V2TIEqIUGXmopMMC8yFwgYjckazN6Hssje5mHSRwt6sCAwEAAaM9MDswGgYDVR0R
+ BBMwEYIPdG9wc3kubmNsLmFjLnVrMB0GA1UdDgQWBBR7WDIAYoOL7Km73avRDBiM
+ 49zBFDANBgkqhkiG9w0BAQUFAAOCAQEAamTJ45UEzWN+1vLtwjgBQYOIraSShWkZ
+ Rej6vEP3UCcqU+c6D00Z0SCXx4/DE/q/l5brFpL4BLlxpBKVyMVu/mb2wKmIbfYa
+ I6NnDKjrLbnTCM9ADugLNK2ZVOIYMm5fgUc9mDKJRSAbpfHQKCuIBChtqdP57pV7
+ zAPYERoof+5Oi3prf8vgh0nEgFA/prgbSMEuglsrJyvkKGDNAtjeUWQRSjyvbRKe
+ Y0z2EV2wo0KW+VslQnBrD671nwFn+mblKs7fcPj73bKOcWn9zkF5jMSvIwNY/mXl
+ dcIZsmnjhF5GCaYywNqr7GIHRaTzghpCWRYepkoaXLxoq3mKXOsdAg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Newcastle University HPC</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Michael</GivenName>
+ <SurName>Beaty</SurName>
+ <EmailAddress>mailto:michael.beaty@newcastle.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Michael</GivenName>
+ <SurName>Beaty</SurName>
+ <EmailAddress>mailto:michael.beaty@newcastle.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml b/swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml
new file mode 100644
index 00000000..4d413027
--- /dev/null
+++ b/swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ucl-research-test.worktribe.com/shibboleth">
+ <!--
+ This is a 'UCL Worktribe Research Management (Test)' Shibboleth SP for Worktribe Ltd.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-13T10:15:45Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/Login"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDJDCCAgygAwIBAgIJALJ6YNn8QO6YMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
+ BAMTH3VjbC1yZXNlYXJjaC10ZXN0Lndvcmt0cmliZS5jb20wHhcNMTUxMTA5MTU0
+ NjEzWhcNMjUxMTA2MTU0NjEzWjAqMSgwJgYDVQQDEx91Y2wtcmVzZWFyY2gtdGVz
+ dC53b3JrdHJpYmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ sMg3x4IK0YYNTCzZL5lq1vdm4YgGEKrnG6eGz0DVTxuqMBy6wvmRs/ibHBraD+c7
+ Cqz+89aKjQGpED+QkIajP8f7X/5b7UMV/Ee1gUcHsQiNH3pvNci9t5k5nhNSUlVI
+ S2tbeKNdxFarNm5DfbuXSQZ0/6ix203W9GId4e535i/poqJK+tX58rJgRtyK9ctE
+ IAHAmvelJ0r8dVv6L1p0vl+hwhFERF0DVHBcsW0Bjya9oq3FzUpPosGRRB8nISlF
+ OQxPIcNaLB0x4hn6sixLGk8t5ieqH0+dH1JXZMfas92ezx0N/2kEIgMI8XUEjjPB
+ bUqKKhv+K5k5vmc7+hnznwIDAQABo00wSzAqBgNVHREEIzAhgh91Y2wtcmVzZWFy
+ Y2gtdGVzdC53b3JrdHJpYmUuY29tMB0GA1UdDgQWBBT+0Yvz6W6N62PE+glPO64K
+ olYhlDANBgkqhkiG9w0BAQUFAAOCAQEAn9CW+v5B4ZPYGB+5j/nDlXhhNMvb8Xqb
+ r1C3q2FhnoOVxwZmQrNVOTL/tHQ98eEgm+G9PXTGpSD3zDgUsChxY9WHhvQsN7JU
+ WuLfQVjnKSQRjoDwO/Fneg5rZstZJtQPM1JNK4ovEkJPwVuEtxGQc8/W0pnQDhWm
+ NHaWS8dkuu3GULmMN6VHXIQ3JtrdrV9JViYxzuXIBlDHcJP9KSHYQLRT5E7VQsKB
+ DqlP/Xl8qSeRDuZ2BGHaRY9L9tv83/wmgDw5M9aD6mnitldU42OaaRgOZfz9IJw8
+ wEizXjk+w4nXfsGJx17O8t3uXHElZVQeCtUfiAR7QL+9hmQGhhTvMA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Worktribe Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">UCL Worktribe Research Management (Test)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.worktribe.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Support</GivenName>
+ <EmailAddress>mailto:support@worktribe.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Matt</GivenName>
+ <SurName>Southall</SurName>
+ <EmailAddress>mailto:matt.southall@worktribe.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
index 29034a4a..9a6cc82e 100644
--- a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
+++ b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
@@ -48,32 +48,37 @@
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>Active</ds:KeyName>
+ <ds:KeyName>lindat.mff.cuni.cz</ds:KeyName>
+ <ds:KeyName>ufal-point.mff.cuni.cz</ds:KeyName>
<ds:X509Data>
- <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
+ <ds:X509SubjectName>CN=lindat.mff.cuni.cz,OU=Domain Control Validated</ds:X509SubjectName>
+ <ds:X509Certificate>MIIEijCCA3KgAwIBAgIRAJealheT4/uwZyfUIGi6scwwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjEwMjQwMDAwMDBaFw0xNTEwMjQyMzU5NTlaMFUxCzAJBgNV
-BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMR8w
-HQYDVQQDExZ1ZmFsLXBvaW50Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAz4nCZa/xBh1ebd2+99GEqRMSqSkCEVfFi4Tndz6v87Iv
-ZMvLY40OJg3lIEzngOz8tnn/ft6xcLxGwr+IbY6raHT08Xu8lQMd8Rj8Gmdi3Ov3
-XuCgjVpAID+GGfNkahzxebWORNfHyqEGSx2oFgRe8HD9BbT8mqheBPF8FIy6mYvs
-495IEkQVc0BvPvTwqEw+qOHKBX+AWQQIHDJDQQnjoteXplHugOFDJiJYH0T/80u3
-DO7h6oyiLlnyDywOVCQdiJPXNOtPMyM9rMT3Vw9SO4iIaMUkF5EafFFdEPLsi+FO
-2Z3r7pBxv1/LkK9AWuzAYSnjK/szHym25FWroxJZOwIDAQABo4IBaTCCAWUwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKKMnXN92GaN
-5uyL8cZdchPl9NpQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiCFnVmYWwt
-cG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAKWQZsd0zZBi+hz6
-3LBx49MOoCXkpUkIdqecMhz0bpIhC+2Q3Uxp97lpfB/9CIMoI5tq+PRXDXQt2D6A
-fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
-k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
-sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
-adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
-IhAZYQU=</ds:X509Certificate>
+IFNTTCBDQTAeFw0xMzEyMTgwMDAwMDBaFw0xNjEyMTcyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGluZGF0Lm1m
+Zi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxeKmDjOk
+one5YWIlKyQ1OeN9lgJ6yAiiiCY87Gl8o9773E1MCe8BqKF/whN9orwy54pznUFX
+K0kTxCVVXhVUJYqMt7w/PbY9su5x8RECYOUgHKXDVikovtTZYoQgwQNY56+C+t2T
+mSf1LYxEjArX4epGZ/Vy6HtKfRw2xCvaj43Z3pUjqIf2d4GDM88C4Nece2HehkjD
+RJ099AMDnk2eK/zyoiGNFR2RLe06FvnoS0soVFAF7vr+4MjFHnJByCKgA0WYdIz/
+j7U+EqarX60Fvr8z58zK17pnB8JZAHd/qX2qJmu+JlIPYt4mBYXcsZ63M0eLIHv9
+EBLqLXO5PQ3OGwIDAQABo4IBhzCCAYMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFHy58QqIvxQw/MKvdVXYEfd5NMdrMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzA1BgNVHREELjAsghJsaW5kYXQubWZmLmN1bmku
+Y3qCFnVmYWwtcG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAIxj
+YtINQkxYADOr/MqkSmNZzGi3VhmacPQuwfP7qwi5vWZyP6DXrlWgXDQorOfl6/Rm
+Lzb1LHwwyJdEUknCxU1AahKDsyG3fiSMOTD/t21RI9mbTCA1rtk0d4nXdJ3bKCb0
+dccRmt5CwbScCQfjsIjWvdkxoMlVIe6DgoqUlLILqSk/drjKpKGOYMZuPXS8zgNe
+EFw6XzWMKSgkB0QFX2WUCVuhWfejJ6OhUkH6S5Bh+p5WPKJ7bM4E6UrfaleieSr7
+mfwH8VeBwoL+rL1n6xqndwwqAnzWtFPAO/hBIuOwkucYl85fBqXT0de7g8fIw7bt
+iALZ/UygiLnb3oX/q0Q=
+</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
<md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
diff --git a/swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml b/swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml
new file mode 100644
index 00000000..a8ac2936
--- /dev/null
+++ b/swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uk-coventry-shibboleth.moveon4.com/shibboleth">
+ <!--
+ This is a "qsu-unisolution" Shibboleth SP for QS unisolution GmbH.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T10:53:16Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">qsu-unisolution</mdui:DisplayName>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIFgzCCA2ugAwIBAgIJAJdEyesPxkXQMA0GCSqGSIb3DQEBCwUAMFgxCzAJBgNV
+ BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSswKQYDVQQDDCJ1
+ ay1jb3ZlbnRyeS1zaGliYm9sZXRoLm1vdmVvbjQuY29tMB4XDTE1MTAyODEyMDIw
+ NloXDTIwMTAyNjEyMDIwNlowWDELMAkGA1UEBhMCREUxHDAaBgNVBAoME1FTIHVu
+ aXNvbHV0aW9uIEdtYkgxKzApBgNVBAMMInVrLWNvdmVudHJ5LXNoaWJib2xldGgu
+ bW92ZW9uNC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDrZPOQ
+ s9BEz57wgnQ0TI3bRWQcGrgeSkRqAubsKN2gcQ3133JKDcH9rPaaF0nlGMjAIokl
+ ODSukuEE8lGIu4dx4k7W7mkhvHW3JI2PrrA7DmjMaWDGHU8zxCKdQ7GVFUMeVPp+
+ /b+NJQJA3sbCEwQTCbMGokfL3ZWt7xUGzy5xOl1KMfUzJ+pF6c1Wild33NJDzdGJ
+ CVwC19HbvFYeqagWdk1yEQrdJh4fQJMiG2yIoTyhVadsZGUXS5fyWLStWhqiwkEA
+ Fz8YoZHYcSi8yFLp5fn8uIMSEeQXycyiZy+ZgRXvpE7t/Ped/EL7T58eHF28QNFm
+ asbiTvBtPm0kuEYbG5GDP/d4W6cL+3JozKa6QgfaJoxIvTYdpp/dzb0bfTKCrsSz
+ gdetdeQ377OtXmDKeqyx/WsMqniRNe+VWwCJjohEORyugrRRq+W+TcWoNNSe/ZFM
+ S6VPJsu8XANUDnN1s9DPdrVa6MnmGQ9+s6nkm0Sj6EGMLorPGz2oshxWBvOoMyD1
+ A9hPtfyIfECH5tR5Pr0NEGroAnX1LKqloxyyOolcik4911KS6GKMAv9F2gGL4Que
+ jv5VPoyNU2CMUW+0/ZshWrIYXA+KQo6ixXBNSPe3U7bShdTWGAB8AziSu3yOt5B0
+ PsW4L0ZQg6OlRYUFxrDFnvxozk2q6YwLxlGbpwIDAQABo1AwTjAdBgNVHQ4EFgQU
+ lYTaUSoJnH4kEfvwarbIEIZapAMwHwYDVR0jBBgwFoAUlYTaUSoJnH4kEfvwarbI
+ EIZapAMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAGgfwVha2xpwd
+ CcCHobXVrvFJGaoszbD1NQRJ27MkOiikz5EWew54AlWrh+ghxecQRu0fuCTLF9OM
+ slQmrQn4+/4phy4AJTXNbBBHzyj5Y2MRfSRKfcVpgdyYIQwMS0wHJmcP2r8GyK+X
+ Mgl2N/IsQfrQ2KbHX2b/NMRNxmvDCdqfo5ILmYFudfjYOUgAsiHeagaWwfjyJvgx
+ tiBMuAbgGC7yjFY05rSNa6rnQlwgciEyRPFEg7eHIRsxGiZld4xHA+b99VT67Wew
+ RJfzCPDBkKfoy388bc/CWAX4ycoIJC0Y8NnjmA+D3VEu6/Tku2Nzz+TckoT0AhSF
+ ikq7jYt0tDumNlHkv7gBGzMT0Rl/wW5Ea37bk4NsZrJ/5lZfQ+CZqYsw1w/QQOPW
+ KL9yw9lTf9VHxx42HsE2WfGR1318Ir9ohhJcK2UN0azgXqqN1yEGzC8qmPvPCaA2
+ P7ej3f82MyeTrBWyPEEvLc9DQ3stZafkkTrprc325VTbp2f2HZxaU/UbPgUdzLBr
+ oAdxBx3N0zXQW/uD8JEOypC/KIpNx4OAAupQpQ7pBrgX2VKJWakx3tNzl7vRqRhU
+ bqjPiPhgc3heOqonB6c8fDLtu9JzNAl6TGHyw9j8Yb4etgH8HlmkPa9THXXtrewY
+ VBmw7O2i/F60fXVEf7AtB1a2KZfQ/Lw=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">QS unisolution GmbH</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">qsu-unisolution</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Kamran</GivenName>
+ <SurName>Tabassum</SurName>
+ <EmailAddress>mailto:kamran@zeptosystems.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Mubashar</GivenName>
+ <SurName>Latif</SurName>
+ <EmailAddress>mailto:mubashar.latif@zeptosystems.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..30e8fde2
--- /dev/null
+++ b/swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+ <!--
+ This is a "Aluminati Engagement Portal" Shibboleth SP for the Aluminati Network Group Limited.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-03T12:05:16Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Aluminati Engagement Portal</mdui:DisplayName>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDwTCCAqmgAwIBAgIJAJcO9imPEhXBMA0GCSqGSIb3DQEBCwUAMHcxCzAJBgNV
+ BAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdtYXJrZXQxIDAe
+ BgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQDDBd1a2ZlZC5z
+ c28uYWx1bWluYXRpLm5ldDAeFw0xNTExMDIxNTI3MTZaFw0yNTExMDExNTI3MTZa
+ MHcxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdt
+ YXJrZXQxIDAeBgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQD
+ DBd1a2ZlZC5zc28uYWx1bWluYXRpLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ ADCCAQoCggEBAJ7gE7+zriB4ecuN7AfKL9StFpqaAYI9odsjqgnXzrnB+eQZFztV
+ i6sxcvfZvWGUVM1pgWsyBAMSziEFWwBX6+92l/4jKk8w+SzCdVClXeaSCV6tNDpM
+ 4X+L+4UiCKv8N0HBKyGvG2eKob0P5R1gBH5YDAzSI1RoDUs5AuuMkt/RaHKA1VGI
+ bkCGHBdjOqLvcCnEGDEE5GdmZbd48f/TalnDzvpclojaKquVcBsWiu3cI/1DJGd9
+ Uv/yxcR5WkqGbs+DlMNFD43DUQzwetkb759urWacoL+6SspJerpm9ChGntrjcJoq
+ ysJeV0DhfkWwHY9ilJpI0IK2VAfit7yuqGkCAwEAAaNQME4wHQYDVR0OBBYEFDV2
+ VlfkK1KPlMANZZZ3IKD1xgn6MB8GA1UdIwQYMBaAFDV2VlfkK1KPlMANZZZ3IKD1
+ xgn6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAyDTAOLx60dposy
+ cy+d5+9NGZgJ4hXk13PkgaoAwSo/RC0mVJaS96dm1HuUzcTAjUpn79qia4aC3ws5
+ 3nVEphO6NHCfDkWLS9ukj2RIBYI+0sJ9nJBdF3GzoG3ZDHLFuS9z0cv0TbwD+odU
+ LGMKdtfNyPOojXVo4wDlvhh8gMXohpDDjwW+j//uoSnPDQZ3crC385l+eE/P6WR6
+ KrSIScBV2Ni9kuiDmPumh0lpVPSpSPfvESEHwtJ973BbK+nTQq4sZzHzha35Lnqm
+ mdC6vZPV3h6+9LQrk8VDOzqYV1NIFGDz5RwpaYd/gaj8TkkzyPJwzfLM9/j+/BeI
+ /+zVfwU=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDwTCCAqmgAwIBAgIJAJcO9imPEhXBMA0GCSqGSIb3DQEBCwUAMHcxCzAJBgNV
+ BAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdtYXJrZXQxIDAe
+ BgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQDDBd1a2ZlZC5z
+ c28uYWx1bWluYXRpLm5ldDAeFw0xNTExMDIxNTI3MTZaFw0yNTExMDExNTI3MTZa
+ MHcxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdt
+ YXJrZXQxIDAeBgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQD
+ DBd1a2ZlZC5zc28uYWx1bWluYXRpLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ ADCCAQoCggEBAJ7gE7+zriB4ecuN7AfKL9StFpqaAYI9odsjqgnXzrnB+eQZFztV
+ i6sxcvfZvWGUVM1pgWsyBAMSziEFWwBX6+92l/4jKk8w+SzCdVClXeaSCV6tNDpM
+ 4X+L+4UiCKv8N0HBKyGvG2eKob0P5R1gBH5YDAzSI1RoDUs5AuuMkt/RaHKA1VGI
+ bkCGHBdjOqLvcCnEGDEE5GdmZbd48f/TalnDzvpclojaKquVcBsWiu3cI/1DJGd9
+ Uv/yxcR5WkqGbs+DlMNFD43DUQzwetkb759urWacoL+6SspJerpm9ChGntrjcJoq
+ ysJeV0DhfkWwHY9ilJpI0IK2VAfit7yuqGkCAwEAAaNQME4wHQYDVR0OBBYEFDV2
+ VlfkK1KPlMANZZZ3IKD1xgn6MB8GA1UdIwQYMBaAFDV2VlfkK1KPlMANZZZ3IKD1
+ xgn6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAyDTAOLx60dposy
+ cy+d5+9NGZgJ4hXk13PkgaoAwSo/RC0mVJaS96dm1HuUzcTAjUpn79qia4aC3ws5
+ 3nVEphO6NHCfDkWLS9ukj2RIBYI+0sJ9nJBdF3GzoG3ZDHLFuS9z0cv0TbwD+odU
+ LGMKdtfNyPOojXVo4wDlvhh8gMXohpDDjwW+j//uoSnPDQZ3crC385l+eE/P6WR6
+ KrSIScBV2Ni9kuiDmPumh0lpVPSpSPfvESEHwtJ973BbK+nTQq4sZzHzha35Lnqm
+ mdC6vZPV3h6+9LQrk8VDOzqYV1NIFGDz5RwpaYd/gaj8TkkzyPJwzfLM9/j+/BeI
+ /+zVfwU=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.sso.aluminati.net/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://ukfed.sso.aluminati.net/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://ukfed.sso.aluminati.net/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://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Aluminati Network Group Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Aluminati Engagement Portal</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.aluminati.net/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Emily</GivenName>
+ <SurName>Grant</SurName>
+ <EmailAddress>mailto:help@aluminati.net</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Roger</GivenName>
+ <SurName>Garner</SurName>
+ <EmailAddress>mailto:roger@aluminati.net</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml
new file mode 100644
index 00000000..c23d0c0b
--- /dev/null
+++ b/swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unicos.cirqahosting.com/shibboleth">
+ <!--
+ This is a "University College School" Shibboleth SP for IS Oxford Ltd.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-27T13:52:11Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://unicos.cirqahosting.com/Shibboleth.sso/Login"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDHjCCAgagAwIBAgIJAI69JgucdSaEMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+ BAMTHXVuaWNvcy5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDcwODEzNTQz
+ MVoXDTI1MDcwNTEzNTQzMVowKDEmMCQGA1UEAxMddW5pY29zLmlzb3hmb3JkLWhv
+ c3RpbmcubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgHQ3c
+ 0LnjZ3dzAjpblQeJa9vagyWKVXbSH5AMgiJ0IyqAOosEbMpr8IunPsBDOUHRk1T1
+ PEQxmsm4oZgqQq98Hu7N1NTNONw3awjqrexrx12dAl8VKdeCA1064Zp/G91zHWhO
+ GORr3CNpogSKqGgELQmpM/j8UufQy9OY9rnkSWGqZwJX1Iux/tnvAJw8vXZLjtCa
+ JkBAfSCs/GFiuUVKOgdBqDSERdBd/tQCyFcn+yvsNsK6LKoDWpoKGxw05Ty9F5Bb
+ mZj3Cukv+JCeU42AjZ8u+sMMZYXeS1K31U0Symd1LxKMYjfHLxAO1HgB2VCaaMeM
+ hCS02XsYS3TfdtR1AgMBAAGjSzBJMCgGA1UdEQQhMB+CHXVuaWNvcy5pc294Zm9y
+ ZC1ob3N0aW5nLmxvY2FsMB0GA1UdDgQWBBS58/SjLZWTJZDMtuPsucYe7PoqAjAN
+ BgkqhkiG9w0BAQUFAAOCAQEAjDAB0udHtjoXlaNpcbWKquYPza9p0Wh0AaMKz5jt
+ L7DCgazgDfXMpwY3J+M0ysH33s9mdd4vRe0ARro+Ec1VwY4yHjz4AvQDcGBwqZLr
+ 4AM0AK3ICpoGHBosozp8vzB1vdY9duH2n7lXGyPsiS9hZKj6oQ/gSjEIfCpwMVd8
+ S6Dr5k2bhtxjFQlZdF1ofUXQTs63rE5iQ11mYGSXd0FUeJnaEmWhpkp+kTsgn3Uj
+ 5Fx8nzqsHxkDaZC+DVGajwkzDDgsz1saH15dOOIDoHcdW3snMD3jBWuT7Yq/Kj6B
+ RH7xD7LtoPdX1VlnCjvUQILdhc/mJ9MddLSOW6r9JubXgg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unicos.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">IS Oxford Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University College School</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.isoxford.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Lee</GivenName>
+ <SurName>Orchard</SurName>
+ <EmailAddress>mailto:lee@isoxford.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>David</GivenName>
+ <SurName>Salvesen</SurName>
+ <EmailAddress>mailto:david@isoxford.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unigepass.unige.it-idp.xml b/swamid-interfederations-2.0/unigepass.unige.it-idp.xml
index 77d6afb8..8d87a56d 100644
--- a/swamid-interfederations-2.0/unigepass.unige.it-idp.xml
+++ b/swamid-interfederations-2.0/unigepass.unige.it-idp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unigepass.unige.it/idp">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unigepass.unige.it/idp">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-10-31T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
index 93865691..994343c4 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
@@ -12,7 +12,9 @@
<mdui:DisplayName xml:lang="en">Université de Lille - Sciences et Technologies</mdui:DisplayName>
<mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABwElEQVQ4y6WSP2tTYRTGf+fcN6bcFCXVEKONCsXKdelQnURcdKiTozhJhw4O0sVFBEFw1sUP4OJkUURwaL9Ah071Hw5iab0SsKmFtGlyk/c49JprQ5BKz/AO7znPc57nnCMmTwB5+InarQDtso/o4oOI8hxm9136V/lGfbxXYZZVS+/ZExHlE2C4/oQIaJhHVDAzfLONeRtIgrqMQAAzwxULnH92k3CsxE68ycc7L2jFmwPxqOH6M5oLODxRZTiq0Fyto/kcYMgghq6hYBwk9EB48+hAb/+lYL/NzDDz7LUsaLpz/w8ohpGvHKF4ZRw55LI7UUMRBVjPbBk+6f7BEhTynLl7lYsLs4w9uI64v8Zm2rOw5NA2AsnGFp/vzfHj5RLt9QZDo0WqM5dpfIj5+vgdvpkgkg1OTJ4CHKuz/XqRlUtgYIYO5QjPlknqW+RGCmx/qeFbCalipoieA7dTBfZzhPBRieFYEEQUv9OhsbxGK/5FY3kN3+ogov3jQcVmSa9x/gLV6UlGFwO0I7JLJAiI4iTonKP0foro1VHCWrqOzMyuFQPkJHADuLbKxmkDTlFcARaAt+C/g04Cx4E3vwFlCJ7zAdaaQwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
<mdui:InformationURL xml:lang="fr">http://www.univ-lille1.fr</mdui:InformationURL>
+ <mdui:Description xml:lang="en">staff and students</mdui:Description>
<mdui:DisplayName xml:lang="fr">Université de Lille - Sciences et Technologies</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">personnels et étudiants</mdui:Description>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml
index b74458fb..7f67f6fc 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml
@@ -18,6 +18,32 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDOzCCAiOgAwIBAgIUckQ0nZQ3bw9/XmojqKebUBVcI+AwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAwwUaWRwLnVuaXYtbGl0dG9yYWwuZnIwHhcNMTQwOTI0MTIz
+NzI3WhcNMzQwOTI0MTIzNzI3WjAfMR0wGwYDVQQDDBRpZHAudW5pdi1saXR0b3Jh
+bC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANa7NGCo8Lo2DXzC
+4XA7jBGtSlVBdVSlAuEy2rW2i6n3Ts9ICpoHhtC9WKNBa1ZtxIwH7+PIr+clZ6gk
+9GgNhvlH5WERj7A3qHF5H2mB0VQi666xsDTxJznJlsMoMHlvtIk7qg+JNoWi/UEd
+107GfTic44MzTM9CSytUAR60yc80eZpxcCfRtxUJ+/+Z089UOo0XEa7c8yrtBs/9
+MgMTKRNtFI5pGVPm9kLBzIwrUbAvqXMJrTkDPNPef1symHvz2KUVdaCBCfKRuefA
+c/ufF0PxIw6LxAifkRD/3JYHvRJGpMih6ioiJqw3ryZMsG/iu6pRCB2cxO7dDwEc
+3CFvEtsCAwEAAaNvMG0wHQYDVR0OBBYEFCTBfWjTKgQpMyyQpalCjaQzDVh+MEwG
+A1UdEQRFMEOCFGlkcC51bml2LWxpdHRvcmFsLmZyhitodHRwczovL2lkcC51bml2
+LWxpdHRvcmFsLmZyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQAa
+JNmFBW9h6X1olFFySNiwwVS5VqyRPXifp1ix/l4C9bK6iMSqHQJm3ZInss1uLyDc
+XOcZf4NiwkTtxRrU7v7UQRsFAA/nlba0tRLi3NDDqrrGweqplHZjWoMXwFcsUKJC
+xZg8yzybkiVq4Hu4q3s6LEL0HJt3c0hdnHeYDDR2CEFyR322T9gg1mItZBOvxiUb
+DBV+SqSgCIr5cYGH1jdWVcexJ2Mu2uuj5Gw04RBr5PkPLhgLYrxjfEE4abo33yPp
+s82vo0ov93xTva1Dvplep805AxG5l1XQZxmHrQawCUW7aQTf/oNqUQODbNXjr6Wn
+ANRboW9edeQmiV/cZeZ1
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEhTCCA22gAwIBAgIQM3C+kyGnfSc/kTiiA9+naTANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEyMTIxMDAwMDAwMFoXDTE2MDEwNTIzNTk1OVowXDELMAkGA1UE
@@ -47,39 +73,6 @@ HRSh/cWFEY7F
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEmTCCA4GgAwIBAgIQNpYV+0q076RVhq9vmZRQ+DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDEwNzAwMDAwMFoXDTEzMDEwNjIzNTk1OVowcDELMAkGA1UE
-BhMCRlIxEjAQBgNVBAcTCUR1bmtlcnF1ZTEuMCwGA1UECgwlVW5pdmVyc2l0w6kg
-ZHUgTGl0dG9yYWwgQ8O0dGUgZCdPcGFsZTEdMBsGA1UEAxMUaWRwLnVuaXYtbGl0
-dG9yYWwuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFN1xJBItC
-vBt4knmQ8KL9bIdE/Yv8EZJwUMmYf++f2b2RFjE2soBocszLWcZ+quqSbZDQPsY2
-JujFa8R3whpl08u7LcNTp6KLuh4yLYd/tDaGMMR71HVdKVCqrfJGlyjnW0DRBDRB
-rNkACsplQ8Wr1WkGYco23Vvrlwq4n+Qquth4Xekkle5G/BmSZF9+kVbsrYQaXUiI
-leRaR3wCvfyxKDy8XnbqrU+HaWvC6kows9RxmjCi9cYEWPHXS4qQ4HCDLc3p8CEX
-tUyNQf19DgZcb818aEslvoxynVe5pWbA2pab3J3B2DnIU5jx+Ehcn46SjUTKRb+J
-8ZsGaqUuEiYhAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUSD9mGXXrZO7cy8URPaeoW6aW2fMwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4Yp
-aHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYB
-BQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRl
-cmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLnVuaXYtbGl0dG9yYWwuZnIwDQYJKoZI
-hvcNAQEFBQADggEBAHqmDSP8dBvNyB/gjkjZ8UW2Adyc6Qgb58XpKcR81tbmsCeC
-9vF5IZFawucCNLXk7btI6YG3RRM9jMDIB1vLjWawqzv38OJcwGx45BeZdKAinjbP
-+CH5i6OymdC10ubFTt2fn0O/PB85r9UtrNghieDqx3rOmdnMenCp4iwj1K5OKDVE
-eWxjgJM/CWtaOwp/WWryTvTo85ZIvtgI6ejTSaDqHcJBftitunJawQrdixijaWpB
-RjIAXHurXBitq29gYTxwLspYLpYBWUykotkfhu19lZpmgQVF43Ll1saLE4EhB9tk
-PXRmrWMW/YbGP711MGAIUhDdGKBmZUWgZ73cI+I=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-littoral.fr/idp/profile/SAML2/POST/SSO"/>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
index 503658fe..217e68f8 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
@@ -19,6 +19,31 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDKDCCAhCgAwIBAgIJAOUsRys+9vr2MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0xNTEyMjExMzAzMjlaFw0xODEyMjAx
+MzAzMjlaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALUFOkbwlvHlNFscNBuf7n11roHnrDcmoh8C
+cZDcUyPwNrI6rodXl5J4VUua1KyyF7Xiw+Sbt6B3FWTQyQ/9dVYDJlqcId858mm8
+bNHMu9006HyFUg14KE4sibps3aEdDc82u3lK7g8xVth2bNH6ikVB7nHspld12xXr
+MeZPerCrgPWYcI3FU81Ry44TbHl6A8Db6hVsURQyOwI3ejedUW/v09z/eKz7tWOi
+BTO2OMj/vmFXhdJSauL5EZDFiMqj2enribQEnKDsDaQvNJ9hzxhk8W1Re3prQQXi
+58O+vMnsidsAzvWl0riP1n3JBPGpfUVfl7s5Kwt2Cstu1vYUwLsCAwEAAaNrMGkw
+SAYDVR0RBEEwP4ISaWRwLnVuaXYtbW9udHAzLmZyhilodHRwczovL2lkcC51bml2
+LW1vbnRwMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU4bXzVk5qn1dvwzKl
+ElpuNcuFqYIwDQYJKoZIhvcNAQEFBQADggEBAH+IsgY+v2+KWjJ+UYVUo76mH5sC
+FmxpW4DtXdOkx4Vf1JNwRCKKTP7NYlD402zqbtOL/aIIQ/ev6v2WFBm7/pRiajpI
+ajY3W9S/W6QgjGMM7sTLgPJoiafHT6CzjeLCgdyJ5qqTxXePPRn5t15KKBMqVwki
+S2RyLxCNaG735iyf02pouXs/vGDaVj8q5Ime/lR/mpODOKQk5lJP9Z4U3xJamQd6
+zLXKMS8vUj2HIydQGDEuXNg0DT1j3c22b/tPPgfv0ZSDfLeHYTb7D+H3+sZdgeCv
+DanziiDRT48w7pw7CXw6+cSSmi8dtXnkK5kk1sS2DBFmroJ+IEFYvP7ZxmI=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEhzCCA2+gAwIBAgIQBUjO9AwbhRtr7tjGUg65IjANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTExMDIzNTk1OVowYDELMAkGA1UE
@@ -48,32 +73,6 @@ Ev9JomAr2LzGTLq7YTwT9nuN0PgFXNMI/aM3ci5ni9DEfmNdfk1qn7HZLLqLAtPH
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNDCCAhygAwIBAgIVAJwJ10KIuByUPhJVuj+7HqVzV+6RMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0wOTExMjQxMDE0
-MTNaFw0yOTExMjQxMDE0MTNaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMTccbqO8bGcrHNnBsYU
-BzWltaO1wKAcRrxca80YuL1OFrwtpBWEDgGE6cUPm7cL4ykHd24XzvbjUCNI7NBa
-C9XTU4LNE/A2k4X58Fx4HcQuefKctEun63MxVbjQVrlxH/Z/brtcHp/TSj0sYwNF
-CzBo1My09sCLtKbFNkmVguny94AJNW6MJHZCrud5C7fZLd6/+wJ+WryFhJw1tjxf
-hwsxQ3Y4024PWnHdAfyiLjS7I3AdyvsB0KiHRa8rmf75LxPCe3v6jZjGXbmG0ZUW
-7tQML4PBGm8WJKlXVLOEQnPxLR1kN/+a1ekGuza7jZY3TElPIP1cR3YbAZMD4o1a
-DYsCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnVuaXYtbW9udHAzLmZyhilodHRw
-czovL2lkcC51bml2LW1vbnRwMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-yZI0ysdigysg4IxXXXaXXJnQIxkwDQYJKoZIhvcNAQEFBQADggEBAGDmbv5WKi8X
-sX0lEJDbHWPHv9zV0DEZcgLDyUN6jzLkldcTNhc2nRY718X+CEMZjwUtGjyrZ6Nz
-ZrPxy1UTyhxNKBm6YDATPaI3JAKnEcd9P7I/an8M7dPBVLYYU7NxzILG4s4t8Rxu
-bRtWJ4K9jC1TiBxzd2RBiVEocAKIFceeJfUnpFkn8vEw76TYGF5rmRk6dWoMrjSs
-LhYBU3U0i6D4AqaPiT3/I7g50VJpzta9zid/fYOLcnSUYXIhkszm6dSG5BV3c57y
-MkXSNKdtjN34kK2zYFBN7AuP0uFcY+A17JFhotMTIrddHvqq4vTsnW4TBBJ+ulgu
-MTnHi6+rYEQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-montp3.fr/idp/profile/SAML2/POST/SSO"/>
@@ -88,6 +87,31 @@ MTnHi6+rYEQ=
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDKDCCAhCgAwIBAgIJAOUsRys+9vr2MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0xNTEyMjExMzAzMjlaFw0xODEyMjAx
+MzAzMjlaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALUFOkbwlvHlNFscNBuf7n11roHnrDcmoh8C
+cZDcUyPwNrI6rodXl5J4VUua1KyyF7Xiw+Sbt6B3FWTQyQ/9dVYDJlqcId858mm8
+bNHMu9006HyFUg14KE4sibps3aEdDc82u3lK7g8xVth2bNH6ikVB7nHspld12xXr
+MeZPerCrgPWYcI3FU81Ry44TbHl6A8Db6hVsURQyOwI3ejedUW/v09z/eKz7tWOi
+BTO2OMj/vmFXhdJSauL5EZDFiMqj2enribQEnKDsDaQvNJ9hzxhk8W1Re3prQQXi
+58O+vMnsidsAzvWl0riP1n3JBPGpfUVfl7s5Kwt2Cstu1vYUwLsCAwEAAaNrMGkw
+SAYDVR0RBEEwP4ISaWRwLnVuaXYtbW9udHAzLmZyhilodHRwczovL2lkcC51bml2
+LW1vbnRwMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU4bXzVk5qn1dvwzKl
+ElpuNcuFqYIwDQYJKoZIhvcNAQEFBQADggEBAH+IsgY+v2+KWjJ+UYVUo76mH5sC
+FmxpW4DtXdOkx4Vf1JNwRCKKTP7NYlD402zqbtOL/aIIQ/ev6v2WFBm7/pRiajpI
+ajY3W9S/W6QgjGMM7sTLgPJoiafHT6CzjeLCgdyJ5qqTxXePPRn5t15KKBMqVwki
+S2RyLxCNaG735iyf02pouXs/vGDaVj8q5Ime/lR/mpODOKQk5lJP9Z4U3xJamQd6
+zLXKMS8vUj2HIydQGDEuXNg0DT1j3c22b/tPPgfv0ZSDfLeHYTb7D+H3+sZdgeCv
+DanziiDRT48w7pw7CXw6+cSSmi8dtXnkK5kk1sS2DBFmroJ+IEFYvP7ZxmI=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEhzCCA2+gAwIBAgIQBUjO9AwbhRtr7tjGUg65IjANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTExMDIzNTk1OVowYDELMAkGA1UE
@@ -117,32 +141,6 @@ Ev9JomAr2LzGTLq7YTwT9nuN0PgFXNMI/aM3ci5ni9DEfmNdfk1qn7HZLLqLAtPH
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDNDCCAhygAwIBAgIVAJwJ10KIuByUPhJVuj+7HqVzV+6RMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0wOTExMjQxMDE0
-MTNaFw0yOTExMjQxMDE0MTNaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMTccbqO8bGcrHNnBsYU
-BzWltaO1wKAcRrxca80YuL1OFrwtpBWEDgGE6cUPm7cL4ykHd24XzvbjUCNI7NBa
-C9XTU4LNE/A2k4X58Fx4HcQuefKctEun63MxVbjQVrlxH/Z/brtcHp/TSj0sYwNF
-CzBo1My09sCLtKbFNkmVguny94AJNW6MJHZCrud5C7fZLd6/+wJ+WryFhJw1tjxf
-hwsxQ3Y4024PWnHdAfyiLjS7I3AdyvsB0KiHRa8rmf75LxPCe3v6jZjGXbmG0ZUW
-7tQML4PBGm8WJKlXVLOEQnPxLR1kN/+a1ekGuza7jZY3TElPIP1cR3YbAZMD4o1a
-DYsCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnVuaXYtbW9udHAzLmZyhilodHRw
-czovL2lkcC51bml2LW1vbnRwMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-yZI0ysdigysg4IxXXXaXXJnQIxkwDQYJKoZIhvcNAQEFBQADggEBAGDmbv5WKi8X
-sX0lEJDbHWPHv9zV0DEZcgLDyUN6jzLkldcTNhc2nRY718X+CEMZjwUtGjyrZ6Nz
-ZrPxy1UTyhxNKBm6YDATPaI3JAKnEcd9P7I/an8M7dPBVLYYU7NxzILG4s4t8Rxu
-bRtWJ4K9jC1TiBxzd2RBiVEocAKIFceeJfUnpFkn8vEw76TYGF5rmRk6dWoMrjSs
-LhYBU3U0i6D4AqaPiT3/I7g50VJpzta9zid/fYOLcnSUYXIhkszm6dSG5BV3c57y
-MkXSNKdtjN34kK2zYFBN7AuP0uFcY+A17JFhotMTIrddHvqq4vTsnW4TBBJ+ulgu
-MTnHi6+rYEQ=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-montp3.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
index 546dd202..ee441558 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
@@ -9,9 +9,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris1.fr</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Université Paris 1 Panthéon-Sorbonne</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Paris 1 Panthéon-Sorbonne University</mdui:DisplayName>
<mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABQElEQVQ4y7WQvyuFYRzFP+dxvW8pKSXJ3WTgDxBJZkXpbiaTYrLKJLL68Q4mi4HNKllsXrcMUpSs10R2P+57DH5eupernOl5vuc8n87zhf/UySodxYR8rUyullkm7nnJ3Jf+BHBgAdMIHFTLhGpGmkRjoCFQf5pEhbobBMhwtmF0G8R93QDbzUglObvGtNQPIEwLDVuAfQrs/HoHx+tRt3D+A0Zbuhr1/AiwUboeL9i6gND1NpfUiXR2vBYv2+jzm4bPl5HWaE6EJUnfmkkKSEPXxYawuV8+fJ+/HYoJeTu+BDWBH4Fdw5EgwwwiCqDY9pPk3v7Zh6vKJWbxOOJO9gr4zlJBKHn9XGo8L9OCmJSZABYrABbnMtuGKRTav/QfEBpAvhFsGaXvVprk+kKWmzEeRZU7qaEM2JPKG7/MV9cz925uhXlAUDYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDgrMDI6MDBjnYKrAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQ4KzAyOjAwEsA6FwAAAABJRU5ErkJggg==</mdui:Logo>
<mdui:InformationURL xml:lang="fr">http://www.univ-paris1.fr</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Students, faculty, staff and affiliate people from Paris 1 Panthéon-Sorbonne university</mdui:Description>
<mdui:DisplayName xml:lang="fr">Université Paris 1 Panthéon-Sorbonne</mdui:DisplayName>
<mdui:Description xml:lang="fr">Personnels, enseignants, chercheurs, étudiants, hébergés et invités de l'université Paris 1 Panthéon-Sorbonne</mdui:Description>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml
index a7a796a5..b27aab97 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml
@@ -9,7 +9,7 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reunion.fr</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Université de la Réunion</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Reunion Island</mdui:DisplayName>
<mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACsUlEQVQoz22RS08TYRiF32/mm+mNTtuhtBTaQoFwEVtBAS0SlUgkYWMiG0xYuDGuu/QHuHBrXKBbFpq4MqAS1BgSUxCN2hKQS6BKoRd6ZabTTmc6My40hhie9XNyknNQaC5CIBhpbbjkZQ8OjpZ2MqsVw/x2AU6jmaExArjd5323sPLqxdFieIMrixf9rdNjN55G8v/ZjI70WXW4r8nKJ9LP33y2mYzBM205TohuH9os4YDnfDRd/md32w3trN6qJ4lBt+3D6paTZUYHuiau+Ad6WjqbHR+/bk8HGgCAJlHQY757wem10GaarMgKZvV4L56ZGh8kCaKrwxXsb+v0OT+txyZ7WEaPk7wUjnNcVWH0uCDWoqkSBoTC0d3DZHF0oNPf1dThNLffCja7bJmStJmtuBk64DStHpbcDBXe5zTQcPy4Ikpylit924yPttTJ2V3c6y/wQpGvpUoSJ9bsJooi0LO1HADU0Qgv7+cXZ0KcUJkMzfw61zhkd4CmNTrYHIm8Ft38Vn4jUzm5Fd7LCz7WNBFoe3R/any4l9JqAmV4sJZ+u5s89QoUmosAQHu9acjD5ivaZrby5Etqv1ilSKSomqoBjQmniYoVRIpERkz8DfwhxhHDXitJQEaQE7x01mHMCjUjTSR4KZoqX2+zvN7O4ZN1sYLIVQuSoqYFudtu+JEpZ4RaVVFpEgmysnLAl2UVA4BvJ6ITBQB4KXVodtbN0KoGwx4mVhQ77YZeh3E3L97s1s1GMoe8hAFgbGHWlYoBwHL/nXip1WXVK1x1LUFRJCqrWloDTKIdSTFU1caGFgwApK+dvnYZSPKxUAI1qv5MIr0BGeqV71Fq5KpWFpDZrB4f147iD4fuYQBQ8zl5fRU1ujShDIqiCSXCaoNUQjtKy0vvgSCAIKFaVUURAH4DUkdAsE8XlkoAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDB8O3PvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA5KzAyOjAwDWbLUwAAAABJRU5ErkJggg==</mdui:Logo>
<mdui:InformationURL xml:lang="fr">http://www.univ-reunion.fr</mdui:InformationURL>
<mdui:DisplayName xml:lang="fr">Université de la Réunion</mdui:DisplayName>
@@ -77,7 +77,7 @@ FChXMMiPA+POOLIC
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reunion.fr/idp/AA"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reunion.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
@@ -87,6 +87,6 @@ FChXMMiPA+POOLIC
<md:OrganizationURL xml:lang="en">http://www.univ-reunion.fr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:EmailAddress>dsiun-gdrsi@listes.univ-reunion.fr</md:EmailAddress>
+ <md:EmailAddress>dsi-si@listes.univ-reunion.fr</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml
new file mode 100644
index 00000000..1af32e7c
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:mace:feide.no:services:no.uio.galaxy-test">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2015-10-15T13:47:32Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Galaxy Bioportal UiO test</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Galaxy server at UiO</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIICbTCCAdYCCQDXiijSZIJdujANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJO
+TzENMAsGA1UEBwwET3NsbzENMAsGA1UECgwEVVNJVDELMAkGA1UECwwCVkQxGzAZ
+BgNVBAMMEmdhbGF4eS10ZXN0LnVpby5ubzEkMCIGCSqGSIb3DQEJARYVbi5hLnZh
+em92QHVzaXQudWlvLm5vMB4XDTEzMDExNTEwNTAwM1oXDTI2MDkyNDEwNTAwM1ow
+ezELMAkGA1UEBhMCTk8xDTALBgNVBAcMBE9zbG8xDTALBgNVBAoMBFVTSVQxCzAJ
+BgNVBAsMAlZEMRswGQYDVQQDDBJnYWxheHktdGVzdC51aW8ubm8xJDAiBgkqhkiG
+9w0BCQEWFW4uYS52YXpvdkB1c2l0LnVpby5ubzCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEAxhQJULqEK0BwR7N5r1VYHj1ZiGREBT9msBDDmMvU1p1UqWIUmLRy
+I/1pn775zdl9qjCQ7VTFjp3SkdZiEnjR4wOyFjpQzs/yneu3SAoFF/tRKrFoTgvt
+jGOb3VDmKHGr1Ygb6wDMoit9rAXD+gM7sjO6TDU1C4l+E2Dk3lUln4UCAwEAATAN
+BgkqhkiG9w0BAQUFAAOBgQCqryzoZSredMYi1vLz6jg0TD9WdedYqVFdKWsmfxsb
+434A6SMEWkt3ql4s1bH3UD9IjK/+KuviVyka3pj3LW347bFOm2sEwwvVHGlAXbzx
+ZFql6Vk1Bc+qGGOsgTK4pM3Xq/etRr0Fjp52YllAQC8DYEbo/UWf0HWGYLPTc4bb
+Ag==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIICbTCCAdYCCQDXiijSZIJdujANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJO
+TzENMAsGA1UEBwwET3NsbzENMAsGA1UECgwEVVNJVDELMAkGA1UECwwCVkQxGzAZ
+BgNVBAMMEmdhbGF4eS10ZXN0LnVpby5ubzEkMCIGCSqGSIb3DQEJARYVbi5hLnZh
+em92QHVzaXQudWlvLm5vMB4XDTEzMDExNTEwNTAwM1oXDTI2MDkyNDEwNTAwM1ow
+ezELMAkGA1UEBhMCTk8xDTALBgNVBAcMBE9zbG8xDTALBgNVBAoMBFVTSVQxCzAJ
+BgNVBAsMAlZEMRswGQYDVQQDDBJnYWxheHktdGVzdC51aW8ubm8xJDAiBgkqhkiG
+9w0BCQEWFW4uYS52YXpvdkB1c2l0LnVpby5ubzCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEAxhQJULqEK0BwR7N5r1VYHj1ZiGREBT9msBDDmMvU1p1UqWIUmLRy
+I/1pn775zdl9qjCQ7VTFjp3SkdZiEnjR4wOyFjpQzs/yneu3SAoFF/tRKrFoTgvt
+jGOb3VDmKHGr1Ygb6wDMoit9rAXD+gM7sjO6TDU1C4l+E2Dk3lUln4UCAwEAATAN
+BgkqhkiG9w0BAQUFAAOBgQCqryzoZSredMYi1vLz6jg0TD9WdedYqVFdKWsmfxsb
+434A6SMEWkt3ql4s1bH3UD9IjK/+KuviVyka3pj3LW347bFOm2sEwwvVHGlAXbzx
+ZFql6Vk1Bc+qGGOsgTK4pM3Xq/etRr0Fjp52YllAQC8DYEbo/UWf0HWGYLPTc4bb
+Ag==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://galaxy-test.uio.no/user/logout_feide_user"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://galaxy-test.uio.no/user/feide_auth" index="1"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">Galaxy Bioportal UiO test</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Galaxy server at UiO</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
+ <md:OrganizationName xml:lang="no">Universitetet i Oslo</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="no">Universitet i Oslo</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uio.no/english/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="no">http://www.uio.no/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Nikolay</md:GivenName>
+ <md:SurName>Vazov</md:SurName>
+ <md:EmailAddress>n.a.vazov@usit.uio.no</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
index 10ed68b1..5e1f68e0 100644
--- a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
+++ b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
@@ -19,30 +19,29 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
- aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
- qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
- iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
- GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
- a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
- p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
- RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
- kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
- AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
- MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
- L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
- MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
- ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
- LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
- SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
- XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
- 5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
- 58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
- Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
- agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p
- </ds:X509Certificate>
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
+aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
+qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
+iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
+GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
+a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
+p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
+RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
+SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
+XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
+5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
+58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
+Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
+agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -50,30 +49,29 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
- aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
- qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
- iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
- GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
- a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
- p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
- RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
- kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
- AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
- MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
- L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
- MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
- ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
- LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
- SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
- XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
- 5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
- 58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
- Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
- agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p
- </ds:X509Certificate>
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
+aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
+qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
+iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
+GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
+a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
+p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
+RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
+SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
+XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
+5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
+58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
+Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
+agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -85,11 +83,13 @@
<md:ServiceDescription xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
centralized repository of a wide range of language technology tools, all installed on a high-performance
computing cluster.</md:ServiceDescription>
- <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenname" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="edupersonaffiliation" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" isRequired="true"/>
<md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
- <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title" isRequired="false"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml b/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml
index 4fa5b1b2..c9207fae 100644
--- a/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml
@@ -18,10 +18,11 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">URKUND</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">URKUND</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Detect and check for plagiarism with URKUND</mdui:Description>
- <mdui:Description xml:lang="en">Detect and check for plagiarism with URKUND</mdui:Description>
- <mdui:InformationURL xml:lang="sv">http://www.urkund.com</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">http://www.urkund.com</mdui:InformationURL>
+ <mdui:Description xml:lang="sv">URKUND is an online plagiarism checker service reserved for teachers</mdui:Description>
+ <mdui:Description xml:lang="en">URKUND is an online plagiarism checker service reserved for teachers</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.urkund.com/se/om-urkund</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.urkund.com/en/about-urkund</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://static.urkund.com/documents/URKUND_SP_privacy.pdf</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
@@ -85,20 +86,26 @@ gEln3A==
<md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/NIM/POST"/>
<md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/NIM/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/ECP" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.urkund.com/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.urkund.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">URKUND</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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:AttributeConsumingService>
</md:SPSSODescriptor>
<md:ContactPerson contactType="administrative">
<md:GivenName>Peter</md:GivenName>
<md:SurName>Witasp</md:SurName>
- <md:EmailAddress>peter.witasp@prioinfo.se</md:EmailAddress>
+ <md:EmailAddress>mailto:peter.witasp@prioinfo.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Samuel</md:GivenName>
<md:SurName>Otter</md:SurName>
- <md:EmailAddress>samuel@onposition.com</md:EmailAddress>
+ <md:EmailAddress>mailto:samuel@onposition.com</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml b/swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml
new file mode 100644
index 00000000..16400b19
--- /dev/null
+++ b/swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://urz-cf9dev.urz.unibas.ch/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-10-29T14:44:09Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>unibas.ch</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>university</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">urz-cf9dev.urz.unibas.ch</mdui:DisplayName>
+ <mdui:Description xml:lang="en">urz-cf9dev.urz.unibas.ch</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIJAM7GrNjzVwKBMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHVyei1jZjlkZXYudXJ6LnVuaWJhcy5jaDAeFw0xNTAzMDIxMjQ4NTFaFw0x
+ODAzMDExMjQ4NTFaMCMxITAfBgNVBAMTGHVyei1jZjlkZXYudXJ6LnVuaWJhcy5j
+aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBPXsyUicAMoiWU08nj
+MubK48Hs/2IS+hMscaDzJ+/l4mPfqXpL3JnU+P1u/r3wrPmC7ZeONAkBQtVglgaM
+HJ1+SMyKjIqospS0UtBFctx15PuctNXelrUW4vA9pbLaTj7BY12fUhH7WNuaZMmc
+zx1RmMj+QFWGa0GHMUu/eSZH3HiqN6pf316+GGLvBEol4UgtTQwtj4rNK1Vgybgm
+N7B9GD5U8O2YUAtbJP2cno0P3PFgM0rsGUkBSSjAJkVs0FlesgREE50qUVaZHr/A
+x8K0C4vWSnDiZksm3fHr39+Rdk1BMgFyjePVgtZy2+QZ9QfGkKUaoK7LOQkoNMzR
+R70CAwEAAaNzMHEwUAYDVR0RBEkwR4IYdXJ6LWNmOWRldi51cnoudW5pYmFzLmNo
+hitodHRwczovL3Vyei1jZjlkZXYudXJ6LnVuaWJhcy5jaC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBT7LurvBcztRlOIRW5hS8ePdMtOwDANBgkqhkiG9w0BAQUFAAOCAQEA
+y1/VULSh0WAnG9pFNr46JDdrEcoactiK7TnmF6u4uTF/p6bq4sCo/mVHhGsEwlnZ
+7sOFIdSCnk02lk9xBQVgTCBNjRbYjnrb6WMdtJzCBxlJSC10qOboejc3AU0ccvsa
+Wh151b3OLDgtXKzVd3/kOE10Nj+35uQKEQVLG3OdGXaB1nB0gn4/OBkgcErhyWMz
+gVBOKbQBqFA4kFy2pmi1P2WJ6ZlWQhYsw85FmLaLdZYxL5uau0iXLz03fSaJoQ2T
+IrXMRU8/Na6KDEGsbSSUGDeWYrFB3dgyL1f6/rsr4pWFmGz4yzN1Ay3YCaZSTFpF
+aSLed9e+X5BTJyKEWbheQg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/POST" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/POST" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="6"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/ECP" index="8"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/ECP" index="9"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML/POST" index="11"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML/Artifact" index="12"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">urz-cf9dev.urz.unibas.ch</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">urz-cf9dev.urz.unibas.ch</md:ServiceDescription>
+ <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="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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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"/>
+ <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="true"/>
+ <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">unibas.ch</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">Universität Basel</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Basel</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fr">Université de Bâle</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.unibas.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.unibas.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.unibas.ch/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>ITS</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>mailto:support-its@unibas.ch</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>ITS</md:GivenName>
+ <md:SurName>WApp</md:SurName>
+ <md:EmailAddress>mailto:wapp-its@unibas.ch</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>ITS</md:GivenName>
+ <md:SurName>WSyM</md:SurName>
+ <md:EmailAddress>mailto:wsym-its@unibas.ch</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/utwente.nl-.xml b/swamid-interfederations-2.0/utwente.nl-.xml
index 7910d0d8..b53494c0 100644
--- a/swamid-interfederations-2.0/utwente.nl-.xml
+++ b/swamid-interfederations-2.0/utwente.nl-.xml
@@ -12,7 +12,7 @@
<mdui:DisplayName xml:lang="en">University of Twente</mdui:DisplayName>
<mdui:Description xml:lang="nl">Universiteit Twente</mdui:Description>
<mdui:Description xml:lang="en">Universiteit Twente</mdui:Description>
- <mdui:Logo height="48" width="108">https://static.surfconext.nl/media/idp/utwente.png</mdui:Logo>
+ <mdui:Logo height="48" width="108">https://static.surfconext.nl/logos/idp/utwente.png</mdui:Logo>
<mdui:Keywords xml:lang="en">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
<mdui:Keywords xml:lang="nl">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml
new file mode 100644
index 00000000..8dff47c0
--- /dev/null
+++ b/swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://versions-test.ligo.org/shibboleth-sp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://versions-test.ligo.org/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">LIGO Software Control System - Test</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This service provider supports the LIGO Scientific Collaboration. It is operated by the LIGO Scientific Collaboration group at the Leonard E. Parker Center for Gravitation, Cosmology, and Astrophysics at the University of Wisconsin-Milwaukee. It uses Git to provide version control services. Users authenticate to the service using a federated identity and then can access a repository. This is the test server.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://versions-test.ligo.org/spinfo.html</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://versions-test.ligo.org/spprivacy.html</mdui:PrivacyStatementURL>
+ <mdui:Logo height="60" width="80" xml:lang="en">https://versions-test.ligo.org/img/ligologo80x60.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIJAPye2jVyCBsPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWdpdC10ZXN0LmxpZ28ub3JnMB4XDTE1MDQwNjE5MzkwNFoXDTI1MDQwMzE5
+MzkwNFowHDEaMBgGA1UEAxMRZ2l0LXRlc3QubGlnby5vcmcwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzyxOlCILpcFS2J1soC5+zAAS8wukYzoUW4OLM
+Wzbtu/5j3zPWWxuhdORJu/1bZBVtKbTkqsAtPcD3x/g/pCmhLcvvbxj1eZoPfJ87
+CblPUJjveILDpx3pedGmQJA7h9gEENRrLs1GoAb7/j1UxjZnuB+5q//KJM3NOL2U
+AaIUbRuo3QFwMIIS9Ac62MAsebclietQrh/kcHVMANTRiTjOWR12TVy9KIviugnN
+8+6oEcV/Xbtbcey7QDb0GEaI8ypSpOIoYW/0u+X2JWnkyOr3us5PiZZHFG0565lD
+Q7fc2aWW2C4i1m03ORMU0frbIdsPmJvh/1qXNSGuMJx7RK9FAgMBAAGjaDBmMEUG
+A1UdEQQ+MDyCEWdpdC10ZXN0LmxpZ28ub3JnhidodHRwczovL2dpdC10ZXN0Lmxp
+Z28ub3JnL3NoaWJib2xldGgtc3AwHQYDVR0OBBYEFMIoQ7MU6E6LQPdFmBAwPUvU
+3TupMA0GCSqGSIb3DQEBBQUAA4IBAQBE6BrDu8+H9Mwmr6+lpEagvDKMhKxjpvmE
+dyMwJTpUDL8DP4Ak1nDOr+UmnJo+5yj+gmngbQQQDa6BgSyucS7biuQL8hR4JTOr
+kWWY8+nAxBcYDDONnV5YdGBpSv+UFB9UuXX4//IVngEvpBLSsNMUFOKbpR1Ho0Zq
+JZnzDqFZPYEd9nsqzrxaLf3hwNT80Q83d7x9W9SNfTPZuXPz7WALiLVGHZ5KYDiH
+10KjvQgiFW3ujH1jfcsiU9BDJG7OpXFdAXiU95kuWk2RbAZDFAQ8qI1usaew0zS2
+djNCMsASHgON9D2b2vfcNdMr0yIbOT36yypVw/4KHc1pAMaf7vBc
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">LIGO Software Control System - Test</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">This service provider supports the LIGO Scientific Collaboration. It is operated by the LIGO Scientific Collaboration group at the Leonard E. Parker Center for Gravitation, Cosmology, and Astrophysics at the University of Wisconsin-Milwaukee. It uses Git to provide version control services. Users authenticate to the service using a federated identity and then can access a repository. This is the test server.</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Thomas Downes</md:GivenName>
+ <md:EmailAddress>thomas.downes@ligo.org</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>UWM LSC Help</md:GivenName>
+ <md:EmailAddress>uwm-help@cgca.uwm.edu</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Warren Anderson</md:GivenName>
+ <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+ <md:GivenName>LIGO Security Committee</md:GivenName>
+ <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
index 8d6b690f..78cc7ad4 100644
--- a/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
@@ -107,19 +107,19 @@ I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
<md:ContactPerson contactType="administrative">
<md:Company>Mid Sweden University</md:Company>
<md:SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</md:SurName>
- <md:EmailAddress>SystemDriftIT@miun.se</md:EmailAddress>
+ <md:EmailAddress>mailto:SystemDriftIT@miun.se</md:EmailAddress>
<md:TelephoneNumber>+46 771 975 000</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Mid Sweden University</md:Company>
<md:SurName>Ove Olander</md:SurName>
- <md:EmailAddress>Ove.Olander@miun.se</md:EmailAddress>
+ <md:EmailAddress>mailto:Ove.Olander@miun.se</md:EmailAddress>
<md:TelephoneNumber>+46 63 165787</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Mid Sweden University</md:Company>
<md:SurName>IT Helpdesk</md:SurName>
- <md:EmailAddress>helpdesk@miun.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
<md:TelephoneNumber>+46 771 976130</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml b/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml
index a5b889dd..40cd6d62 100644
--- a/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml
@@ -11,10 +11,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufrpe.br</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:DisplayName>
- <mdui:Description xml:lang="en">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:Description>
- <mdui:Description xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:Description>
+ <mdui:DisplayName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.ufrpe.br/</mdui:InformationURL>
<mdui:InformationURL xml:lang="pt-br">http://www.ufrpe.br/</mdui:InformationURL>
</mdui:UIInfo>
@@ -90,10 +90,10 @@ xJmcDO6Xnxd2Dg/Hd379EKgwh2yD1snjdvKj61nR4YArdaB5elySqOs3jGc7qJJ5
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.ufrpe.br/</md:OrganizationURL>
<md:OrganizationURL xml:lang="pt-br">http://www.ufrpe.br/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml
index 98ab7f89..de1c5bb5 100644
--- a/swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml
@@ -14,7 +14,7 @@
<mdui:DisplayName xml:lang="en">Onderwijsgroep Tilburg</mdui:DisplayName>
<mdui:Description xml:lang="nl">Onderwijsgroep Tilburg</mdui:Description>
<mdui:Description xml:lang="en">Onderwijsgroep Tilburg</mdui:Description>
- <mdui:Logo height="23" width="108">https://static.surfconext.nl/media/idp/onderwijsgroep-tilburg.png</mdui:Logo>
+ <mdui:Logo height="23" width="108">https://static.surfconext.nl/logos/idp/onderwijsgroep-tilburg.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Onderwijsgroep Tilburg, ROC Tilburg</mdui:Keywords>
<mdui:Keywords xml:lang="nl">Onderwijsgroep Tilburg, ROC Tilburg</mdui:Keywords>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 70d04536..f47e9caa 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -29,7 +29,6 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">its.itsf.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sikker-adgang.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibc.dk</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">natmus.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rungsted-gym.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsj.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosuc.cphwest.dk</shibmd:Scope>
@@ -43,13 +42,11 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frsgym.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cbs.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniit.dk</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dskd.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ku.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristne-gym.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsn.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vordingborg-gym.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmjx.dk</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hasseris-gym.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apoteket.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kadk.dk</shibmd:Scope>
@@ -74,21 +71,20 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eadania.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dansidp.stads.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umit.dk</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campusvejle.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rosborg-gym.dk</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhavnhs.dk</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ah.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">basyd.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">statsbiblioteket.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eamv.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aams.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">regionsjaelland.dk</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dskd.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fms.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smk.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msk.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drcmr.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">simac.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsyd.dk</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">this.is.not.a.valid.idp</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..54e52245
--- /dev/null
+++ b/swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://web.oriel.ox.ac.uk/shibboleth">
+ <!--
+ This is a 'University of Oxford, Oriel College' Shibboleth SP for the University of Oxford.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-16T16:12:22Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/Login"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC/TCCAeWgAwIBAgIJAM1GWdcimaKPMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+ BAMTEndlYi5vcmllbC5veC5hYy51azAeFw0xNTExMTAxMjQxMDRaFw0yNTExMDcx
+ MjQxMDRaMB0xGzAZBgNVBAMTEndlYi5vcmllbC5veC5hYy51azCCASIwDQYJKoZI
+ hvcNAQEBBQADggEPADCCAQoCggEBAL+gbrPC66dBinzrKiqL9VHf+sG3mv6BbanV
+ KGAKuXZzHfgJvOvxr0q1DcbIjrhuFiP1w7G8eIJk2wSh699xNnI7PceclpKWCB0J
+ 19PbKMIM5RF0M0PJU4W1QjLZmFLKcj+fJbQHhD50jvgaECoSWo1Z0nmLYEF94hw+
+ 9xVoCASdegNe3peRL1NbUjIvfdd6OCj8o1QtAkrCBiH3HNHe4m5vu9t/EAlHVTlZ
+ WtzHDLdPgwYJ+i/kl4ZiQRX1pYjOxPBHxSjh43uoKsqb/qkulHV7gTkwfVv7iUd9
+ PKj7dVVgK6bpSR/2qPkdap1XLZRRZyiCKE5o3LElRn/0AevbEvECAwEAAaNAMD4w
+ HQYDVR0RBBYwFIISd2ViLm9yaWVsLm94LmFjLnVrMB0GA1UdDgQWBBQO+H5D8rud
+ H06/aqz/wM/uj4bK+DANBgkqhkiG9w0BAQUFAAOCAQEAqlbzy4HbCYgTTSnqtOxb
+ DfN9FY1l8PSLKyG2qO9v8YWSuGnUvXWl5fiP5q2PjzThUOOKM4yWPQDI0QaN5N/+
+ Du1/NY4gJy7LFzKAzBytl+jw82wHkb3OMoaMYEa5vL1EIBmeJhzkN4Zr5FQ+0ass
+ K93VA9bjb3pm5c2emWQEtBKASCIUOnCqHOF9FqtCSne98k07mVH+E8d4UjSlzbBp
+ eOSODUc8FHyLaUNy44vM0IEwsoH66LCKctsw4B1taLxNgi3I7sJuxW6AYN5/dgT9
+ tzJrFvKSNaYWk6SyEoDAYus7GsvcL+zzCKmKuXzzZgj8ih4GnUH6OtdNXvGz4YjU
+ IA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">University of Oxford, Oriel College</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.oriel.ox.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IT Support</GivenName>
+ <EmailAddress>mailto:it-support@oriel.ox.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IT Support</GivenName>
+ <EmailAddress>mailto:it-support@oriel.ox.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml b/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml
index 631c80ac..67833e54 100644
--- a/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml
+++ b/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml
@@ -4,11 +4,6 @@
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-03-15T11:05:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
diff --git a/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml b/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
index a0326a1f..e451000d 100644
--- a/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
@@ -84,6 +84,6 @@ euZKcqmem+nEk8ZZsFxhsTwGLzwlgA+2TEJnP3AeRTiPLzvbYTUprgL0gKt7pg==
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>NORDUnet NOC</md:Company>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
index 057aafe0..c68197c6 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -74,7 +74,13 @@ ydKuf18CBYHeixW6XzkCMEdcRTec/qVTn7stpLtuuC5TCblNKGDKmhx9Mec+1Jo=
<md:ServiceDescription xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</md:ServiceDescription>
<md:ServiceDescription xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</md:ServiceDescription>
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="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="false"/>
+ <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="false"/>
+ <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
index 86629204..735ebcce 100644
--- a/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -5,6 +5,9 @@
<mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+ </saml:Attribute>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
@@ -122,17 +125,17 @@ MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
<md:ContactPerson contactType="administrative">
<md:Company>Uppsala University</md:Company>
<md:SurName>SAML2 admins</md:SurName>
- <md:EmailAddress>akka-datordrift@its.uu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:akka-datordrift@its.uu.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Uppsala University</md:Company>
<md:SurName>SAML2 admins</md:SurName>
- <md:EmailAddress>akka-datordrift@its.uu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:akka-datordrift@its.uu.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Uppsala universitet</md:Company>
<md:SurName>IT Servicedesk</md:SurName>
- <md:EmailAddress>helpdesk@uu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
<md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
new file mode 100644
index 00000000..8b3fabe7
--- /dev/null
+++ b/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://webproxysrv.uniarts.se/adfs/services/trust">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniarts.se</shibmd:Scope>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniarts.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Stockholms konstnärliga högskola</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Stockholm University of the Arts</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för uniarts.se.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for uniarts.se.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://uniarts.se/om-skh</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.uniarts.se/english/about-uniarts</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="E-Mail Address" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Given Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="UPN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Common Name" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x E-Mail Address" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x UPN" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Role" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Surname" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="PPID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name ID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication time stamp" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication method" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only group SID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Windows account name" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Is Registered User" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device Identifier" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device Registration Identifier" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device Registration DisplayName" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device OS type" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device OS Version" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Is Managed Device" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Forwarded Client IP" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client Application" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client User Agent" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client IP" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Endpoint Path" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Proxy" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Application Identifier" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Application policies" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authority Key Identifier" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Basic Constraint" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Enhanced Key Usage" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Issuer" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Issuer Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Key Usage" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Not After" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Not Before" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Certificate Policies" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Public Key" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Certificate Raw Data" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject Alternative Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Serial Number" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Signature Algorithm" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject Key Identifier" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="V2 Template Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="V1 Template Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Thumbprint" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="X.509 Version" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Inside Corporate Network" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Password Expiration Time" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Password Expiration Days" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Update Password URL" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication Methods References" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client Request ID" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Alternate Login ID" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="eduPersonScopedAffiliation" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en-US">Stockholms konstnärliga högskola</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en-US">Stockholms konstnärliga högskola</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en-US">http://www.uniarts.se/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Lars</md:GivenName>
+ <md:SurName>Lind</md:SurName>
+ <md:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
+ <md:TelephoneNumber>+46(0)849400220</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
index 49e0779e..c1f789cf 100644
--- a/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
@@ -10,6 +10,7 @@
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://eduid.cz/uri/idp-group/other</saml:AttributeValue>
<saml:AttributeValue>http://eduid.cz/uri/idp-group/cesnet</saml:AttributeValue>
<saml:AttributeValue>http://eduid.cz/uri/sp-group/aa.cesnet.cz</saml:AttributeValue>
</saml:Attribute>
@@ -30,27 +31,78 @@
<mdui:Logo height="353" width="800">https://pki.cesnet.cz/_media/cs/cesnet-logo-800.gif</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
- <md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIC7jCCAdYCCQCRzSvIiTLzPDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJD
-WjEPMA0GA1UEChMGQ0VTTkVUMRkwFwYDVQQDExB3aG9hbWkuY2VzbmV0LmN6MB4X
-DTExMDYyODE3MTUxNloXDTIxMDYyNTE3MTUxNlowOTELMAkGA1UEBhMCQ1oxDzAN
-BgNVBAoTBkNFU05FVDEZMBcGA1UEAxMQd2hvYW1pLmNlc25ldC5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALVaOoSPi3RrWjAIk9qneCw48UDTRqsZ
-saD3YGWGpUzigUqAIFgNewH4gFyZskhgeUB185iBCgsb5+oiNwdGKvm0dSRS8qlo
-vjzbeBP7sSVbgmOeeRy6W9AD8cA7HMrrHXxLn7LFGk2czY+dtEWkA0CFVYOR/JGX
-2a8g0YfHqRypU7DKqoo5feB7eUclzwhiZ9jsjqbE//M3LUk/QPIbxfimB8XFY7tV
-ijdFXkmSyz84FDZhCQ4eypu5Pn6+ov4BF/MXZGjFSsBbUKWL4UDAyL+y7LlzvsZq
-sJ4crixV7D3+ChkCaimW2+ETRZF/3F7c52SiqIgjCnvUV90ttGqQWrsCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAjxVz8kXKKtoM449sxOGg1+pp/rio4vUpZ//nSfwf
-HnbZdesPoLoE58o+U5E3+e5hcN9jRbOEYyFt1oR9uTmYyo19G6CARvN3HNbUL5dW
-ID4yEvYy54tvokxqWNisk5NtXgOmOD+U2NX0FwAkoCDYOKboASeZ5PTQ5uvIo2Cm
-ljL8VHxgCZ+N4/UYnz3xAiJBKXCFLNgTMVIM2HKNYioKUqxubVDapR9E94vLzuvs
-9NVKKQfcm4DAMfylJKBLMGFNdqNwiFmczxxkOr3Me+vn+Tb7XRzT1tSmQkwilpmY
-i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
- </ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAPtcN7LUM3UEz0yqfmOvpr0tZtYOMA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU4
+WhcNMzUxMjE0MDkyMjU4WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqlyX+ljxEHVNiX4Kt3AMYj6P
+UgWAGHkb5t1xZhrijzWspc6wTc6iNQnLzFTafl1KJktWMHBNmFvUQyHGjCVbski4
+WWUNS4rCFyY7USNjdjiKb7lHqw4OLwd6GMnI6njbUkY7tQJ/Dq3lGPjs+LJ9jPq3
+9l2kSbsMz55WN86aC7J+WwSjCv2BHYs/KEJ+127RUVBtloSmNRZfjJQcdKFsp+mS
+OyMP91WtZQwg3b7EXOOqSkm55esBWJiwII565SHfrl4aQe58xA/V2sHeFH4IbtH/
+IZsibhM/G0eBr9dvHtyfcWvnlA8cmQaD964nVqnYpFa/eXYfg53V1Ft6KQMvgwID
+AQABo2cwZTAdBgNVHQ4EFgQUXaI0YDr1Q2G4mM18pIXB3+nPUHUwRAYDVR0RBD0w
+O4IQd2hvYW1pLmNlc25ldC5jeoYnaHR0cHM6Ly93aG9hbWkuY2VzbmV0LmN6L2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBzZ5sJtPabubBWaC5UAbl8
++ZGzSrT72R9vfxW6+NJVK9C5LvCp6a6U3KDrZwMRb5hKvAbkQji1bPHAQ+Bt7qtj
+iz4vxBDJueIuZCoHbSSkK9Xb5h9025TGICxNFtty3y4LvroPZ3wYACXdjA/Si3xK
+JF6us/yB6hcAf6ML7DyXW+o4q+35HHmAjBUssXHU70iLOiTnIfbEgxl54Af7xKpZ
+8Ww45V9t2dJ5YU6wzoa0Aqy0abm0RxkWu6igXjpcS+XaSl5n+J+tFEZBRtJZ5mBv
+EQWIvarHy4CabFyOcb1Bl3UHfvQyi3R4RfQsEIYaYBa/5c3LJr3KC8mWCA8vuPx+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUNHGiLWEdd83k9nZ70899LxlSksMwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQd2hvYW1pLmNlc25ldC5jejAeFw0xNTEyMTQwOTIyNTZa
+Fw0zNTEyMTQwOTIyNTZaMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNzxV/6eZL14fhksPzth+cv6bf
+aoE/W/Z+Hrey2ZEUCexwPN4ogtL35gITcj7uctw5bxFPNO4Io9ooXC5nUBThc90g
+jBxTLS8B5/pkbcuRFDX3w4C++mCQdiZ7+5aG1K31+Vw5XCd8Ai+UC3/oZI4vekfC
+ZJ7wHYN/W2N15FJ6breDWOewk+z1ezag3SfY2U3aROFBuQJks2WKx7+bClXtVEYz
+SregJY/ZkuCsLsNwxqw+rw4njESLGTpfiK1raWdrBwiPacyCG9T9Fte+AGfoHuK0
+OMcpqPQsnnzB7UAnUCthpo0pllD3qJCL+SdX+Rka40Vps2HrV3Jk/fGxNuADAgMB
+AAGjZzBlMB0GA1UdDgQWBBRJtNZfYNTYii4s7L4/Y/SqT3SMKjBEBgNVHREEPTA7
+ghB3aG9hbWkuY2VzbmV0LmN6hidodHRwczovL3dob2FtaS5jZXNuZXQuY3ovaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGkcr3KAQV2zbSeviEblSyyr
+5tJ/TW2HbJCN/8sLGA+6TwLsCcjWkEtXpXskZlsxbCtgmqztaNa/vQsRSIsVA1Ph
+ynUBMniJQ4wfiNhkbj73ukgE16NIY0WITgJNdwFj4Nb5cysCAo+Gqa6UTofB5p9/
+QkEL4dP6M+eo5ZIDvndTF+vb9Uxt+SFttFETS/2RzneYXzCsa/5wWDIsmwNwMRYN
+1RjGMhjQ0DLx4PyEhrOqzWBGFM00qSWypY29SQ/nYGRpjBkvOYasT8eHIovD9M8C
+bmD1QX2KicdJm3oC14xc3Amm2Ja4YeystmRZO0H4z0oVN/zhBT90pjKf4yuF+Bs=
+ </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>
+MIIDLDCCAhSgAwIBAgIVAMGRAZNgX7x88WED24sBgvq/prF/MA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU3
+WhcNMzUxMjE0MDkyMjU3WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg0TLTs5Cinlt6r2wcS+7NT+k
+O1synzXA9/VEvEDnXbqx5ryyDYyVB4tL4BEU1bsf95GD2RDOdU+rYDRgW+K2R9do
+gJfZ6SmDjdnxOcvLBMkpQTrD0XE35ZDohMf8EXHxuID+JxPDnd0ZU/SF6bH/5WHq
+WzPKIF1+OfIoeRY2IH5HrwKgz5EMvFJKUTcDxzNTFApIzLt46KbxxBxi4JPoPMKT
+9r889YOdknPCuVW4ZldJTljJCR9ZkjgTuIWVBgi3pbqjRtg5JUDrfBBvUUKLC2a8
+3PEnHpP9ukeErX5aVHPJ3dNNL1ACYzjZMGzeb6yDPunISnO/MW/cP8OBu3njcwID
+AQABo2cwZTAdBgNVHQ4EFgQUOJRY3ly/FY3E/c3BlIUAeVbpGkQwRAYDVR0RBD0w
+O4IQd2hvYW1pLmNlc25ldC5jeoYnaHR0cHM6Ly93aG9hbWkuY2VzbmV0LmN6L2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBhsQ7KA7Furd6LFDZ9inh+
+yaVPlWcS2wBrvW6kgRU5/B+0sf3f/HKOtbYREOvtdI2Cf0rvTlvSACJzJ1Mlta5H
+9AK/M9qlrJf9Vrl5eik5Il1QZBfNniVojz0JImhZmr28sLT3yYMcLAERg1E6Yg35
+dQ4u7VaUTaGleUKF8dZfEc8okQUqeSNAIpTAxzAwQC3crVdtyhH4luP/vFvWwLMg
+V2DvXG/+7HDskpb5nE9Vy3lunkwSZLsBCJHFpU8GWSuhrXpIJjelw7yswEHpep0Q
+D/3xRElbMqPKyidtXPj29chPYs3GsBrvgaXjoNnOwQhB8lS1T2JbrvG/OPVIQojD
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -72,27 +124,78 @@ i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cesnet.cz</shibmd:Scope>
</md:Extensions>
- <md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAPtcN7LUM3UEz0yqfmOvpr0tZtYOMA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU4
+WhcNMzUxMjE0MDkyMjU4WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqlyX+ljxEHVNiX4Kt3AMYj6P
+UgWAGHkb5t1xZhrijzWspc6wTc6iNQnLzFTafl1KJktWMHBNmFvUQyHGjCVbski4
+WWUNS4rCFyY7USNjdjiKb7lHqw4OLwd6GMnI6njbUkY7tQJ/Dq3lGPjs+LJ9jPq3
+9l2kSbsMz55WN86aC7J+WwSjCv2BHYs/KEJ+127RUVBtloSmNRZfjJQcdKFsp+mS
+OyMP91WtZQwg3b7EXOOqSkm55esBWJiwII565SHfrl4aQe58xA/V2sHeFH4IbtH/
+IZsibhM/G0eBr9dvHtyfcWvnlA8cmQaD964nVqnYpFa/eXYfg53V1Ft6KQMvgwID
+AQABo2cwZTAdBgNVHQ4EFgQUXaI0YDr1Q2G4mM18pIXB3+nPUHUwRAYDVR0RBD0w
+O4IQd2hvYW1pLmNlc25ldC5jeoYnaHR0cHM6Ly93aG9hbWkuY2VzbmV0LmN6L2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBzZ5sJtPabubBWaC5UAbl8
++ZGzSrT72R9vfxW6+NJVK9C5LvCp6a6U3KDrZwMRb5hKvAbkQji1bPHAQ+Bt7qtj
+iz4vxBDJueIuZCoHbSSkK9Xb5h9025TGICxNFtty3y4LvroPZ3wYACXdjA/Si3xK
+JF6us/yB6hcAf6ML7DyXW+o4q+35HHmAjBUssXHU70iLOiTnIfbEgxl54Af7xKpZ
+8Ww45V9t2dJ5YU6wzoa0Aqy0abm0RxkWu6igXjpcS+XaSl5n+J+tFEZBRtJZ5mBv
+EQWIvarHy4CabFyOcb1Bl3UHfvQyi3R4RfQsEIYaYBa/5c3LJr3KC8mWCA8vuPx+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUNHGiLWEdd83k9nZ70899LxlSksMwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQd2hvYW1pLmNlc25ldC5jejAeFw0xNTEyMTQwOTIyNTZa
+Fw0zNTEyMTQwOTIyNTZaMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNzxV/6eZL14fhksPzth+cv6bf
+aoE/W/Z+Hrey2ZEUCexwPN4ogtL35gITcj7uctw5bxFPNO4Io9ooXC5nUBThc90g
+jBxTLS8B5/pkbcuRFDX3w4C++mCQdiZ7+5aG1K31+Vw5XCd8Ai+UC3/oZI4vekfC
+ZJ7wHYN/W2N15FJ6breDWOewk+z1ezag3SfY2U3aROFBuQJks2WKx7+bClXtVEYz
+SregJY/ZkuCsLsNwxqw+rw4njESLGTpfiK1raWdrBwiPacyCG9T9Fte+AGfoHuK0
+OMcpqPQsnnzB7UAnUCthpo0pllD3qJCL+SdX+Rka40Vps2HrV3Jk/fGxNuADAgMB
+AAGjZzBlMB0GA1UdDgQWBBRJtNZfYNTYii4s7L4/Y/SqT3SMKjBEBgNVHREEPTA7
+ghB3aG9hbWkuY2VzbmV0LmN6hidodHRwczovL3dob2FtaS5jZXNuZXQuY3ovaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGkcr3KAQV2zbSeviEblSyyr
+5tJ/TW2HbJCN/8sLGA+6TwLsCcjWkEtXpXskZlsxbCtgmqztaNa/vQsRSIsVA1Ph
+ynUBMniJQ4wfiNhkbj73ukgE16NIY0WITgJNdwFj4Nb5cysCAo+Gqa6UTofB5p9/
+QkEL4dP6M+eo5ZIDvndTF+vb9Uxt+SFttFETS/2RzneYXzCsa/5wWDIsmwNwMRYN
+1RjGMhjQ0DLx4PyEhrOqzWBGFM00qSWypY29SQ/nYGRpjBkvOYasT8eHIovD9M8C
+bmD1QX2KicdJm3oC14xc3Amm2Ja4YeystmRZO0H4z0oVN/zhBT90pjKf4yuF+Bs=
+ </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>
-MIIC7jCCAdYCCQCRzSvIiTLzPDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJD
-WjEPMA0GA1UEChMGQ0VTTkVUMRkwFwYDVQQDExB3aG9hbWkuY2VzbmV0LmN6MB4X
-DTExMDYyODE3MTUxNloXDTIxMDYyNTE3MTUxNlowOTELMAkGA1UEBhMCQ1oxDzAN
-BgNVBAoTBkNFU05FVDEZMBcGA1UEAxMQd2hvYW1pLmNlc25ldC5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALVaOoSPi3RrWjAIk9qneCw48UDTRqsZ
-saD3YGWGpUzigUqAIFgNewH4gFyZskhgeUB185iBCgsb5+oiNwdGKvm0dSRS8qlo
-vjzbeBP7sSVbgmOeeRy6W9AD8cA7HMrrHXxLn7LFGk2czY+dtEWkA0CFVYOR/JGX
-2a8g0YfHqRypU7DKqoo5feB7eUclzwhiZ9jsjqbE//M3LUk/QPIbxfimB8XFY7tV
-ijdFXkmSyz84FDZhCQ4eypu5Pn6+ov4BF/MXZGjFSsBbUKWL4UDAyL+y7LlzvsZq
-sJ4crixV7D3+ChkCaimW2+ETRZF/3F7c52SiqIgjCnvUV90ttGqQWrsCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAjxVz8kXKKtoM449sxOGg1+pp/rio4vUpZ//nSfwf
-HnbZdesPoLoE58o+U5E3+e5hcN9jRbOEYyFt1oR9uTmYyo19G6CARvN3HNbUL5dW
-ID4yEvYy54tvokxqWNisk5NtXgOmOD+U2NX0FwAkoCDYOKboASeZ5PTQ5uvIo2Cm
-ljL8VHxgCZ+N4/UYnz3xAiJBKXCFLNgTMVIM2HKNYioKUqxubVDapR9E94vLzuvs
-9NVKKQfcm4DAMfylJKBLMGFNdqNwiFmczxxkOr3Me+vn+Tb7XRzT1tSmQkwilpmY
-i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
- </ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAMGRAZNgX7x88WED24sBgvq/prF/MA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU3
+WhcNMzUxMjE0MDkyMjU3WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg0TLTs5Cinlt6r2wcS+7NT+k
+O1synzXA9/VEvEDnXbqx5ryyDYyVB4tL4BEU1bsf95GD2RDOdU+rYDRgW+K2R9do
+gJfZ6SmDjdnxOcvLBMkpQTrD0XE35ZDohMf8EXHxuID+JxPDnd0ZU/SF6bH/5WHq
+WzPKIF1+OfIoeRY2IH5HrwKgz5EMvFJKUTcDxzNTFApIzLt46KbxxBxi4JPoPMKT
+9r889YOdknPCuVW4ZldJTljJCR9ZkjgTuIWVBgi3pbqjRtg5JUDrfBBvUUKLC2a8
+3PEnHpP9ukeErX5aVHPJ3dNNL1ACYzjZMGzeb6yDPunISnO/MW/cP8OBu3njcwID
+AQABo2cwZTAdBgNVHQ4EFgQUOJRY3ly/FY3E/c3BlIUAeVbpGkQwRAYDVR0RBD0w
+O4IQd2hvYW1pLmNlc25ldC5jeoYnaHR0cHM6Ly93aG9hbWkuY2VzbmV0LmN6L2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBhsQ7KA7Furd6LFDZ9inh+
+yaVPlWcS2wBrvW6kgRU5/B+0sf3f/HKOtbYREOvtdI2Cf0rvTlvSACJzJ1Mlta5H
+9AK/M9qlrJf9Vrl5eik5Il1QZBfNniVojz0JImhZmr28sLT3yYMcLAERg1E6Yg35
+dQ4u7VaUTaGleUKF8dZfEc8okQUqeSNAIpTAxzAwQC3crVdtyhH4luP/vFvWwLMg
+V2DvXG/+7HDskpb5nE9Vy3lunkwSZLsBCJHFpU8GWSuhrXpIJjelw7yswEHpep0Q
+D/3xRElbMqPKyidtXPj29chPYs3GsBrvgaXjoNnOwQhB8lS1T2JbrvG/OPVIQojD
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml b/swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml
index 6eb38c1a..702fb271 100644
--- a/swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml
+++ b/swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.dir.garr.it:12081/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.dir.garr.it:12081/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-30T15:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..2d84a7e3
--- /dev/null
+++ b/swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wsso.vscht.cz/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2012-10-22T11:17:38Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vscht.cz</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of Chemistry and Technology, Prague</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Vysoká škola chemicko-technologická Praze</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for employees and students of the University of Chemistry and Technology in Prague</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysoké školy chemicko-technologické v Praze</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.vscht.cz/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://www.vscht.cz/</mdui:InformationURL>
+ <mdui:Logo height="40" width="40">https://wsso.vscht.cz/logo_vscht_40px.png</mdui:Logo>
+ </mdui:UIInfo>
+ <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+ <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+ </eduidmd:RepublishRequest>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIJAKMDfYjjTNSxMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMTDXdzc28udnNjaHQuY3owHhcNMTUwODI4MTIyNTMwWhcNMTgwODI3MTIyNTMw
+WjAYMRYwFAYDVQQDEw13c3NvLnZzY2h0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4PhQlXne7imNIZ4BCXcA1mqNEdeVrf1G+IyF8LZbGDt83nfN
+3toWixvfE1dFAIB2m2QTlRShMk/rhSYZZ7YAd/9ujpnRg5abNXcOu2EYneJl70rU
+wbIcSuL47hjE0Wt5XOTgw+lIzOmERy7aP/eX4VMrlKo0Zr+3cGuinxCVNmkc914d
+bOoiBnU7w3MwUk0CFSGQ6DqFLdauYs7WoqubEBBAClXBLicEBPU8S2hvsa335NL4
+PUK88cW4tETDU89X6jRpxOMBKdVTDepZ4P1y+cRhbzf3Gl90u/oub/AXRHntwoMD
+gpX8wE7wIY75pFbRMNPfKsu2vZBiu73NSKlOhwIDAQABo2EwXzA+BgNVHREENzA1
+gg13c3NvLnZzY2h0LmN6hiRodHRwczovL3dzc28udnNjaHQuY3ovaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFMqTaylMN+eMOxsB5FGMO+nmXtZUMA0GCSqGSIb3DQEB
+BQUAA4IBAQAI9iwzEXoxwEaWztPrCiq1Q4bTeRRaHBc5E7aIQ9vNeZL3PwbDsorS
+v5y8HOEQmJgfNOyXvuR7bkOQIWS4HgLyMnwhBs5o2UNvaBOORUUUej6N7C4Yzumj
+bbSHKhb7Sw0eukh47Ojn/utVyEDb7DWYqt+fK398r/OszgQpKd0M5e8Rml8wEv3W
+6v/6GSFzctj5DmgQMvtHkwmOHfkdyjFUQkq61cdes3y0hO8wpNM4Jy9NfvFudKto
+5mv/AhMCzv8ZtyMuvpjtCcnr5jR6G5jpVbOnaMT12mF8M1pdcBWS8rg/PzDSVdfp
+wuwwICx8lcu0GWQYTWR2+DVgH2hebKgY
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wsso.vscht.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wsso.vscht.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wsso.vscht.cz/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wsso.vscht.cz/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wsso.vscht.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wsso.vscht.cz/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vscht.cz</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIJAKMDfYjjTNSxMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMTDXdzc28udnNjaHQuY3owHhcNMTUwODI4MTIyNTMwWhcNMTgwODI3MTIyNTMw
+WjAYMRYwFAYDVQQDEw13c3NvLnZzY2h0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4PhQlXne7imNIZ4BCXcA1mqNEdeVrf1G+IyF8LZbGDt83nfN
+3toWixvfE1dFAIB2m2QTlRShMk/rhSYZZ7YAd/9ujpnRg5abNXcOu2EYneJl70rU
+wbIcSuL47hjE0Wt5XOTgw+lIzOmERy7aP/eX4VMrlKo0Zr+3cGuinxCVNmkc914d
+bOoiBnU7w3MwUk0CFSGQ6DqFLdauYs7WoqubEBBAClXBLicEBPU8S2hvsa335NL4
+PUK88cW4tETDU89X6jRpxOMBKdVTDepZ4P1y+cRhbzf3Gl90u/oub/AXRHntwoMD
+gpX8wE7wIY75pFbRMNPfKsu2vZBiu73NSKlOhwIDAQABo2EwXzA+BgNVHREENzA1
+gg13c3NvLnZzY2h0LmN6hiRodHRwczovL3dzc28udnNjaHQuY3ovaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFMqTaylMN+eMOxsB5FGMO+nmXtZUMA0GCSqGSIb3DQEB
+BQUAA4IBAQAI9iwzEXoxwEaWztPrCiq1Q4bTeRRaHBc5E7aIQ9vNeZL3PwbDsorS
+v5y8HOEQmJgfNOyXvuR7bkOQIWS4HgLyMnwhBs5o2UNvaBOORUUUej6N7C4Yzumj
+bbSHKhb7Sw0eukh47Ojn/utVyEDb7DWYqt+fK398r/OszgQpKd0M5e8Rml8wEv3W
+6v/6GSFzctj5DmgQMvtHkwmOHfkdyjFUQkq61cdes3y0hO8wpNM4Jy9NfvFudKto
+5mv/AhMCzv8ZtyMuvpjtCcnr5jR6G5jpVbOnaMT12mF8M1pdcBWS8rg/PzDSVdfp
+wuwwICx8lcu0GWQYTWR2+DVgH2hebKgY
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wsso.vscht.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wsso.vscht.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University of Chemistry and Technology Prague</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">Vysoká škola chemicko-technologická Praze</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University of Chemistry and Technology Prague</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">Vysoká škola chemicko-technologická Praze</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.vscht.cz/?jazyk=en</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://www.vscht.cz/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Antonin</md:GivenName>
+ <md:SurName>Mares</md:SurName>
+ <md:EmailAddress>antonin.mares@vscht.cz</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml
index 42be4c07..ceacee0f 100644
--- a/swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml
@@ -75,6 +75,13 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AttributeConsumingService index="1">
+ <ServiceName xml:lang="en">ARCHER SAFE</ServiceName>
+ <ServiceDescription xml:lang="en">SAFE service administration for ARCHER</ServiceDescription>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <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"/>
+ </AttributeConsumingService>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
diff --git a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
index a600fdd1..e600557e 100644
--- a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
@@ -8,6 +8,7 @@
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
</saml:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
@@ -17,7 +18,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="de">CLARIN-PL Repository</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">CLARIN-PL repository</mdui:DisplayName>
- <mdui:Description xml:lang="de">CLARIN-PL digitale Langzeitarchiv - Polnisch Abschnitt CLARIN ERIC</mdui:Description>
+ <mdui:Description xml:lang="de">CLARIN-PL digitales Langzeitarchiv - Polnische Sektion des CLARIN ERIC</mdui:Description>
<mdui:Description xml:lang="en">CLARIN-PL digital repository - Polish section of CLARIN ERIC</mdui:Description>
<mdui:Logo height="32" width="32">https://clarin-pl.eu/dspace/themes/ClarinPlHomeTheme/images/favicon.ico</mdui:Logo>
<mdui:InformationURL xml:lang="en">http://clarin-pl.eu/en/</mdui:InformationURL>
@@ -65,7 +66,7 @@ SvKPZd5tNDWO1hE00kzKJDPhhJZs1wFS7Tf3SJ1M1D8=
<md:AttributeConsumingService index="1">
<md:ServiceName xml:lang="de">CLARIN-PL Repository</md:ServiceName>
<md:ServiceName xml:lang="en">CLARIN-PL repository</md:ServiceName>
- <md:ServiceDescription xml:lang="de">CLARIN-PL digitale Langzeitarchiv - Polnisch Abschnitt CLARIN ERIC</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="de">CLARIN-PL digitales Langzeitarchiv - Polnische Sektion des CLARIN ERIC</md:ServiceDescription>
<md:ServiceDescription xml:lang="en">CLARIN-PL digital repository - Polish section of CLARIN ERIC</md:ServiceDescription>
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
diff --git a/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
index c898ed2f..242a7b49 100644
--- a/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
@@ -3,10 +3,9 @@
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
<mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
- <mdrpi:RegistrationPolicy xml:lang="et">http://taat.edu.ee/main/dokumendid</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
</md:Extensions>
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -34,7 +33,8 @@
<md:OrganizationURL xml:lang="en">http://www.eenet.ee/EENet/EENet_en</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Administrator</md:SurName>
- <md:EmailAddress>laas@eenet.ee</md:EmailAddress>
+ <md:GivenName>TAAT</md:GivenName>
+ <md:SurName>Operations</md:SurName>
+ <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..340a0135
--- /dev/null
+++ b/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.eki.ee/simplesamlphp/saml2/idp/metadata.php">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEATCCAumgAwIBAgIJAI3wX7QGR8zIMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYDVQQGEwJFRTERMA8GA1UECAwISGFyanVtYWExEDAOBgNVBAcMB1RhbGxpbm4xHjAcBgNVBAoMFUVlc3RpIGtlZWxlIGluc3RpdHV1dDELMAkGA1UECwwCSVQxEzARBgNVBAMMCnd3dy5la2kuZWUxIDAeBgkqhkiG9w0BCQEWEWhvc3RtYXN0ZXJAZWtpLmVlMB4XDTE1MTExNjA4NTIxOFoXDTI1MTExNTA4NTIxOFowgZYxCzAJBgNVBAYTAkVFMREwDwYDVQQIDAhIYXJqdW1hYTEQMA4GA1UEBwwHVGFsbGlubjEeMBwGA1UECgwVRWVzdGkga2VlbGUgaW5zdGl0dXV0MQswCQYDVQQLDAJJVDETMBEGA1UEAwwKd3d3LmVraS5lZTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckBla2kuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNFkW//HeZavdiSmGpYPuvegVRmJ//nH1s0O3uSw1x1zNpcAU2exr/G07GnkQp7eFdtbdL7L83o9b7zdXH0d3JfOH8sy9PbzVhXDG8BwDh1NPoqGFS2KVFNTlpKVmrL3AAkOZMBqrVPCaYIZ24SC4AF8IizT21JvGxR87gCS9gG35jcRyYef6I/J4Pm374w532/y05v0qVNqkR9hZbWI7KobX4J+gmhPf3mT3f+TA1W+F4oEcWxCKc8mvM8QB2PsK6Js5HK3geyRc6eVuUuP+ycvzsTAEmx3/lbzOrlkcC9YYCuN9C0s+rmQHuH6bVh+4sFnEJGlOATSD56tI122zRAgMBAAGjUDBOMB0GA1UdDgQWBBSEfr5fEP+UKF70EkqGBhFcSPffbjAfBgNVHSMEGDAWgBSEfr5fEP+UKF70EkqGBhFcSPffbjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCVBsuS6cB3LObsk+lfapZLPtr/3W+DNC3mUmvUxBEuYdgrdP/JfAUcxbVMcn9AN9WLxqD6gzlgwthfKMkgaubiBgsO3pZ7QN3Kd1uG6nOYEey+qh+dlgRCzsI+W+Jy+UPR/B6UcJGcKjpHJT3zUWGokgUAcNO9XSVpYnxcVLfkxFZ5jSp6Jt8/GZBpResHt24pXWeZDj6xqvOud9nG1TsVcsHX2wb6YQyqndh+5tJ0TVQ5IE3fnxWo7TR2WUV/NDqbIaVtHcd8nCD2BftQoajjxVz1b9snAbCh/MbUrT7QsgLdNTlVHmtCtrm9LZSrLJoFRP25qa9a60S1L8Yf2rHx</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>MIIEATCCAumgAwIBAgIJAI3wX7QGR8zIMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYDVQQGEwJFRTERMA8GA1UECAwISGFyanVtYWExEDAOBgNVBAcMB1RhbGxpbm4xHjAcBgNVBAoMFUVlc3RpIGtlZWxlIGluc3RpdHV1dDELMAkGA1UECwwCSVQxEzARBgNVBAMMCnd3dy5la2kuZWUxIDAeBgkqhkiG9w0BCQEWEWhvc3RtYXN0ZXJAZWtpLmVlMB4XDTE1MTExNjA4NTIxOFoXDTI1MTExNTA4NTIxOFowgZYxCzAJBgNVBAYTAkVFMREwDwYDVQQIDAhIYXJqdW1hYTEQMA4GA1UEBwwHVGFsbGlubjEeMBwGA1UECgwVRWVzdGkga2VlbGUgaW5zdGl0dXV0MQswCQYDVQQLDAJJVDETMBEGA1UEAwwKd3d3LmVraS5lZTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckBla2kuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNFkW//HeZavdiSmGpYPuvegVRmJ//nH1s0O3uSw1x1zNpcAU2exr/G07GnkQp7eFdtbdL7L83o9b7zdXH0d3JfOH8sy9PbzVhXDG8BwDh1NPoqGFS2KVFNTlpKVmrL3AAkOZMBqrVPCaYIZ24SC4AF8IizT21JvGxR87gCS9gG35jcRyYef6I/J4Pm374w532/y05v0qVNqkR9hZbWI7KobX4J+gmhPf3mT3f+TA1W+F4oEcWxCKc8mvM8QB2PsK6Js5HK3geyRc6eVuUuP+ycvzsTAEmx3/lbzOrlkcC9YYCuN9C0s+rmQHuH6bVh+4sFnEJGlOATSD56tI122zRAgMBAAGjUDBOMB0GA1UdDgQWBBSEfr5fEP+UKF70EkqGBhFcSPffbjAfBgNVHSMEGDAWgBSEfr5fEP+UKF70EkqGBhFcSPffbjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCVBsuS6cB3LObsk+lfapZLPtr/3W+DNC3mUmvUxBEuYdgrdP/JfAUcxbVMcn9AN9WLxqD6gzlgwthfKMkgaubiBgsO3pZ7QN3Kd1uG6nOYEey+qh+dlgRCzsI+W+Jy+UPR/B6UcJGcKjpHJT3zUWGokgUAcNO9XSVpYnxcVLfkxFZ5jSp6Jt8/GZBpResHt24pXWeZDj6xqvOud9nG1TsVcsHX2wb6YQyqndh+5tJ0TVQ5IE3fnxWo7TR2WUV/NDqbIaVtHcd8nCD2BftQoajjxVz1b9snAbCh/MbUrT7QsgLdNTlVHmtCtrm9LZSrLJoFRP25qa9a60S1L8Yf2rHx</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eki.ee/simplesamlphp/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://www.eki.ee/simplesamlphp/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="et">Eesti keele instituut</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Institute of the Estonian Language</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="et">Eesti keele instituut</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Institute of the Estonian Language</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="et">http://www.eki.ee</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.eki.ee</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>TAAT</md:GivenName>
+ <md:SurName>Operations</md:SurName>
+ <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml b/swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml
index e5e7f72f..6da565c3 100644
--- a/swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml
@@ -29,31 +29,29 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEoTCCA4mgAwIBAgIRAOQkbG3H7xylghDVHFZCEb4wDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMjExMTMwMDAwMDBaFw0xNTExMTMyMzU5NTlaMHwxCzAJBgNV
- BAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEQMA4GA1UEBxMHQ2hpbHRvbjEc
- MBoGA1UEChMTVGhlIEpOVCBBc3NvY2lhdGlvbjENMAsGA1UECxMESlZDUzEYMBYG
- A1UEAxMPd3d3Lmp2Y3MuamEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEArDwlmcEvi4O4XtwsJ2xcF28iRgGonGFbVIMTJ6UFHDlLhjJXBOZzEJxu
- FtzoxW2S83/qsJlmLVMwu/Zlf84+/H+SVK80JIkH49W8TvbjFPV84VjCCrRaKUSc
- PQTswIpSpJNFNaYQWIKyX/mZYu/HaT9lMHr19RumNNx1bHHJheLnxgoQngku9BKR
- cLDm5yu95+R6elbKA/Er6jtuQ96S0JnJAxxAojEqbM6tSHRcgJt5srmm3IAHhnAH
- XKXbkRSzsQlXto2oNVFkfmiMVEO2KK2+4f9j6COTXxcuqs0+UwfwNO7IDX8KROih
- 0jOYhSrkcSku0khqFwXgpA3IP4VyLQIDAQABo4IBYjCCAV4wHwYDVR0jBBgwFoAU
- DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFJPQAcWDAXWfuLg75mvRv3WS
- r3BmMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
- AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
- HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
- Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
- Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
- Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD3d3dy5qdmNzLmphLm5l
- dDANBgkqhkiG9w0BAQUFAAOCAQEAQ7H6wBrBIG3sl2tGThlycIwMhs+rQGfK3yA+
- Q6aqTbWvbyGotl2fw64fsgbrQVJmDIFxZO8/MbnFADD+j7NVpXYVN6ZLTcCuIUgL
- ErlHBCZzEf/ksSPit7BXOEh32I+IyI4oMexuE8UsF78p1i1KsM52KJ/aAEcp/cxo
- YgI87EEm4p90UjuMJVoH/Ln02RLoTOobzzIMWks1/+da8GrsMaL/JP5q//6/boZe
- lAW5NzjIVxak0+mkL9m/M3Ye7ciDPkI48KxUZ3/HU/vjuKpzlcrkZKZkiyqVh066
- l3iQ7f3NCuwCg4Tz4RGKYusa1ZjKWwicFd/KcwGv18osrZH7xQ==
+ MIIERjCCAy6gAwIBAgIJALrNeL2vzXUQMA0GCSqGSIb3DQEBCwUAMIGjMQswCQYD
+ VQQGEwJVSzEQMA4GA1UECBMHRW5nbGFuZDEQMA4GA1UEBxMHQnJpc3RvbDEWMBQG
+ A1UEChMNSmlzYyBTZXJ2aWNlczEaMBgGA1UECxMRSmlzYyBUZWNobm9sb2dpZXMx
+ GjAYBgNVBAMTEXZzY2VuZS5qaXNjLmFjLnVrMSAwHgYJKoZIhvcNAQkBFhF2c2Nl
+ bmVAamlzYy5hYy51azAeFw0xNTExMDMxNjMyNTFaFw0zNTEwMjkxNjMyNTFaMIGj
+ MQswCQYDVQQGEwJVSzEQMA4GA1UECBMHRW5nbGFuZDEQMA4GA1UEBxMHQnJpc3Rv
+ bDEWMBQGA1UEChMNSmlzYyBTZXJ2aWNlczEaMBgGA1UECxMRSmlzYyBUZWNobm9s
+ b2dpZXMxGjAYBgNVBAMTEXZzY2VuZS5qaXNjLmFjLnVrMSAwHgYJKoZIhvcNAQkB
+ FhF2c2NlbmVAamlzYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ ggEBAKHYHA0HVKuQM6QQP9JJzs7tpGi8eTQNgdMYrfG9NXU246aUl01R0HuZ+Su1
+ xduGGbvHZl6m++CKATfpZz7tt9fwJ6Y8AeldzuQLUZQBhq/wpPfcgL/67hjHqWLP
+ RIlKGtwBOkLwahAiijoCXwc0u+VyUj9CI/2jtycfHu7VFQvo6O8g5AOlW9sxR/6H
+ juBd7iDrcEiTXWef0CvQXG9JL23K7orN9Ox6NyIu8mDkBmUSY44VoYVkKWQMXsgQ
+ tmnUMdtmwom44QoHsBajYBGKxa0G8BkIS2grkY6lhbH7/1DD/abRQah1UsM/+Ihc
+ IIJnbUBMBf35N2eIU8hA6tCY7YcCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+ hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+ FG3/iS8iRCNI4bCuX1P3mLDWIlC3MB8GA1UdIwQYMBaAFG3/iS8iRCNI4bCuX1P3
+ mLDWIlC3MA0GCSqGSIb3DQEBCwUAA4IBAQBCUENyYiELCOaELvQF8s0YpZXbBMpe
+ T9Tb/GLhxJvjR25G0o4j177aRvMUPP12FbtHafL4LtETzuKvhDP5Xgy86XwnR7mh
+ /dk0JYirItS+zH11avaVGY8ZbzY2al1SEQNA/sQtBywnc8j5YYS9t9QmapaXk85t
+ bXiZRuzrAT/U2VDjMGba6FlFeAqowGqWnt2vcrOi0hdpjqh07yy/W7oszgwx84t+
+ LXX3Kfg5yiOFW+WsmdkZMCfAPJzrAq6rAg1JoyVC3v7Jk6CHNr5VnQPcNL+TaN9l
+ FIL5YwZINvpuWpxQUrsAfi47Yi6YfPNy9Yu7rVhl9GpNX8VaZYu6q7bM
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml b/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
index 1e863891..f6881106 100644
--- a/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
+++ b/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
@@ -52,6 +52,6 @@
</md:SPSSODescriptor>
<md:ContactPerson contactType="technical">
<md:GivenName>Administrator</md:GivenName>
- <md:EmailAddress>netdrift@deic.dk</md:EmailAddress>
+ <md:EmailAddress>mailto:netdrift@deic.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml b/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
index dacb05bb..ea03551d 100644
--- a/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
+++ b/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
@@ -18,7 +18,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="de">Meertens Institut</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
- <mdui:Description xml:lang="de">Dieser Service Provider regelt den Zugang zu den Meertens Institut Archive und ausgewählte Dienstleistungen für Geisteswissenschaften Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur..</mdui:Description>
+ <mdui:Description xml:lang="de">Dieser Service Provider regelt den Zugang zum Meertens Institut Archive und ausgewählten Dienstleistungen für geisteswissenschaftliche Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur.</mdui:Description>
<mdui:Description xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture.</mdui:Description>
<mdui:Logo height="135" width="200">http://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
<mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
@@ -85,10 +85,10 @@ SF7hTs3mZvR2FPh5VJ0vBUC7QOXB5RBcP6vy4H25WiovevzKOg==
<md:AttributeConsumingService index="1">
<md:ServiceName xml:lang="de">Meertens Institut</md:ServiceName>
<md:ServiceName xml:lang="en">Meertens Institute</md:ServiceName>
- <md:ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zu den Meertens Institut Archive und ausgewählte Dienstleistungen für Geisteswissenschaften Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur..</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zum Meertens Institut Archive und ausgewählten Dienstleistungen für geisteswissenschaftliche Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur.</md:ServiceDescription>
<md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture.</md:ServiceDescription>
- <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml b/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
new file mode 100644
index 00000000..e0ae287c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nederlab.nl/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-09T19:24:43Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol 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://www.nederlab.nl/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">Meertens Institut</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</mdui:Description>
+ <mdui:Description xml:lang="en">This Service Provider regulates access to the Nederlab research environment</mdui:Description>
+ <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>www.nederlab.nl</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>emailAddress=servicedesk@knaw.nl,CN=www.nederlab.nl,OU=I&amp;A,O=Meertens,L=Amsterdam,ST=Noord Holland,C=NL</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGBTCCA+2gAwIBAgIJAIGzep3p2hjqMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
+VQQGEwJOTDEWMBQGA1UECAwNTm9vcmQgSG9sbGFuZDESMBAGA1UEBwwJQW1zdGVy
+ZGFtMREwDwYDVQQKDAhNZWVydGVuczEMMAoGA1UECwwDSSZBMRgwFgYDVQQDDA93
+d3cubmVkZXJsYWIubmwxIjAgBgkqhkiG9w0BCQEWE3NlcnZpY2VkZXNrQGtuYXcu
+bmwwHhcNMTQwNzE3MTIxMDUzWhcNMjQwNzE0MTIxMDUzWjCBmDELMAkGA1UEBhMC
+TkwxFjAUBgNVBAgMDU5vb3JkIEhvbGxhbmQxEjAQBgNVBAcMCUFtc3RlcmRhbTER
+MA8GA1UECgwITWVlcnRlbnMxDDAKBgNVBAsMA0kmQTEYMBYGA1UEAwwPd3d3Lm5l
+ZGVybGFiLm5sMSIwIAYJKoZIhvcNAQkBFhNzZXJ2aWNlZGVza0BrbmF3Lm5sMIIC
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA23RweYXXwA9mGVNYCpfxOOMc
+HGsGjCB/rdCHJ9REW3fmdmKn3Rtm9jxI3W/3AneMuE4s+QUog3ec2+iHuOvSYFZx
+SNybqaqZMSTB2IddNPoQiaWV/NNQXC8Cl/BBdCal3TM82R6HgfL3cSFcbq9JPIrh
+TeRfU9QhO7guGKooZGd/emC5GgM4iXowI+UenTHcPVj2eEpCEvigOzBYxY9S9u2n
+yV26sROTLKRTu8q+uZ92YmDbL07oqhmVX7LAjanO/0PcG6Cvhv5m57vyEt4Cwzsf
+mqBswSQSPBSUXRCOeRXh6dvU2Zg2+9+gS4D1VjWDRuSjibQV5BvvbtRe6aVm4TC6
+llySlKw/+WQHKiJF6JgLK8vCg8PWlVPRDskCMEa1z/uwdN4aIb43xsyu6RzzDti5
+Qjgiy3dMK7ARrIKoByF289lw9PR2w6/YGiefgzdp5DVSM6XSax6+4MnpQhd9FrnI
+aW16bvErETJIV8folcTivazGf6pA9/5esJCzZjr4cxAkC22HysNsVHVZpdp+6oqG
+ObeOQ9YflT/0Mp3jZbzANAXHADZCLmqO0pqb8xC5gpd1ITvIWIndgy8M2BWz+QtE
+FVK4Vf/ynjaOp6e+ZFrszdne/d8VRRpUnFpDOHsGsi6uuT/3N13WjQmEYNxOfCST
+IkIAwi8mVQbhD5ARy48CAwEAAaNQME4wHQYDVR0OBBYEFPU7oll5Mreed7gM0ubx
+wNxhJWb9MB8GA1UdIwQYMBaAFPU7oll5Mreed7gM0ubxwNxhJWb9MAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggIBACaAhHAW5xNKt9bjOBk3Sr5Tj0x5puRo
+zg+B5RgNQiWR8PIBMCgn1RPGHKXHKbNP4M6b/MWXsmo5VBBcv4ofZW2jlwnonu0b
+aKHNpxhV4xbF1oYicGHN25Uw/VbJFljCHOGy2k+UFpSHAOm0kp67wYo/4p7yy4oq
+5twu1tPDlURwlOcjA8g/2m1ym2j3pNLcyKKWhvzUzUvq4SM3IHZ8RR0OLwBBim7k
+AW6/jydmTX8/EVgFnwh1gkWm5w01ok+5Zy+NhMeqpFixL848pLmOdh8L7r4RYbmD
+8iQKrBgI8dpVTtZLgkEfh3IsDB9vwwyEqkdRXTwLLxCnjyEapp1s13mTjo86Fx6j
+L0V2bWOEZiQqFObmI1GJOqCwx9Fiot5zyUpZ9cTTOufwo5dsL4SLpuDPXCOcgZ7P
+Zn7P9mTNyK5bm454f/Y4lYVZyOLp0hUVrKkXSdOPap2QqO5Hcui6wvCMENKaZrP4
+VckqI0UohXM40SjP5Q9f6od6NevvBBg2R/7amAkXXm/MtGEpYtauZZp/XvBWEw3U
+anLI4k0jYr3bxxk2d325UpxVKnKp+vaIRli99xYLLroaiolrj8k981I4u1gBoEGD
+728wR2l94IA0c+LxNkOwwv4cwsnqO6QKeENxz/eN6RXVcrO1U7ZS2qVvKgQ9sORu
+7Hwjg9MqBq4i
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Artifact"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="de">Meertens Institut</md:ServiceName>
+ <md:ServiceName xml:lang="en">Meertens Institute</md:ServiceName>
+ <md:ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Nederlab research environment</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>KNAW</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Marc</md:GivenName>
+ <md:SurName>Kemps-Snijders</md:SurName>
+ <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Marc</md:GivenName>
+ <md:SurName>Kemps-Snijders</md:SurName>
+ <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml b/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
index 5dd5f671..5c77a4c7 100644
--- a/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.openaccessrepository.it/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.openaccessrepository.it/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-10T08:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..9a622a3b
--- /dev/null
+++ b/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.openaire.eu/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">OpenAire 2020</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="el">OpenAire 2020</mdui:DisplayName>
+ <mdui:Description xml:lang="en">OpenAIRE2020 is a funded project to develop and maintain the infrastructure to support the European Commission OA policy</mdui:Description>
+ <mdui:Description xml:lang="el">Το OpenAIRE2020 είναι ένα Ευρωπαικό έργο το οποίο αποσκοπεί στην ανάπτυξη λογισμικού και τη συντήρηση της απαραίτητης τεχνικής υποδομής για την προώθηση της Ευρωπαικής Πολιτικής για Ανοιχτή Πρόσβαση σε Ακαδημαικά Δεδομένα</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://www.openaire.eu/project-factsheets</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="el">https://www.openaire.eu/openaire-report-gr</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.openaire.eu/141-privacy-policy/813-edu-privacy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="el">https://www.openaire.eu/privacy-gr</mdui:PrivacyStatementURL>
+ <mdui:Logo width="123" height="175" xml:lang="en">https://www.openaire.eu/images/site_images/OpenAIREplus_logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIFUTCCBDmgAwIBAgIRAOI4+i/NU1yBszGKO9QqiSkwDQYJKoZIhvcNAQELBQAwgZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYDVQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwOTE2MDAwMDAwWhcNMTYxMDE1MjM1OTU5WjBbMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHjAcBgNVBAsTFUVzc2VudGlhbFNTTCBXaWxkY2FyZDEWMBQGA1UEAxQNKi5vcGVuYWlyZS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQZ9AqARIbXLmpZ5f9OYJoMGQlizdXajD2g9vSrHZzp7nnS0yLXp37MQ+H24lsPnMaRzb8fJBs4mlDYP6vXccOM8F2qC/2cd5twtubx+fnKz+OXRnZlkAXFuSLMl3mLVOfaTFpOpDVaoIWXEYvbh4z/FFX7ZOq4goDz+DaLIr7RnPHq6yBhdzzTMxo1Yg+88fFgnLEk5mOxbxxcFtrR45iTL8j83hlI1UM4vjgNw8eRzEvngXGTUwNJDv4lH6dOYo8CjKZDcf/baBrbnUt3vTHeOiYCpRCI1oLv+6iHUQcDrHJFxr+PAYBJwFWmJupcHPSZDOAXzjBSI1zwb09XkmsCAwEAAaOCAdgwggHUMB8GA1UdIwQYMBaAFJCvajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1UdDgQWBBQbUT6dzoGkAENWoTkT234i0FD46jAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYDVR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCUGA1UdEQQeMByCDSoub3BlbmFpcmUuZXWCC29wZW5haXJlLmV1MA0GCSqGSIb3DQEBCwUAA4IBAQBYUgkbuEwiFyu2a5Rqc8i1ZWq9GN3GF8vzICEHL222My9zPT+HDBV01VSajaBxj2v4UtfRYNjCcMtfrL0vKzm0WEqfMC7eiDmuYHcOeHN6OPvnDdqMYWp03bev9CkkP9ygguEnM11/iN4YEc7TD4GmIR6qLHG/zzwBzhfz46Q5VSEO+D20mys+83Wl6U3AJIIX7+OpeCYAag1kZOIOsiG9RXooVBOIqbnF06m0nAeuNMt47TAURRF3jARKhMelHEv1pGD0UUNS6DSEUpKdBHnTBaVFQwGlQ9sUE8Fy8rP3dGpT9Fq2aF601Mq40oJsYw3Xf0i55oy15ktDyI8TU6NN</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>MIIFUTCCBDmgAwIBAgIRAOI4+i/NU1yBszGKO9QqiSkwDQYJKoZIhvcNAQELBQAwgZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYDVQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwOTE2MDAwMDAwWhcNMTYxMDE1MjM1OTU5WjBbMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHjAcBgNVBAsTFUVzc2VudGlhbFNTTCBXaWxkY2FyZDEWMBQGA1UEAxQNKi5vcGVuYWlyZS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQZ9AqARIbXLmpZ5f9OYJoMGQlizdXajD2g9vSrHZzp7nnS0yLXp37MQ+H24lsPnMaRzb8fJBs4mlDYP6vXccOM8F2qC/2cd5twtubx+fnKz+OXRnZlkAXFuSLMl3mLVOfaTFpOpDVaoIWXEYvbh4z/FFX7ZOq4goDz+DaLIr7RnPHq6yBhdzzTMxo1Yg+88fFgnLEk5mOxbxxcFtrR45iTL8j83hlI1UM4vjgNw8eRzEvngXGTUwNJDv4lH6dOYo8CjKZDcf/baBrbnUt3vTHeOiYCpRCI1oLv+6iHUQcDrHJFxr+PAYBJwFWmJupcHPSZDOAXzjBSI1zwb09XkmsCAwEAAaOCAdgwggHUMB8GA1UdIwQYMBaAFJCvajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1UdDgQWBBQbUT6dzoGkAENWoTkT234i0FD46jAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYDVR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCUGA1UdEQQeMByCDSoub3BlbmFpcmUuZXWCC29wZW5haXJlLmV1MA0GCSqGSIb3DQEBCwUAA4IBAQBYUgkbuEwiFyu2a5Rqc8i1ZWq9GN3GF8vzICEHL222My9zPT+HDBV01VSajaBxj2v4UtfRYNjCcMtfrL0vKzm0WEqfMC7eiDmuYHcOeHN6OPvnDdqMYWp03bev9CkkP9ygguEnM11/iN4YEc7TD4GmIR6qLHG/zzwBzhfz46Q5VSEO+D20mys+83Wl6U3AJIIX7+OpeCYAag1kZOIOsiG9RXooVBOIqbnF06m0nAeuNMt47TAURRF3jARKhMelHEv1pGD0UUNS6DSEUpKdBHnTBaVFQwGlQ9sUE8Fy8rP3dGpT9Fq2aF601Mq40oJsYw3Xf0i55oy15ktDyI8TU6NN</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.openaire.eu/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://www.openaire.eu/simplesaml/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://www.openaire.eu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">OpenAire2020</md:ServiceName>
+ <md:ServiceName xml:lang="el">OpenAire2020</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">OpenAIRE2020 is a project aiming to develop and maintain the infrastructure to support the European Commission OA policy</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="el">Το OpenAIRE2020 είναι ένα Ευρωπαικό έργο το οποίο αποσκοπεί στην ανάπτυξη λογισμικού και τη συντήρηση της απαραίτητης τεχνικής υποδομής για την προώθηση της Ευρωπαικής Πολιτικής για Ανοιχτή Πρόσβαση σε Ακαδημαικά Δεδομένα</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Athena- Research and Innovation Center in Information, Communication and Knowledge Technologies</md:OrganizationName>
+ <md:OrganizationName xml:lang="el">Αθηνά-Ερευνητικό Κέντρο Καινοτομίας στις Τεχνολογίες της Πληροφορίας, των Επικοινωνιών και της Γνώσης</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Athena Research Center</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="el">Ερευνητικό Κέντρο Αθηνά</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.athena-innovation.gr/en.html</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="el">http://www.athena-innovation.gr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:Company>Athena Research Center</md:Company>
+ <md:GivenName>Eri</md:GivenName>
+ <md:SurName>Katsari</md:SurName>
+ <md:EmailAddress>gkatsari@di.uoa.gr</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>Athena Research Center</md:Company>
+ <md:GivenName>Katerina</md:GivenName>
+ <md:SurName>Iatropoulou</md:SurName>
+ <md:EmailAddress>kiatrop@di.uoa.gr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml b/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml
index f52d186d..0ee929a3 100644
--- a/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml
@@ -38,38 +38,38 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIFzjCCA7YCCQCicdy6qcU4XDANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
+ MIIF7zCCA9cCCQCicdy6qcU4ZDANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
VVMxCzAJBgNVBAgMAklMMRAwDgYDVQQHDAdDaGljYWdvMSAwHgYDVQQKDBdPcGVu
IFNjaWVuY2UgRGF0YSBDbG91ZDEqMCgGA1UECwwhTGFib3JhdG9yeSBmb3IgQWR2
YW5jZWQgQ29tcHV0aW5nMSUwIwYDVQQDDBxjYS5vcGVuc2NpZW5jZWRhdGFjbG91
- ZC5vcmcgMB4XDTE0MDQxMDE5MTkzNFoXDTE3MDEwNDE5MTkzNFowga8xCzAJBgNV
- BAYTAlVTMQswCQYDVQQIDAJJTDEQMA4GA1UEBwwHQ2hpY2FnbzEdMBsGA1UECgwU
- T3BlblNjaWVuY2VEYXRhQ2xvdWQxDDAKBgNVBAsMA0xBQzElMCMGA1UEAwwcd3d3
- Lm9wZW5zY2llbmNlZGF0YWNsb3VkLm9yZzEtMCsGCSqGSIb3DQEJARYeYWRtaW5A
- b3BlbnNjaWVuY2VkYXRhY2xvdWQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
- MIICCgKCAgEAodVxMyIqjyYoqmT2ZknJSL8/DejA1HRYGZQGIwCh10mrE+s6Vf5x
- 3ydeoR7sjEnMHjxa3UFXeD8K/LRSKGZkIJJhXUiwNCBAWgg4T27WtiCvdLYYyrN4
- hGmwvi9V2/ddhcRP92B8MNrK0RhpLhWWpZ7t5uakp0EZi5YUqvIBLdB9Fefg1zGw
- FgcQvhQPMXxeCF6cU+VcKA+DWpQ8hO3TQHxdjtJAiZhb7WfufHMJp7Xtx3tYS+so
- UFk0zSau/NBabk0bWmJ1D6ugjLC7HvjrNN2d6vU8I5Fob3fkNa1O3HruTavm1FpV
- ktrQgdz8xK+HrkZmR+G3bxHXpo/jqoiuzb7Xq1z7Xiv/EXcMK78ym0+lLPYeCAXL
- CKDpnZebgGkljd4tSyh1yRhCaQ4oa4S9T8hL0MVb3J+9Ofk8KfC0QJ0JXoNUZ+3m
- ZbnI04ZopEWEB9XYFPOBSX9XSVWdOE1ABeeMuc8X/pIeXlVlNll02v10Yp8iA+Y8
- YHaOe8aabFUJ40VaI32hDEBz9foCdwL7Xz60udKFRp1fVRiyCmFAOBkimwOAC8CL
- 0yCE8ruURYCLkC3jQkQDORK1syRB1zh84jQPpon17R5CJ5l0YsvV5L6RSK/Q61m5
- omTO0pLrXkJj+w9+tppSEOHKKjRTpYO/KHqK9rW/Ew3OLSDGq49uIX0CAwEAATAN
- BgkqhkiG9w0BAQUFAAOCAgEAtw/aDtRhxKp826bD1q3vGO3wQOcXCDzZu2ijHQAE
- LYmLVGWinizo2sJEGTs0INwJ01M0Y/OQrnkNf9RQs+ouwRFU3VL5YHL9wVselo62
- wLKlqI9k2QEFREbUWSGPg/6ktp+fQz/XY4FdPx+wJ0zWPOardNMs77jXWwlnkVfM
- LQS3CTuYxlPITTF0eceARwptCscnYo8g7+wVXPa2f1pnqGh1DPjUchVCaHtW5Pz0
- ZOyQUYYQu+WQ7/7MIlEqCherfDcXLJrF/Wv80Fe/Zo3dSNOc2FIQiKrrwsA4bQrI
- BWVtMBT9IHIHaD7rsyps9IPJIQhUHILuGgRvWog/NBOFMuL9owCQmYIQG6vlSrLM
- oH3AyJDUMwR5/RDfFjvqmFuyuoLsMjr7Fz+1XDuVToZ5uL+S/qK+zXBDF4w1Knt6
- 4Ytqy45dZIYVIJ8nP5GD3WljcPOu5bAHQIXH+zysDG1lKW1F0KnPOI1lh30uTdT9
- NJJfXoMBlmLtdf/2ald3J32/SlaNax9POIZ5yQanYeKkOYxkiMUegYBdBLOIA+NP
- LZFDCh2ujwE/5X6w7SExIhPDYLcYa6AzAY2OfFxuIhmGvA6upfaKXNtxZnMCaKMA
- 3KLFMdyPSUD5vEEOjLDTxHnldmawa+nG4PcJFLyC57kZz4znZwZXGB3NryX7v5JE
- orI=
+ ZC5vcmcgMB4XDTE1MDkyMTIxMDgyM1oXDTIzMTIwODIxMDgyM1owgdAxCzAJBgNV
+ BAYTAlVTMQswCQYDVQQIDAJJTDEQMA4GA1UEBwwHQ2hpY2FnbzEqMCgGA1UECgwh
+ Q2VudGVyIGZvciBEYXRhIEludGVuc2l2ZSBTY2llbmNlMSAwHgYDVQQLDBdPcGVu
+ IFNjaWVuY2UgRGF0YSBDbG91ZDElMCMGA1UEAwwcd3d3Lm9wZW5zY2llbmNlZGF0
+ YWNsb3VkLm9yZzEtMCsGCSqGSIb3DQEJARYeYWRtaW5Ab3BlbnNjaWVuY2VkYXRh
+ Y2xvdWQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0tTPUHme
+ OLd4lMcKVeE212pW4ZS6zUpmnSUuGQx1cFilVUIAa7mvHwxQP3WeIwRHjy69AWRR
+ thNPHQf0So00uFYRqUSN1OXgi9MNi/NJF5GLiKhpOmYzRI8wyF7WFmlhV4KYISvX
+ ALDLdduuDCQ31Fc9MZAL0iJ9oWqSmv+ZBYuClIPdyccAfoKX+vWQf1naSfU7xfgz
+ w2h5/GEVnMQcKWVEGzLNAYnnLMcZMfGjH324OAq4cMoZCQ1MZVg9p3y3URfWfWmU
+ MUgB2UC8lK84Hb+FzIDD0EM/gZHa0eJhNipNHun/59ZlzqMHXf4ygF/P4s2xCDId
+ 6/6Irv5rtpr1dv+RA0evv+7FXDaPwDvx1Vn1DpE2PjEh3o8mO16zwIir7St9Xyh6
+ PRdcBFlxaNuHPRv7zG3n9V5Fdj3aH2WgKdesZ1qTQ68L18xR9qrtJeTIrxZjuiTr
+ bgR0YPFRA5lNACwYE14KNCeXbRqiMWOOPygQaY2Jgn6WFbLvyzguYTJmWkGR3RzY
+ N15cFGgwc9uH5EYl+amtb5M5z+3Vk0HynBMzY5JAzuN7LX6D8dLJHk5cHuOK+9Sy
+ k56LSa6+2jXI59XMXxcMad5zx9RAZEeKii+LfPyZkd0RH+voZx5IG11sxHhoNEBf
+ fNJRtnM7LhGuFjzm2Epw7nwa+wgjbspUUnkCAwEAATANBgkqhkiG9w0BAQUFAAOC
+ AgEAZP/VuAyNTjAF1o5fKGwuUy90WHB0WXlp0SiTfrrK66C0fc2koZjzY089a7GF
+ SZAqPM/pTQThTsAHpietOnTcetigoUDja+Jw5247iXfEUrRCwK04urIudpU9bCnF
+ BS7QSPz4ZRNjQv9LwkGvOU9TkOw9/hfnIIx4aDXGUH7I9wJ9aX7fnuTz94fRLV6u
+ zsFRSC/zNC842bHcAs9sZDXldF+nbwJQNdRXKB/uRI4FcBQLGV8k5u+i6c7/MSd3
+ kAfdTghk9GMMD1ck9eOX7EYbTnLVWNmiFGOFM6JPCIrLcraQo7b2qhw/uSEAuPAA
+ 79IoyWuYLSichK/fGWtUCjzinosculG/jteXsA+CEmcqYNyC4WXayIocFPjBQV+/
+ p7nJMRNbDB0XiAMGCaGGH/sFmuuwgz21pP6rwwV++XdPthLijx0IJRa13pnt3HEo
+ PZtme1tQD9F12h71hYcqyft6Yx2z/WjRL4eC+Pi5TsoKfmzeVoryhIw48+5tmTea
+ 2DXQ0kYoJCDg5MQ96rv9Pq0OZe9j94oWe91PDuGt9VB4eTlbBt2WiMe+7XDXpOJ2
+ 8FqqDNY7Ln1LMtV3f5mKjt+lEUkjOr9rcRbFnPx7eLTRRI3C58jBFUxQYcG6zbSo
+ iYBbqea72Trn3z2jrytiIM2RYNoL7aS2eqfyIwEr9Q6cuDA=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/www.ordbogen.com.xml b/swamid-interfederations-2.0/www.ordbogen.com.xml
index db7a8295..3fa5a3e5 100644
--- a/swamid-interfederations-2.0/www.ordbogen.com.xml
+++ b/swamid-interfederations-2.0/www.ordbogen.com.xml
@@ -29,6 +29,7 @@
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ordbogen.com//singlesignon/simplesamlphp/saml2/sp/SingleLogoutService.php"/>
<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://www.ordbogen.com//singlesignon/simplesamlphp/saml2/sp/AssertionConsumerService.php" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lemma.com/wayf/response/login" index="1"/>
<md:AttributeConsumingService index="1" isDefault="true">
<md:ServiceName xml:lang="da">Ordbogen.com</md:ServiceName>
<md:ServiceName xml:lang="en">Ordbogen.com</md:ServiceName>
diff --git a/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml
index b25fb3e2..bf792b1d 100644
--- a/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml
@@ -1,13 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.pi-navigator.com/shibboleth/metadata">
<!--
- This is an OpenAthensSP 1.3 'PI Navigator' SP for Perfect Information Ltd.
+ This is a 'PI Navigator' Shibboleth SP for Perfect Information Ltd.
-->
<Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-11T10:34:29Z"/>
</Extensions>
- <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.pi-navigator.com/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.pi-navigator.com/Shibboleth.sso/Login" index="1"/>
+ </Extensions>
+ <KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
@@ -41,9 +61,27 @@
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pi-navigator.com/shibboleth/AuthReceiver.aspx" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.pi-navigator.com/shibboleth/AuthReceiver.aspx" index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pi-navigator.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML/Artifact" index="6"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Perfect Information Ltd</OrganizationName>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml
new file mode 100644
index 00000000..53681b71
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/bscidp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </md:Extensions>
+ <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">BSC - Barcelona Supercomputing Center</mdui:DisplayName>
+ <mdui:Description xml:lang="en">The Identity Provider of Barcelona Supercomputing Center</mdui:Description>
+ </mdui:UIInfo>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsc.es</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
+c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
+DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/bsc/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/bsc/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/bsc/shib13/idp/SSOService.php"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/bsc/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/bsc/shib13/idp/aa.php"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">BSC</md:OrganizationName>
+ <md:OrganizationName xml:lang="es">BSC</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Barcelona Supercomputing Center</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="es">Barcelona Supercomputing Center</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>SIR helpdesk</md:GivenName>
+ <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml
new file mode 100644
index 00000000..3107b7c2
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/crgidp">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-02-20T15:43:00Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crg.es</shibmd:Scope>
+ </md:Extensions>
+ <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crg.es</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNpci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaGoSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiEvzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5hUrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbuIgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5yZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7iPHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVFc8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cbDC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/crg/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/crg/saml2/idp/SingleLogoutService.php"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/crg/shib13/idp/SSOService.php"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/crg/saml2/idp/SSOService.php"/>
+ </md:IDPSSODescriptor>
+ <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/crg/shib13/idp/aa.php"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Centre for Genomic Regulation</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Centre for Genomic Regulation</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.crg.eu/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>José Manuel Macías</md:SurName>
+ <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml b/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml
index f433e82e..dc774e00 100644
--- a/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml
@@ -24,6 +24,7 @@
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/UKFederation"/>
<idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/UKFederation" index="1"/>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/Login"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml b/swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml
new file mode 100644
index 00000000..96c77677
--- /dev/null
+++ b/swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studentsales.com/shibboleth">
+ <!--
+ This is a "Student Sales" Shibboleth SP for Student Sales Limited.
+ -->
+ <Extensions>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-24T10:57:14Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.studentsales.com/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.studentsales.com/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Student Sales</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Global Platform for Student Discounts</mdui:Description>
+ <mdui:Logo height="64" width="64">https://www.studentsales.com/img/logos/ss-logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC9zCCAd+gAwIBAgIJAOmLHL1xUklsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+ BAMTEHN0dWRlbnRzYWxlcy5jb20wHhcNMTUxMTIwMDAxNjU1WhcNMjUxMTE3MDAx
+ NjU1WjAbMRkwFwYDVQQDExBzdHVkZW50c2FsZXMuY29tMIIBIjANBgkqhkiG9w0B
+ AQEFAAOCAQ8AMIIBCgKCAQEA70S80v6V31QEGYPuyrzqohqkaIp6WGfjJRbDvrtt
+ YF5NeVJB97kpiG4IguuMvkXCa1IR99IIBueUnWqgdcb+z3t5mLsScW2kZR/S2M4a
+ CgT2jN+md/sN8iQ1Sj7dp0h90ouHK1sL2qo2IDEeJYQyPhVupOjPj5HuYrCr5qWG
+ nFV8wXJvhX0thFnK2QnKr3i40wdDivFOksxrn5JcjV+x6SFae2yhVKLB+J2hHMC/
+ Wl4QUrho2BUMxfyoTMfkqYCHeLWTA2mK5uYzsveKTFmRyY/0sW6t4+beSEOWFDf8
+ 6PxdOsMbZ3OxEyo4V2n47e7ALXkDUByXb2gmY/l/68ycbQIDAQABoz4wPDAbBgNV
+ HREEFDASghBzdHVkZW50c2FsZXMuY29tMB0GA1UdDgQWBBTdv/6HZA/dTF7F0BVi
+ PKgnRRbVezANBgkqhkiG9w0BAQUFAAOCAQEA5EBVNeUA9ZvdOs5ufjCJYC7aEYvI
+ 8h7J4TWOTulH8WyG5MSn9x0bvPZrP862cvG7UhyRqPVZHAG//+lyQou9W4yN3XZD
+ KMy8L0vKOqlIerKU//xhznrMWYeRrjZvAqSDtOTxAr+++goE8F5HvzSgbrKwPUYG
+ ToXGcQ6BZoztcSH8SHbeLqbBT7O33u1uvJmLpy0/FBhSGa/T3Nv6NxAnyoK3/u3S
+ qOQR16hpXiNGbsbwdg5x/8OXwMYxW238zxIDRAlorgDPvyzQwJmkdbJ3JXAdli7Y
+ Quuv0pXFaKbFjyCOog/Ite+KJWonNI6tGPrpqMl9yd67mY0KrDeEiNOeXQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsales.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsales.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsales.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsales.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsales.com/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsales.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsales.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Student Sales Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Student Sales</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://www.studentsales.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Ali</GivenName>
+ <SurName>Onder</SurName>
+ <EmailAddress>mailto:ali@studentsales.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Ali</GivenName>
+ <SurName>Onder</SurName>
+ <EmailAddress>mailto:ali@studentsales.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sympa.org-shibboleth.xml b/swamid-interfederations-2.0/www.sympa.org-shibboleth.xml
new file mode 100644
index 00000000..e15d7b1b
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sympa.org-shibboleth.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sympa.org/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-01-21T14:53:29Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>https://federation.renater.fr/category/web</saml:AttributeValue>
+ <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Sympa.org - le site web</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="fr">https://www.sympa.org</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Sympa mailing list software website. The user manual can be edited by subscribers to sympa-users@listes.renater.fr</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Sympa.org - le site web</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Le wiki http://www.sympa.org est accessible aux contributeurs issus des universités. Les abonnés à sympa-fr@listes.renater.fr peuvent l'éditer.</mdui:Description>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.sympa.org/coco.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC6zCCAdOgAwIBAgIJAOHudP2hFB4CMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDHZlc3BhLmNydS5mcjAeFw0xNTEwMDgxMjQwNTJaFw0yNTEwMDUxMjQwNTJa
+MBcxFTATBgNVBAMTDHZlc3BhLmNydS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAO1tGvktL1ZEgQfLlUP1EIFIJuECoObOk+TLx5y3Rr7pEQDVpeEf
+YKMcqkjsvYKUDfUX9EwfjHh8e5kgVRQHi1Lr8lgC+e0VwUu4pRlxkwYLUd4o/nJh
+FLqTlddTwmR5vuQ9HVHUUqDPRrm7N+wf/J1D3v0/JRyEYbQaz/AY5GjawkXB+ioN
+Hguk6jaYC72W79fQlBem1KSy7TeQXvPsHp1RiYeTqPOWWrB/Fmc22nQrf69gVUNA
+es9/l3b0dv8Dr3qjFKsdK/jMdSJGN2HN7CqfTrBLC7c2e43ZuUGe1+UOqqMyNpYP
+/QThy0tubqQdSGOqc8LqJSp81yR5HsQhSs8CAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+dmVzcGEuY3J1LmZyMB0GA1UdDgQWBBQ9Qo9CfGWq0U/7Ouy8ChZr0vi+yDANBgkq
+hkiG9w0BAQUFAAOCAQEAKlKD1Nwj0vltOGgrmW0Q3bef8YDb3p9GSKtXEjrx8hSj
+YkHq77pE9Me8EMMKRa6/s/CX186El/dIu4o7SwNEn8alktut0tVwx/UujI7E9YtG
+HyIWBiI0QbiVz3xnU8q7oDa+2679yDZeiB1VEGM6fH8xePe/zysseNt38R+LZFaN
+W2Re4EiVyTm7cyC0db/eBPCPzd09FXdYFJiHuTOXfNB7Nwe+6QuIrNr59YXbISXi
+LB62PE5cL3gx719J0ga1Lze3M0QxvGi+gJibdoEne8np8EQUZ2ipdx+S2q6aFo0m
+BT0r1p+WzgcEohiQNP8sn1rNIh1JfKl3BIlXGFXLcg==
+ </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>
+ MIIC6zCCAdOgAwIBAgIJAOHudP2hFB4CMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDHZlc3BhLmNydS5mcjAeFw0xNTEwMDgxMjQwNTJaFw0yNTEwMDUxMjQwNTJa
+MBcxFTATBgNVBAMTDHZlc3BhLmNydS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAO1tGvktL1ZEgQfLlUP1EIFIJuECoObOk+TLx5y3Rr7pEQDVpeEf
+YKMcqkjsvYKUDfUX9EwfjHh8e5kgVRQHi1Lr8lgC+e0VwUu4pRlxkwYLUd4o/nJh
+FLqTlddTwmR5vuQ9HVHUUqDPRrm7N+wf/J1D3v0/JRyEYbQaz/AY5GjawkXB+ioN
+Hguk6jaYC72W79fQlBem1KSy7TeQXvPsHp1RiYeTqPOWWrB/Fmc22nQrf69gVUNA
+es9/l3b0dv8Dr3qjFKsdK/jMdSJGN2HN7CqfTrBLC7c2e43ZuUGe1+UOqqMyNpYP
+/QThy0tubqQdSGOqc8LqJSp81yR5HsQhSs8CAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+dmVzcGEuY3J1LmZyMB0GA1UdDgQWBBQ9Qo9CfGWq0U/7Ouy8ChZr0vi+yDANBgkq
+hkiG9w0BAQUFAAOCAQEAKlKD1Nwj0vltOGgrmW0Q3bef8YDb3p9GSKtXEjrx8hSj
+YkHq77pE9Me8EMMKRa6/s/CX186El/dIu4o7SwNEn8alktut0tVwx/UujI7E9YtG
+HyIWBiI0QbiVz3xnU8q7oDa+2679yDZeiB1VEGM6fH8xePe/zysseNt38R+LZFaN
+W2Re4EiVyTm7cyC0db/eBPCPzd09FXdYFJiHuTOXfNB7Nwe+6QuIrNr59YXbISXi
+LB62PE5cL3gx719J0ga1Lze3M0QxvGi+gJibdoEne8np8EQUZ2ipdx+S2q6aFo0m
+BT0r1p+WzgcEohiQNP8sn1rNIh1JfKl3BIlXGFXLcg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIICejCCAeOgAwIBAgIJAJnxdJGVfGAeMA0GCSqGSIb3DQEBBQUAMDMxCzAJBgNV
+BAYTAkZSMQwwCgYDVQQKEwNDUlUxFjAUBgNVBAMTDXd3dy5zeW1wYS5vcmcwHhcN
+MDgwMzIwMTQ0NTQ4WhcNMjgwMzE1MTQ0NTQ4WjAzMQswCQYDVQQGEwJGUjEMMAoG
+A1UEChMDQ1JVMRYwFAYDVQQDEw13d3cuc3ltcGEub3JnMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQChP31mNdgalD3PWJHh/P+O1KHVhRCLXOVXVMSg8VHI+0rR
+fX6Ajc2ux7WurpelXmo4nafAGEKoz5Y8m9Ph/Zgtb/PXQC3ydWvDD4DIPfKC2jhR
+aEbZSstXhU3pZY0lLgu7ZHe8RuWmuZT11RKCQXDu2IFBSGIg51TnJuUjSw0sYQID
+AQABo4GVMIGSMB0GA1UdDgQWBBQ295bivnTKDVtbzYASdob7fDrnUjBjBgNVHSME
+XDBagBQ295bivnTKDVtbzYASdob7fDrnUqE3pDUwMzELMAkGA1UEBhMCRlIxDDAK
+BgNVBAoTA0NSVTEWMBQGA1UEAxMNd3d3LnN5bXBhLm9yZ4IJAJnxdJGVfGAeMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAlB3jg+IyBkO45Wo61YE32N6O
+0+pVQaMGMf3jCwxRrM96dSJHj0NhTor3ZIsqzhRYZDRR67wJzk0D7QQCnOW90mlg
+d99p9wFKc5VN5aKrlDrU5guLjbl4avX/IEi1Sjj2eio6sKE/E5JsUs0ct3edtkXB
+QfGIdEliJJoWsN5ba6I=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sympa.org/Shibboleth.sso/SAML2/POST" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sympa.org/Shibboleth.sso/SAML/POST" index="4"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="fr">Sympa.org - le site web</md:ServiceName>
+ <md:ServiceDescription xml:lang="fr">Le wiki http://www.sympa.org est accessible aux contributeurs issus des universités. Les abonnés à sympa-fr@listes.renater.fr peuvent l'éditer.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">Sympa mailing list software website. The user manual can be edited by subscribers to sympa-users@listes.renater.fr</md:ServiceDescription>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>sympa-authors@listes.renater.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml b/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
index 1782aadc..acd93209 100644
--- a/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
@@ -222,6 +222,18 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/ECP" index="180"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ucsunion.org/Shibboleth.sso/SAML/POST" index="181"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ucsunion.org/Shibboleth.sso/SAML/Artifact" index="182"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/POST" index="183"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="184"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/Artifact" index="185"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/ECP" index="186"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML/POST" index="187"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML/Artifact" index="188"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/POST" index="189"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="190"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="191"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/ECP" index="192"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML/POST" index="193"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML/Artifact" index="194"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">NUS Services Limited</OrganizationName>
diff --git a/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml b/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
index f1a244ac..b08469d3 100644
--- a/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
@@ -220,6 +220,18 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="178"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="179"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="180"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="181"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="182"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="183"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="184"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="185"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="186"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="187"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="188"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="189"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="190"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="191"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="192"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">NUS Services Limited</OrganizationName>
diff --git a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
index 0c1ef938..27b7a4a5 100644
--- a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
@@ -33,16 +33,16 @@
<ds:KeyName>vportal.niif.hu</ds:KeyName>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
<md:NameIDFormat>undefined</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="5"/>
<md:AttributeConsumingService index="1" isDefault="true">
<md:ServiceName xml:lang="hu">Videotorium</md:ServiceName>
<md:ServiceName xml:lang="en">Videotorium</md:ServiceName>
diff --git a/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml
new file mode 100644
index 00000000..65828165
--- /dev/null
+++ b/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://yorksj.idm.oclc.org/shibboleth">
+ <!--
+ This is a "York St John University" EZproxy SP for OCLC (UK) Limited.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-08T10:21:53Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ </Extensions>
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
+ <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://login.yorksj.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEAjCCAuqgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMR4wHAYDVQQDFBUqLnlv
+ cmtzai5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSUw
+ IwYJKoZIhvcNAQkBFhZjYXJsLnByZW50aWNlQG9jbGMub3JnMB4XDTE1MTIwMzEy
+ MTczNFoXDTI1MTIwMjEyMTczNFowYzEeMBwGA1UEAxQVKi55b3Jrc2ouaWRtLm9j
+ bGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzElMCMGCSqGSIb3DQEJ
+ ARYWY2FybC5wcmVudGljZUBvY2xjLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ ADCCAQoCggEBAL+tfKrFFd1ymOHjZD7zJ7rQkv4lFreDEmN4D5lfsSj8erf41o9u
+ kG0l7AXh9UbI1LBg3v3jOOzCQg9C8PWZNs0vbQzw4mxaiSueFwH7GzhvgDujWeGx
+ PI+mdJZUvaZ52V7QXrSrpw+H1+ZIw5JwPpqBOU3BaMPWnQiXHGKltkdifUB3IEBb
+ bUlMhitpbpUh0qJQ4eBDSzlCn6kAaZPWfsagxOw0fwhcDPgsDGUyg2JmVUDbOKiR
+ LDyHy/NQ5SxliXHLchAE8GSyYjxiLgvMBgE23UM07r4fpjDdkJd3oKfZGP+Orn6/
+ nigLso1sDrentFJGFqeq5CmDHSPJR7HHUtUCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+ M+bNiK6Tcy3ZVKVsImZjdPHoUZgwgY0GA1UdIwSBhTCBgoAUM+bNiK6Tcy3ZVKVs
+ ImZjdPHoUZihZ6RlMGMxHjAcBgNVBAMUFSoueW9ya3NqLmlkbS5vY2xjLm9yZzEL
+ MAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxJTAjBgkqhkiG9w0BCQEWFmNhcmwu
+ cHJlbnRpY2VAb2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+ AAOCAQEAQvX5qoqjU9sj+AK3btvsmKTagxOQ7dTwWYm5+cwx1wmIf/5sZ67XxBB4
+ ui7ASYoxOb9sRrhyRnCpLt5PjfnFxNxX8RDwm2H/t6cFya/fNssw+GnvQZAgSZpR
+ 3L1HNTI6YbR4m6onKlLMXu3VrgqcA/g8bDhKq9JB5g4/3592j15GXiDFQ9JA788V
+ HZ+vwB/5IDoKQoji7ssjOsIWWlX43lMxUY6WvPacUbNafLpThg5+OdPRvDdUodYX
+ x8+iWhypU+0PMmbT7UrlG2+/uSRmRLNeaCoQVr+14W0xwHxhCJDmtj9b7zeOpo83
+ 0HjZ+GpyGsL30j9kUcEvOhsYYDPKvA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">York St John University Hosted EZProxy</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>OCLC UK Support Desk</GivenName>
+ <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>OCLC UK Support Desk</GivenName>
+ <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml
index 6f50e52c..f4b96fca 100644
--- a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml
+++ b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeroshell.irccs-stellamaris.it:12081/shibboleth">
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeroshell.irccs-stellamaris.it:12081/shibboleth">
<md:Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-06-04T10:00:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index e3dc6e85..579ac269 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -204,7 +204,6 @@
<xi:include href="swamid-2.0/mds2.nordu.net-shibboleth.xml"/>
<xi:include href="swamid-2.0/cdn.nordunet.tv-shibboleth.xml"/>
<xi:include href="swamid-2.0/gallus.scilifelab.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/play.mah.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/ni.nordu.net-saml2-metadata.xml"/>
<xi:include href="swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml"/>
<xi:include href="swamid-2.0/play.mdh.se-shibboleth.xml"/>
@@ -284,7 +283,6 @@
<xi:include href="swamid-2.0/tucana.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-2.0/registry.swamid.se-saml2-metadata.xml"/>
<xi:include href="swamid-2.0/its-utv03.ad.umu.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/wisumstage.its.umu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/data.kb.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/blender.c3se.chalmers.se-a.xml"/>
<xi:include href="swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt"/>
@@ -320,7 +318,6 @@
<xi:include href="swamid-2.0/play.umu.se.xml"/>
<xi:include href="swamid-2.0/play.kth.se-external-kaltura.com.xml"/>
<xi:include href="swamid-2.0/acount-utv.hh.se-Shibboleth.xml"/>
- <xi:include href="swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml"/>
<xi:include href="swamid-2.0/www.ar.ladok.se-gui-sp.xml"/>
<xi:include href="swamid-2.0/kib-shib.hosted.exlibrisgroup.com-shib.xml"/>
@@ -469,4 +466,22 @@
<xi:include href="swamid-2.0/lubas-test.srv.lu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/ubas-test.srv.lu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/secure.port.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/ubas.lu.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+ <xi:include href="swamid-2.0/emrex.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/play.mah.se.xml"/>
+ <xi:include href="swamid-2.0/ludicris.lub.lu.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/ac-w01.nordu.net-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/hobel.c3se.chalmers.se.xml"/>
+ <xi:include href="swamid-2.0/uraccess.net-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/ludwig.lub.lu.se-sp.xml"/>
+ <xi:include href="swamid-2.0/vartuppdrag.se.xml"/>
+ <xi:include href="swamid-2.0/account.hs.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml"/>
+ <xi:include href="swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index cb168875..b15f49f3 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -47,4 +47,6 @@
<xi:include href="swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp.fhs.se-swamid.xml"/>
+ <xi:include href="swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml"/>
</EntitiesDescriptor>
diff --git a/xslt/normalize.xsl b/xslt/normalize.xsl
index 9ac9cc61..f48f4877 100644
--- a/xslt/normalize.xsl
+++ b/xslt/normalize.xsl
@@ -41,6 +41,9 @@ If You do not accept these Terms, then You must not continue to use this Metadat
</xsl:if>
<xsl:apply-templates/>
</md:EntitiesDescriptor>
+ <xsl:if test="$target='true'">
+ <md:Extensions><xsl:call-template name="add-swamid-pi"/></md:Extensions>
+ </xsl:if>
</xsl:template>
<xsl:template match="md:EntityDescriptor">
@@ -62,7 +65,7 @@ If You do not accept these Terms, then You must not continue to use this Metadat
<md:EntityDescriptor>
<xsl:apply-templates select="@*"/>
<xsl:if test="$rpi='true' and not(md:Extensions)">
- <md:Extensions><xsl:call-template name="add-swamid-rpi"/></md:Extensions>
+ <md:Extensions><xsl:call-template name="add-swamid-ri"/></md:Extensions>
</xsl:if>
<xsl:apply-templates select="text()|comment()|md:Extensions|md:RoleDescriptor|md:IDPSSODescriptor|md:SPSSODescriptor|md:AuthnAuthorityDescriptor|md:AttributeAuthorityDescriptor|md:PDPDescriptor|md:AffiliationDescriptor"/>
<xsl:if test="$org='true' and not(md:Organization)">
@@ -79,12 +82,12 @@ If You do not accept these Terms, then You must not continue to use this Metadat
<xsl:template match="md:EntityDescriptor/md:Extensions">
<md:Extensions>
- <xsl:call-template name="add-swamid-rpi"/>
+ <xsl:call-template name="add-swamid-ri"/>
<xsl:apply-templates select="text()|comment()|node()"/>
</md:Extensions>
</xsl:template>
- <xsl:template name="add-swamid-rpi">
+ <xsl:template name="add-swamid-ri">
<xsl:if test="$rpi='true' and not(mdrpi:RegistrationInfo[@registrationAuthority='http://swamid.se/'])">
<mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
@@ -92,6 +95,14 @@ If You do not accept these Terms, then You must not continue to use this Metadat
</xsl:if>
</xsl:template>
+ <xsl:template name="add-swamid-pi">
+ <mdrpi:PublicationInfo>
+ <xsl:attribute Name="creationInstant"><xsl:value-of select="$now"/></xsl:attribute>
+ <xsl:attribute Name="publisher"><xsl:value-of select="$target"/></xsl:attribute>
+ <mdrpi:UsagePolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2015/12/SWAMID-Terms-of-Use-20110714.pdf</mdrpi:UsagePolicy>
+ </mdrpi:PublicationInfo>
+ </xsl:template>
+
<xsl:template match="@xml:base|@ID|@validUntil|@cacheDuration"/>
<xsl:template match="text()|comment()|@*">