summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0
diff options
context:
space:
mode:
Diffstat (limited to 'swamid-interfederations-2.0')
-rw-r--r--swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml56
-rw-r--r--swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml154
-rw-r--r--swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-idp-shibboleth.xml135
-rw-r--r--swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml107
-rw-r--r--swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aai.idiap.ch-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/aci-bookings.sisoshibboleth.co.uk-entity.xml87
-rw-r--r--swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml78
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml58
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml2
-rw-r--r--swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml2
-rw-r--r--swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml66
-rw-r--r--swamid-interfederations-2.0/cafe.ufpel.edu.br-idp-shibboleth.xml114
-rw-r--r--swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml96
-rw-r--r--swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml8
-rw-r--r--swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml82
-rw-r--r--swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml84
-rw-r--r--swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml84
-rw-r--r--swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml141
-rw-r--r--swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml117
-rw-r--r--swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml70
-rw-r--r--swamid-interfederations-2.0/europe-stage.wiseflow.net.xml5
-rw-r--r--swamid-interfederations-2.0/europe.wiseflow.net.xml5
-rw-r--r--swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml3
-rw-r--r--swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml49
-rw-r--r--swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml48
-rw-r--r--swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml118
-rw-r--r--swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml51
-rw-r--r--swamid-interfederations-2.0/fod.geant.net-shibboleth.xml110
-rw-r--r--swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml14
-rw-r--r--swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml121
-rw-r--r--swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml6
-rw-r--r--swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml104
-rw-r--r--swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml16
-rw-r--r--swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml99
-rw-r--r--swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml99
-rw-r--r--swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml99
-rw-r--r--swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml99
-rw-r--r--swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml5
-rw-r--r--swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml20
-rw-r--r--swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml218
-rw-r--r--swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml52
-rw-r--r--swamid-interfederations-2.0/idp.feide.no.xml2
-rw-r--r--swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml74
-rw-r--r--swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml118
-rw-r--r--swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml126
-rw-r--r--swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml52
-rw-r--r--swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml48
-rw-r--r--swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml43
-rw-r--r--swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml209
-rw-r--r--swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml52
-rw-r--r--swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml66
-rw-r--r--swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml76
-rw-r--r--swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml100
-rw-r--r--swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml64
-rw-r--r--swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml118
-rw-r--r--swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml72
-rw-r--r--swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml72
-rw-r--r--swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml210
-rw-r--r--swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml137
-rw-r--r--swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml104
-rw-r--r--swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml80
-rw-r--r--swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml53
-rw-r--r--swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml98
-rw-r--r--swamid-interfederations-2.0/login.emerson.edu-idp.xml65
-rw-r--r--swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml136
-rw-r--r--swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml107
-rw-r--r--swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml7
-rw-r--r--swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml47
-rw-r--r--swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml86
-rw-r--r--swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml86
-rw-r--r--swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml86
-rw-r--r--swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml70
-rw-r--r--swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml95
-rw-r--r--swamid-interfederations-2.0/saml.edusafe.nordu.net.xml5
-rw-r--r--swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml5
-rw-r--r--swamid-interfederations-2.0/saml.lynda.com.xml80
-rw-r--r--swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml55
-rw-r--r--swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml230
-rw-r--r--swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml94
-rw-r--r--swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml4
-rw-r--r--swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml40
-rw-r--r--swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml89
-rw-r--r--swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml125
-rw-r--r--swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml44
-rw-r--r--swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml117
-rw-r--r--swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml58
-rw-r--r--swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml7
-rw-r--r--swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml122
-rw-r--r--swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml98
-rw-r--r--swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml121
-rw-r--r--swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml82
-rw-r--r--swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml2
-rw-r--r--swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml2
-rw-r--r--swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/sp.www.kielipankki.fi.xml22
-rw-r--r--swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml70
-rw-r--r--swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml106
-rw-r--r--swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml149
-rw-r--r--swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml2
-rw-r--r--swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml4
-rw-r--r--swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml43
-rw-r--r--swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml88
-rw-r--r--swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml88
-rw-r--r--swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml88
-rw-r--r--swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml88
-rw-r--r--swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml88
-rw-r--r--swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml86
-rw-r--r--swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml2
-rw-r--r--swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml2
-rw-r--r--swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml128
-rw-r--r--swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml99
-rw-r--r--swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml2
-rw-r--r--swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml72
-rw-r--r--swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml2
-rw-r--r--swamid-interfederations-2.0/wayf.wayf.dk.xml2
-rw-r--r--swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml26
-rw-r--r--swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml81
-rw-r--r--swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml8
-rw-r--r--swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml5
199 files changed, 4073 insertions, 5196 deletions
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 39fc9a31..37ae1476 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="2016-03-04T05:43:26Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-04T08:58:24Z">
<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">
@@ -97,6 +97,7 @@ M5r00gwrZAVynl2Imw==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
@@ -105,6 +106,59 @@ M5r00gwrZAVynl2Imw==
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
</md:IDPSSODescriptor>
+ <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">uzh.ch</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIGyTCCBbGgAwIBAgIUaP2onvcn8JF3V2Rgtd4Y3DPdls0wDQYJKoZIhvcNAQEL
+BQAwSTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAMTFlF1b1ZhZGlzIEVWIFNTTCBJQ0EgRzEwHhcNMTYwMTE5MDk0MDE5WhcN
+MTgwMTE5MDk1MDAwWjCByTETMBEGCysGAQQBgjc8AgEDEwJDSDEYMBYGCysGAQQB
+gjc8AgECDAdadWVyaWNoMRowGAYDVQQPDBFHb3Zlcm5tZW50IEVudGl0eTETMBEG
+A1UEBRMKMTgzMi0wOS0yODELMAkGA1UEBhMCQ0gxEDAOBgNVBAgMB1p1ZXJpY2gx
+EDAOBgNVBAcMB1p1ZXJpY2gxHTAbBgNVBAoMFFVuaXZlcnNpdGFldCBadWVyaWNo
+MRcwFQYDVQQDDA5hYWktaWRwLnV6aC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL1HvFAYnMgYMNKotB3ZroxXp+UjHokAPoqO0RwUwSWU85xWUBh4
+1rvKkaLCTr2eOrPtWS90yabqJsitdmH92dzrgFbxdT7e/FdwyinwyfV2hcWHXHWO
+2OK9O/AurKe1S36ZS+kS78GQaIAKS5tp3dP1q8rYS7sTen/MquNRhy0E7uVcSABw
+BnADCpRJIN3edrv1Ka41I4W4FAsMSgr3dgmwQ4xrg2B/482VeW+tiq+NzmPRR/6u
+p2iQv2bjkyAmNPshTWeHYZpRAF3Zg/ZQjZhDVPRtjqiU+Wq5ntaRTCrkY4Y2COWQ
+rWN+Uh4OFSWrKpFc1aOPOI6vyWcS4Z4iGfUCAwEAAaOCAyYwggMiMHcGCCsGAQUF
+BwEBBGswaTA4BggrBgEFBQcwAoYsaHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFs
+LmNvbS9xdmV2c3NsMS5jcnQwLQYIKwYBBQUHMAGGIWh0dHA6Ly9ldi5vY3NwLnF1
+b3ZhZGlzZ2xvYmFsLmNvbTAdBgNVHQ4EFgQUJ3XcV+xSN7MDp0eLpo8VIn7IZRsw
+DAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBRVWIbOunx2TpkTqQ/TbJ/C9dM84zBR
+BgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8v
+d3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MDsGA1UdHwQ0MDIwMKAu
+oCyGKmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2ZXZzc2wxLmNybDAO
+BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBkG
+A1UdEQQSMBCCDmFhaS1pZHAudXpoLmNoMIIBfQYKKwYBBAHWeQIEAgSCAW0EggFp
+AWcAdgBo9pj4H2SCvjqM7rkoHUz8cVFdZ5PURNEKZ6y7T0/7xAAAAVJZSsXGAAAE
+AwBHMEUCIQC0BJ59f/nVOrCAzSsNPbSnMODLYcao2T4a0js7HZhm9wIgUhJQDGXA
+EJ/MtqIe5j5jtuPYiotktVPMIlWUkOHT5KgAdQCkuQmQtBhYFIe7E6LMZ3AKPDWY
+BPkb37jjd80OyA3cEAAAAVJZSsiyAAAEAwBGMEQCICC/hLFK7J0asHg3xCB/UGWb
+eRVtl2PdOI1EyHK4j0XBAiA8DkiN1e3SK80mlJmeQmuN0CoN5tEMHBMZD2W3bFWN
+sgB2AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDdAAABUllKzGsAAAQD
+AEcwRQIgZyl/dNpQIyBBjT/Wq79EW45S5p+dy3PlwNsEo6vk4sICIQDmidXo2tDF
+jZbVi2g++aryPHRYCyw1/sxjUV3KZxAEoDANBgkqhkiG9w0BAQsFAAOCAQEACIqJ
+nxowoGjhWw5aO154e5uJm/8Bh/xn/8+Vnp5PdSQaYAgs92lPxUNTv1ZHK0fsFW2I
+rv3AJJKBeCIICB44zCSKlkMoLPtBpm05K++EptLjnvc4/lan8DjNy0phMNnhht3c
+9fi1KIEaOg394JTfIhkcukFKBReelrBUJgG+XkMsgfGdpOw7ULnSKUvcmgA2ypRL
+EncpfLGhDOKtalVy9oLF6cC9/dvnhAOPiAcBJMlkVYmXqmUmhProoyFzDq0pbLcg
+xGfdQXcGLCKIAlksfJ5v5r3Dnji7Wj5nAHRfigBxDv87F0ZKesV08pQlef1NcVM+
+M5r00gwrZAVynl2Imw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.uzh.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:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">uzh.ch</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="de">Universität Zürich</md:OrganizationDisplayName>
diff --git a/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
deleted file mode 100644
index 90159289..00000000
--- a/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-integration.dfn.de/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T13:52: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: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">dfn.de</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="de">DFN AAI Integration + Test IdP</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">DFN AAI Integration + Test IdP</mdui:DisplayName>
- <mdui:Description xml:lang="de">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
- <mdui:Description xml:lang="en">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
- <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
- <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST-SimpleSign/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://aai-integration.dfn.de/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de/idp/profile/SAML2/SOAP/ECP"/>
- </md:IDPSSODescriptor>
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.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">e15</md:OrganizationName>
- <md:OrganizationName xml:lang="en">e15</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="de">http://www.dfn.de</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.dfn.de/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Wolfgang</md:GivenName>
- <md:SurName>Pempe</md:SurName>
- <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>DFN-AAI</md:GivenName>
- <md:SurName>Hotline</md:SurName>
- <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..945c5ac2
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-login.ehb-schweiz.ch-idp-shibboleth.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.ehb-schweiz.ch/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-04T08:50:31Z">
+ <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://support.ehb-schweiz.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">ehb-schweiz.ch</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="de">EHB / IFFP / IUFFP - Das eidgenössische Hochschulinstitut für Berufsbildung</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SFIVET - Swiss Federal Institute for Vocational Education and Training</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fr">EHB / IFFP / IUFFP - Institut fédéral des hautes études en formation professionnelle</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">EHB / IFFP / IUFFP - Istituto Universitario Federale per la Formazione Professionale</mdui:DisplayName>
+ <mdui:Description xml:lang="de">Das eidgenössische Hochschulinstitut für Berufsbildung</mdui:Description>
+ <mdui:Description xml:lang="en">Swiss Federal Institute for Vocational Education and Training</mdui:Description>
+ <mdui:Description xml:lang="fr">Institut fédéral des hautes études en formation professionnelle</mdui:Description>
+ <mdui:Description xml:lang="it">Istituto Universitario Federale per la Formazione Professionale</mdui:Description>
+ <mdui:Keywords xml:lang="en">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+ <mdui:Keywords xml:lang="de">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+ <mdui:Keywords xml:lang="fr">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+ <mdui:Keywords xml:lang="it">EHB IFFP IUFFP SFIVET Zollikofen Lausanne Losanna Lugano</mdui:Keywords>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gIZDQgoRoUtKwAAAs1JREFUOMulwUtrnFUcwOHfOXPe6zQzkxknrcGqC6mgFo0FjXcXpiDS4qUoIi4kLgUXbnRRXPsJCi67krZKtBGLihTEhYK0qEgNaUs7JE2TTiaZvDPzXs45fz9En0e9vXhdXns65vEjM1xaG/L+sTq//p7RH4RsXFeIH7BbGD76YIZGK8epBOMKnIrwePS+dsr8QoNDTypW/qk4d3qPC99MyAtF92DF4SMd8lGA0qBUwmQyRlRITQN6Bz3YKNnaquFFgdUUBTivCCPPOIO13jZxXLKTFVjnSRMBUXjn0bTRB2dDstEeayue+w5EvLtY5+ibHcY7Hl9YHj7cQTlwAugSkTpSE7wXrPPwx18T+fLUqtxYcXJ7WElVjuXva6X0rZWLv/XlxLGbsvzDHRl7L+eXMrl61cl6f0/OL41lczgS5UWksJ4IhVNgtOO7nwuSIKSeKGxQMPdYytLZnNGwZOHVlOVvR8SRZrtfoJUDoxVKV5iaRSrN9qBi/faES39mrN/MsbnlypUhJrSowNE4ILz1Ycqocmj0GK8EcOADCEoIBB2B1Q7nLL4wRIlFTIS1Ab0bjpOfbHLoiQiDTVHBBJTgAOVimqln3FfMPQrPPt/GoGi0QhbfS9C1Gvu7hs8+bqMDjRKfy9otoeYrfC1k9l7Nv71dpusp3qZ8f2aD+VfazO43nP1qi7n5Bs004ZefBrx8tI6xRFy4uEueaVpdx4nXQy5fnhAZjVOWzj0tptqar3+cEKspZmY8Z5bv8OD9wrnTGdqoCUkiRPWKIARdCc2wS5kF9K6B1TvEpqS3uok1I8ZFTLMZ8cwLTWzg0eITFApFzGivwlFR5JZ8FLGvIXQ7LUIVMhXOMN1UJFHF4FbJqc+HPPVcgHGqQlTAQ4+UDLYivjiZYaZjFt7IWf3P8OJL4I0hSHc5frxDEDmSNOadT+GB2TpKRIS7oLlL/wNnjGEYoDkDfAAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:Logo height="29" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAdCAIAAACytXxIAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH3gIZDCsw6oKoKwAAEjBJREFUWMOVmGmwXVd15/9r7b3PcO899777Rr33JPk9WUaSZQRtYuhgN7FNHCCBUEk5ocHQDAnGJjEkzmAa2tAph8SEVCATU8AY40AluKiQcojdHZopJqEtJgeMjCVkyXp68313PsMeVn94dHV1VZSKdp1Pe39Y9dv/tc5e/0VHX/GBej72SW17Z3T5svrMh29zA/eqt37q/ve/oVm3rJQDvfyNn3jPr7/w6OXtd/zZIx+65yuXXd7s7OxMJUsf+eAvHp3VyjXBAONfXYJA4BDABFAQEZAajFxv3DesmAkiSinrXAgSpQl8KMsyiiLvfQghiiJrLTMzBRFRoOBEGVNaT6yFlZIKF7P0D5/8wZc/eeuhffsH/dzLMIX+3tr6yY21It+eaDYQ9Nj5s2sbvbGr0PjGd1dufPl/+sjbXzRS7qY3fOjnXv1Hpz7/u1BhRL4OcwFgIYAZwQkpISIBajUd60kIiAQSlFIgMKOzM4ojPT1TDwHWhjjmwaBoZjVjqBAfKSXBe++9t40sIa2c9wiNiwNu1OtLC/PNetRME1AbATqqI9bQCjAAKeh2PU1gY4SG6D17GcYpqNfe9J/f/I53QwBLtUhdKICIgOBc0IpB5JxTOnrssRNWp81GrSiKODIiUpRVCGEwymupqtfrzJwkSa/XazQaPBqtr6/XTEsplcbqwNJMpCMQvJdEaShcHLBic89fPza7r3bu/Op/PHbw+qsWszRw5d//wD/vm53Q3nQHq2tFyU1tMdJ1OXe2t9Ib9kbD+/7uH970ppfBWAQzBGUXCMDEALRm8QCL1tp5aK2L3Kq60b6SUqy1sTbDsoigm3EDDsxc9gvlWHtFgVCKVblJkkDYvT6joVUQBEJ0ccDe+y988ThSdW5lJ9Nz111Vr5nI9kcP/e2JS/ZMlIORlU5n09SSKUbSnpi+9/7/cer01ub61toPz/3Wm2608EZM5gB9wRjei1JEDAG890rxoUMHe8VYsypGoTWRhRCKvFrOFsZFrgKiKKqqKsvS8bjq9Xq1Wu3K+aPd0UCrqBjnpUVvp5fGOmvUlNKQi1SYiD7+wV/aM9EQgBCCd51ud2Jq8u/vfV2rYQzXcycvet2fDjtr2HvJ5trmbW99+XvffL0l/4nPfPVVb3nPyYfvdFSSUurCxEqRCAggIqWUD3j88SdWdkomzM7OnltbFZH1re0syybak8U4H4/HeZ4vLy9vbm4WRSEi7XY7S8WYeDzK19e64u3ePXsmMgV/wZ/lBYGLPKfglAR4BrEidl6XCDY3ppkCCIr6uS2EHevc2Lg2AjmCfukN1971J1944sTpo5cfRgj/RuBdhREAAgBmHD16aM9O11tXq6fi/MREM68Wujs9ZdSeg3uHw6LT6TQaOLDnEmttVVVxHKtEBzBAVekUiVYQDoQgcnFFrOem59525z233Hbj+XMb02njBc8/YKKwurEZgBACM/vCVn0fRiaC9j3/6FfOfPfqTlm433n/59pJfOTIYTiUmuMLx/iRwgQRISIATzxxauyimanpr3/lGy/6qWs2u+7R4986dOhIvzM48eS55eXltU7elmRwfqUoimazOTvbWH/iXJqmrKOVlZU40bPTE8v75kIIzHRRwOqLDz1w39888lf/8+kv/dPj506f+JmXXOvj2pmzKz973bEkiTxgyJ85u33N1cuT7Ua1NX7waz945PvnH/rK11nrj73nzTPNstSRCbAU2JZQ2sIxgoMIcnYRCXkH0ZahKDjPsD6Qi+MsGoy6Xuy+S+bzsursbDabjayeBqeKfDAx0Wi1mt1OD8IED5Taa2MiF1D6youvN6LJZkrkAAbk3/+RuOAUVQADkQcDUKVDqaUOcaAYGPapkcESyAIMHQJcGImu1wIQ4DVU5VaF6r6qhUQnOZQqinhsfWo4pGVdEpAT0UTOwSqYKtf9fCAiWZaVVeGsByDe19JGYNUfdJqtepFXEBNFUWUL58okjsejXCf1Wi1xFvloZAiKWChclMLkilzFCt5CRYB2FpoFVIFjCLwFKfvLb//wW15z3bOvOFoAt73jgX/+9ndqWZtUft/dv3TpvsZ9j5x/z90fr+l2d71z62te9OZbr7v7Iw999BNfnV+Y6I/p6DLf/7u3Zy048QTlSGKiqhTvHShEke73+7VazajIOWetFxalScRrHdlKdjstpSgo8d6LUHBSlTYxCcAhXBwtAI04ci5oVROghCPDBFY2doxAUBHGhfmnb3Zv+nntgDv++2cefPj4lx96l93qlc48Y3HSB77zrR94400/+cuvf+6Tp90l7UYCHP/ayeuf88y/+ONfPLty9sab73nDb9z76Q+/WivtKcTCzqM7HIzGLo6NNpWiqDvM8/FOlrXK0vpQTE9Pb6yv19K6UnG334tM4nxVBR8bpRXarbqqR0AICCKi6CLfYRUYigFHQLLbGEFgBCgZTCBWpjk9k8SpDzh1bv321//cclvzxLzVAPLvfGNt7+Klt97yM7OJn/4POpbKQWptdfDSuRpweO/8e+9+za/89mdKsTpoT30lTVI4e3718TO9Zlbfv28+TSNbetb1Uz9c7feHl+6ZbU/y5pb3fmc8HsdxOh4VWZZ1+wOtJFbyrGOHmxmHwGAwAXAXqXBAIJDSAuEAAoFh4ZUoBGFECcO7HSOIBVNT8eeP/+/lLzS2VkbpdHjty368Nd/o+/L+v/zHqcbU+Z2nX/FTV+5fmrGlrSUxCJCYChPrqAyuTohUDM+Vt4cOHTpywDOJs+NGYkhHIHVgYt5EiY2qcT449uy9oyK3rmw0GuNRIcJJssdo7nQ6iMZFUMHZNI4BAZKL7LR0aQMxIgYRWxHnhJgiFg0CPCrnVZyAAgRRrfnoY6c+kX5pZSVfOlh/7Ut+fDZLevnoUw8/kk20zp1++vCB+cVLZ5JUnXr6zOrgyLgn//XOT77giqVGnCFYVBEMIjJPnjj5+NnOvsV5lmrpkr2M8P0nTrBJGlm7adDrDofDc0QyvzATQ505udZqzqyWPR/C1lYHoDRNsjQ5uLS3kf5bHd6/DsxQCTMABABGgokUxMMrSPDaFKSjSuI8DEW79Y694+YX33nzNbB6HAHAEyujxcmZf7jvplraUgJyCJD29J6/uO/r/3JysLm5fsWz93z4rleUgDARqZxcAj0/N0Om2cxSCmUUylazceninIdmE0Xs52aXNta30zTRJhhjFxem6vWsP9Z5UXI8E0VRPY2CG6uogFK4SPegvVdQRAALiOEUFEERVABIoaprBvtRTBl5DdeztF+gSSENqNiRWNal+Jr2gApgH2DWnu7/xq88/92/+hKdRz4t4SICAAcDhqOgmaKpprLW7ts7vXp+e220Xas1XUBVVZUmO+zBBBgKEm1v52U1mpltFx5bWztZliVJNB6Po0h3BhWxjPJxFEUiAmA0LgAopeJaWtf1WKvKFv3uztLSIsGLeCbSWjkfDAmIA+AUWIGB0nFEIDK2cqqzORxVY8cYbJfDnR5RLpxaCjpAisHKuVUOUqkK0BEbAHlv4HrzQMypYxAIKoBCAgUiL4InT53dHOdxpJPJds7RuBh/98yTzKx0RBXG+eDA8iWKVK837HY7/cHO9MzeMteDXlhfXdXaJEmSJDEzx4nZWhvHqRCRiPT7w7ws6vV6o4GsPmLm0WjgbLm4dyHWCsQAaYhVMBAAAUQKHsELM4EYAcQk5Uuvv2puOiPCc48uLh+cA0hQArEwt5tTL772eZFEkaAiB2IJo2t+7JJL989HHiANLuCMMgwCfGl0TIzLn3mAXJEkCaGcnUvHY1ma2V+rZ8ycB8qLIoqV0abRCvv21dP0Mh+qyRk9M3eZ91IUJTNHkbHWWlfOTLV3FVZKKTXlgjcmrqrKlgxgbnY6BCeBqkoAhOBIpBAfEwdPPLbIjIVXY8W1AMBCDLjsU9wIjkRDISD4IBHncA0owNnSIBbxEgk77Ri66zApAkN5JQzEhgAE8Z5V5Wxdm1CGylrjnPPOKqWMMc45EHvvKcTErrIjIERRAk9EVBQ5aUVETIqZQwghBKUZgPIGTCG4EILWOoSglLLWsmHnnFJKM5dlSUTM7Jyj3V3AfvKBb584c/5db/3p7bXhO/78wT++48asmQYPpvI3f++TN7/yumccvFQIt9/16Ye/dDJuJFOJ/pM/f9WR6fih7/d/587POVY72+ff+Asv/9Vbrrr3s1//0Ef/Lq1PdkO4drn97t9//YTpkJvUFEhBkFdlPbc+eJskSTEeKqXqWdrvFyCVJYY4aB0AASg4YqV2h2FE9P+7wRBCYNYhgP/vtnNu14Tu2mTnHTPvDiGcC1qzhlICBLjHfnD++ONPkTZVxZ//8uN3/XoehVQbjCv98D+efemLywOE//buz/3lXz/22Y+/rTveDBgcnJ4LwM03333j85/z6tde+cOnT1+xvD8CHvzsIwf2zN31ztdtdJ76tdvvv/23P/qx972SNUgYFsGk3/2XH5zpdBfmZiOjlFJVVbVarf5gNMwL6XWuvua50LzrOIMHK0CYdgeCDswAQQKImYm9BP4RbtgdrQBBQhUgio1W/++IWABoEkCgmBsTE1GjQRCIn1qYZybWYASlFTemdVwH8K0nV171lhue92OKccCB4fHN751rTs+9650vm0iS51y+AFEWaE3MHTs6+6ylCIuX/cEf3n7nHfc4G0UGgAcpAR8+ctm+ca+WpExQikIIOzu9hf0zrFV/1OLYewiYHUjFFGABL9ABgY12IBFhDSBUrjI6BVA5a7QKEhTt8oni2Hu/m8nee6WUYgQJmilAGBDioCJS8AzvaKQDDABHBKvSXJNlj8kFc+7bpx/91oEzZ7faDfPi65+5kKXsys/+r+PN9kJ3bfWFVx7Zf2DS+YEzMwU4NirSayaI8pa0QfAg68DCerVvq61BLYmM0tZa691TnZV6PZudbJ98qjMejkSUrXwUa23k8KF9Kyu98+fP12qNLMu63W5VVWkaR1FUi0dE1O/3Dx8+YJidh1JQpCVAsQIQApRSAAhgYu3BzCBJgBD7QKKLRMXeFFGFAC9E2ljy7GNRth1P3PfVRzverWyNjy0kN7zwWa3J1s6IPnDf15JGY/2pjdYdM/uXG2lc29rsJ6DtvPzN3//7Y5dPJFENcKK0wMcwa531vBhVQ5NoU7h+v1dqrjez1tbWJuxg//6ls6Vd39hqtVqVK4MEH9BsNHbSNEDyyntlEHHpUPlqnNs40mXllAIAteuOCUQ/qvLdhA8hEBERaYIFFMi7YIVYPFxhOVDdNzw5RaRKl7jJoc0ZtL4+eNutL73jlhfspieCP/30xsI0HvrYbc0sDRhFiAViplp/9qkvfuf4xup45/Di1Pv+6BYQIBoEFvaCLMuMTvccbW5u7WS1xdplyjo/Grsjlx0e9gZwxdLi1IF9c8xMJMV4ZIfDREVHnjE1HOdGtQSttOaZMeg4Z7R412zs2en2FImIN8ZorZmSoiicc1mW5Xleq9Wstc45zYDAA6Sj2HpPCvWE3Kizs13UpmKv1Xbf5utnZ9I2RI9IGRop5CAD1gHiFYlilUQKVqMOH4iQr/V/7TXXv++3fnZtq9ucmUjhIFoYEkAQxf5739k6vfHk7Mzi9vrOC3/yqoEbP3Wqs7MzvvonDj9+sivEqxvrURRprb33tTjxtqqcn1+c2NjaykcbGxtrN9zw3EatfvybJ1Cr93o7ray+Z3Zuc3NzPB632hOKTVXY7e3tOI7jOA4hzM3NbW5uMrNGMERw1hdVGOdDwO1fbDUz/8o7Pv3VB26JVPiFWz6oGubQM2dK5P0q74whlCKI90GM5K4oBjm6jqZiYZCCiPSLYm/aEinnZiZIAryGDh6sGICDmGPPax2zL9jeHNaPLMy1udMJc20cObSAcvSsKxa990v7Up1orTUcvPVFUdRqDevdwkxLa93vTk/EPFFX1159iHS8sbFRS+JWq9WdVGVha1mzrCrFAZgiohCC9945O9Nsaa1/5DW0UY1GY2lpCd4HFe699+7/cvN7D1z3dka2f7Lx4MfeGQV4iq+cSqanp4NAESlNFWyapnv37q3VYhBEEIJXSs3MzMzOzhKzD1AXmLGVZbmw0C6Kcqe7E8eNyclJEe+9K4tRmqb1eh0a1loExHGcpqm1vlnPqsoy8+TkpCLp94egYAs7Pz9ny2owGNTr9WZmnMBEEcQC2C1gEdmtYa31/wEu09ISiEvnQwAAAABJRU5ErkJggg==</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://www.ehb-schweiz.ch</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="de">http://www.ehb-schweiz.ch</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="fr">http://www.ehb-schweiz.ch</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="it">http://www.ehb-schweiz.ch</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>ehb-schweiz.ch</mdui:DomainHint>
+ <mdui:DomainHint>iffp-suisse.ch</mdui:DomainHint>
+ <mdui:DomainHint>iuffp-svizzera.ch</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>
+MIIDQDCCAiigAwIBAgIJAJ3M6RXWA//7MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5jaDAeFw0xNDAyMTkwODU4NDNaFw0x
+NzAyMTgwODU4NDNaMCMxITAfBgNVBAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5j
+aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAN2avTSONQyVmUrout
+iUiLIOr76jMCW6TZ48uvUHt0D+GxPmbkE5lMxVpmTvBxsMd687o6IqFsqMw3pSzt
+hyJ/Zl+T7HCANhPKKUQTNd1X/OX6L1QAi6r88dgcZtlM7RYRwoj8fJ+EFk6WhJuJ
+74UcJHKYx0U9dYY2B25ld+GM1Ah0NikNf2pE+Hw2J0l+O37QpG7aI6GzqYYCkD3V
+qI5BvMkK5EzFZI1FBNYcahBsHyIrP7c+GLTJsBEbBvzbxN/GX8zT7Em1KCpNllu4
+DEqk3f8ZjWJFFJlcgHVKF+DUxswr7PoU/QhH1yMcy4+CHP138kCoOJdhfAN7dEtf
+7M8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYYWFpLWxvZ2luLmVoYi1zY2h3ZWl6LmNo
+hi9odHRwczovL2FhaS1sb2dpbi5laGItc2Nod2Vpei5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUhierWG+h39Wt/g62bByZw6xwTU4wDQYJKoZIhvcNAQEFBQAD
+ggEBAIJofpvKjzSqGnON+rSXn94cs4ubAkuOQEn/XjnoJByMAFXWGcoEK9O8bFfE
+RDAeY/JqRUf72oToSEnOW25EtHZI+76H6Vss0PQ2OG4xfndgjIJeWkkR1nnSVrnh
+YRbHTwUna9v06DXYR4C6cwOEc/AyWLL7cdHb0cnydLAaNxgF7JYrPvMtGxCgoQtm
+rzLxebDkJ/9NyB0ChJh1MiYoHgo4DqnMGNAFg8wKEoRjbTAvR+/urdtomR+DEhXF
+6q5pVoS+6mcH5JbAAaMlP3IMdqMtlXQLZfrrIki4oK1oKmG47Im25K9sucNtCmmk
+SMtMXUOPoo2ywvrbXUtGDDHFJYE=
+ </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: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.ehb-schweiz.ch/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.ehb-schweiz.ch/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.ehb-schweiz.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">ehb-schweiz.ch</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDQDCCAiigAwIBAgIJAJ3M6RXWA//7MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5jaDAeFw0xNDAyMTkwODU4NDNaFw0x
+NzAyMTgwODU4NDNaMCMxITAfBgNVBAMTGGFhaS1sb2dpbi5laGItc2Nod2Vpei5j
+aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAN2avTSONQyVmUrout
+iUiLIOr76jMCW6TZ48uvUHt0D+GxPmbkE5lMxVpmTvBxsMd687o6IqFsqMw3pSzt
+hyJ/Zl+T7HCANhPKKUQTNd1X/OX6L1QAi6r88dgcZtlM7RYRwoj8fJ+EFk6WhJuJ
+74UcJHKYx0U9dYY2B25ld+GM1Ah0NikNf2pE+Hw2J0l+O37QpG7aI6GzqYYCkD3V
+qI5BvMkK5EzFZI1FBNYcahBsHyIrP7c+GLTJsBEbBvzbxN/GX8zT7Em1KCpNllu4
+DEqk3f8ZjWJFFJlcgHVKF+DUxswr7PoU/QhH1yMcy4+CHP138kCoOJdhfAN7dEtf
+7M8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYYWFpLWxvZ2luLmVoYi1zY2h3ZWl6LmNo
+hi9odHRwczovL2FhaS1sb2dpbi5laGItc2Nod2Vpei5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUhierWG+h39Wt/g62bByZw6xwTU4wDQYJKoZIhvcNAQEFBQAD
+ggEBAIJofpvKjzSqGnON+rSXn94cs4ubAkuOQEn/XjnoJByMAFXWGcoEK9O8bFfE
+RDAeY/JqRUf72oToSEnOW25EtHZI+76H6Vss0PQ2OG4xfndgjIJeWkkR1nnSVrnh
+YRbHTwUna9v06DXYR4C6cwOEc/AyWLL7cdHb0cnydLAaNxgF7JYrPvMtGxCgoQtm
+rzLxebDkJ/9NyB0ChJh1MiYoHgo4DqnMGNAFg8wKEoRjbTAvR+/urdtomR+DEhXF
+6q5pVoS+6mcH5JbAAaMlP3IMdqMtlXQLZfrrIki4oK1oKmG47Im25K9sucNtCmmk
+SMtMXUOPoo2ywvrbXUtGDDHFJYE=
+ </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.ehb-schweiz.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ehb-schweiz.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">ehb-schweiz.ch</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">EHB / IFFP / IUFFP - Das eidgenössische Hochschulinstitut für Berufsbildung</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">SFIVET - Swiss Federal Institute for Vocational Education and Training</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="fr">EHB / IFFP / IUFFP - Institut fédéral des hautes études en formation professionnelle</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="it">EHB / IFFP / IUFFP - Istituto Universitario Federale per la Formazione Professionale</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="fr">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="it">http://www.ehb-schweiz.ch/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>AAI</md:GivenName>
+ <md:SurName>EHB</md:SurName>
+ <md:EmailAddress>mailto:servicedesk@ehb-schweiz.ch</md:EmailAddress>
+ <md:TelephoneNumber>+41 31 910 38 38</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>SWITCHaai</md:GivenName>
+ <md:SurName>Team</md:SurName>
+ <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+ <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml b/swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml
new file mode 100644
index 00000000..47958e4b
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon-qm.its.unibas.ch-idp-shibboleth.new.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon-qm.its.unibas.ch/idp/shibboleth.new">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-11T11:48: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>
+ <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:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">New Uni Basel Test IdP</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Uni Basel Test IdP</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.unibas.ch/de/</mdui:InformationURL>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"/>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDVDCCAjygAwIBAgIVAKMVlGIsXbXX6z/I2qFfxt6K2G3kMA0GCSqGSIb3DQEB
+CwUAMCUxIzAhBgNVBAMMGmFhaS1sb2dvbi1xbS5pdHMudW5pYmFzLmNoMB4XDTE2
+MDEwODA5MDkwNloXDTE5MDEwODA5MDkwNlowJTEjMCEGA1UEAwwaYWFpLWxvZ29u
+LXFtLml0cy51bmliYXMuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCjkH9DBmxGnJascUF6vkqYVzcn0v9ghkMVG+kRp5IQ9le04xVX5DoF1hFrSltj
+FVillz+7t4Uu3X6ciTFaqPBsbLVrqUuMh8a+Xgc3nYESlnp+vvO7m2sQI5tye29H
+fzx+kGZ0xQg65wc/onAAJl08DSD4kbHq3DQ4Vh1pCujRTXZio5JyDy8bMAzY1rr6
+KSFUSgnIqGBnSNyCsUNCYg2z5USxYp4dApWyGM3o57XGPTgzKLJWzjgp2V0hEInh
+hq01hazS1MXPYKnjB4BE+RvrPwJomEsXc0IAHhrzrHUc49HCNgGQIkOin2NTBS3j
+Dvql2MPQGM+yZYNzo6pG0nX5AgMBAAGjezB5MB0GA1UdDgQWBBTJItTcSDnPKqFE
+qBsxdXzQzzro1TBYBgNVHREEUTBPghphYWktbG9nb24tcW0uaXRzLnVuaWJhcy5j
+aIYxaHR0cHM6Ly9hYWktbG9nb24tcW0uaXRzLnVuaWJhcy5jaC9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAArwIaf+veOMBYFQV1X8ulhK4lnZqEd4u
+CW68H3EQIJf8SCUzSQd5YSGxAUO2m7CfLYYfD72SMoZwzlJxwhUDYh4DA/wEh+y5
+xlY7dGicQItvQo8j9opYfYhfCfR1B9PcJmLk73/2YrhSg/EcEpnO7mshK6DF7ra5
+MOGRssldMlB1Mgo3zAzv6tU1PUttdELwXIMadrRKpNK8jni5kCYMhuz2XXYgxbU1
+DPsuN02KeGlGK38oh3Bddp8jYzwa7ntEk6UAzz76DuqitupvvZ4h+oC3bM9YWa5Y
+GRk9+65QCpWxAI40kQ5E0mDxrnfiHC2I8FJQXY4ZkqvSY7674l1mXg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon-qm.its.unibas.ch/idp/profile/SAML2/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon-qm.its.unibas.ch/idp/profile/SAML2/POST/SSO"/>
+ </md:IDPSSODescriptor>
+ <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">unibas.ch</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDVDCCAjygAwIBAgIVAKMVlGIsXbXX6z/I2qFfxt6K2G3kMA0GCSqGSIb3DQEB
+CwUAMCUxIzAhBgNVBAMMGmFhaS1sb2dvbi1xbS5pdHMudW5pYmFzLmNoMB4XDTE2
+MDEwODA5MDkwNloXDTE5MDEwODA5MDkwNlowJTEjMCEGA1UEAwwaYWFpLWxvZ29u
+LXFtLml0cy51bmliYXMuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCjkH9DBmxGnJascUF6vkqYVzcn0v9ghkMVG+kRp5IQ9le04xVX5DoF1hFrSltj
+FVillz+7t4Uu3X6ciTFaqPBsbLVrqUuMh8a+Xgc3nYESlnp+vvO7m2sQI5tye29H
+fzx+kGZ0xQg65wc/onAAJl08DSD4kbHq3DQ4Vh1pCujRTXZio5JyDy8bMAzY1rr6
+KSFUSgnIqGBnSNyCsUNCYg2z5USxYp4dApWyGM3o57XGPTgzKLJWzjgp2V0hEInh
+hq01hazS1MXPYKnjB4BE+RvrPwJomEsXc0IAHhrzrHUc49HCNgGQIkOin2NTBS3j
+Dvql2MPQGM+yZYNzo6pG0nX5AgMBAAGjezB5MB0GA1UdDgQWBBTJItTcSDnPKqFE
+qBsxdXzQzzro1TBYBgNVHREEUTBPghphYWktbG9nb24tcW0uaXRzLnVuaWJhcy5j
+aIYxaHR0cHM6Ly9hYWktbG9nb24tcW0uaXRzLnVuaWJhcy5jaC9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAArwIaf+veOMBYFQV1X8ulhK4lnZqEd4u
+CW68H3EQIJf8SCUzSQd5YSGxAUO2m7CfLYYfD72SMoZwzlJxwhUDYh4DA/wEh+y5
+xlY7dGicQItvQo8j9opYfYhfCfR1B9PcJmLk73/2YrhSg/EcEpnO7mshK6DF7ra5
+MOGRssldMlB1Mgo3zAzv6tU1PUttdELwXIMadrRKpNK8jni5kCYMhuz2XXYgxbU1
+DPsuN02KeGlGK38oh3Bddp8jYzwa7ntEk6UAzz76DuqitupvvZ4h+oC3bM9YWa5Y
+GRk9+65QCpWxAI40kQ5E0mDxrnfiHC2I8FJQXY4ZkqvSY7674l1mXg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon-qm.its.unibas.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:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">unibas.ch</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">New Uni Basel Test IdP</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.unibas.ch/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Hanspeter</md:GivenName>
+ <md:SurName>Spalinger</md:SurName>
+ <md:EmailAddress>mailto:wsym-its@unibas.ch</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Hanspeter</md:GivenName>
+ <md:SurName>Spalinger</md:SurName>
+ <md:EmailAddress>mailto:wsym-its@unibas.ch</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
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 f80445c9..d828c2d4 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="2016-03-30T14:44:37Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-04T14:13:02Z">
<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.idiap.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.idiap.ch-idp-shibboleth.xml
index ca1b4841..e44133c1 100644
--- a/swamid-interfederations-2.0/aai.idiap.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/aai.idiap.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.idiap.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-31T09:16:03Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-05T14:46:58Z">
<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/aci-bookings.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/aci-bookings.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..33ca2965
--- /dev/null
+++ b/swamid-interfederations-2.0/aci-bookings.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://aci-bookings.sisoshibboleth.co.uk/entity">
+ <!--
+ This is a "SiSo London South Bank 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="2016-04-06T14:39:40Z">
+ <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://aci-bookings.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://aci-bookings.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 London South Bank Online Resource Booking</mdui:DisplayName>
+ <mdui:Description xml:lang="en">SiSo London South Bank 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://aci-bookings.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aci-bookings.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">SiSo South Bank 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/apps.csustan.edu-shibboleth.xml b/swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml
index c445084a..f9fccbb2 100644
--- a/swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/apps.csustan.edu-shibboleth.xml
@@ -43,6 +43,11 @@ xFxzcdITxtRaIIG4
</md:KeyDescriptor>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.csustan.edu/skillsoftimport/assertionservice.aspx" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.csustan.edu/test/skillsoftimport/assertionservice.aspx" index="2"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">CSUStan Apps</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">CSU Stanislaus App SP</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:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">California State University, Stanislaus</md:OrganizationName>
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 36947b9a..be222eeb 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
@@ -25,23 +25,28 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAJbpaoeYyF5GVt7G11oqdFKzTieoMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGJpYmxpby5iby5jbnIuaXQwHhcNMTEwNDI5MTU0ODM4
-WhcNMzEwNDI5MTU0ODM4WjAbMRkwFwYDVQQDExBiaWJsaW8uYm8uY25yLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJfFnp7SNaBBZ16ycfHpfG1A
-ZSmbJA1WQnMOkE/3LyHAcwuH4L3pzwZ+c8uHPEgb2XcWHT/ASPvVQ3WadwIhzHKM
-3xaS5Dp30fqlS/lB5jFdEOJaYGqsN0ZLsTH1krYcysm/ToDZ+PVhSCoOgdk6jG/G
-m/nrmnpyNai3uBAhOxugHadmcMGf87+fUz7W1mrqQrB+wHeF+LtogEsi77KcAwid
-snYqc/jQ5jvq2+x7ywlfFmf85aKMeyzfVO/6nXDYIEZaII/CkepegxP1CyqQsnmD
-2Wucrr+ZUo7JhgGFsF8js2vwXSQ/UAMsT+FvTni7QjhXK4jQXuiYrPhgrXKomwID
-AQABo2cwZTBEBgNVHREEPTA7ghBiaWJsaW8uYm8uY25yLml0hidodHRwczovL2Jp
-Ymxpby5iby5jbnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCT+SlxcKK+e
-etAAkTlQJ12HlnKLMA0GCSqGSIb3DQEBBQUAA4IBAQAbJeCTx4ki/AxCDbdFY9ae
-OUe1vwAPSpIKwkh4HgfxTQIYJ6qlgSDJp6tQBxU0kUMEQjVnNSm3wO1ybyAAyY09
-7ozayprctspLrZNnJ6mMac3xkJTKdndUmSaFt5P4iJCsoXAeFfnsbSgJdBmDvmYy
-wrmTmHCBy+x+Bffdkoct4jrEJLzzsegoW3Xef99vdLLUF3eABRkdqNGiSHrWxt4q
-U54oXUKAY4FIYbrat+RdEKwrq3NlApysLNVT2glyptc217T7w0JuMUgwTb3DXyG+
-1nkiY/BGUOL2/+jJkShC/nhoUFPUBy7VmLpTmaYnpLHyvSzFw/eJhmYdtWgOrHnU
+MIID9DCCAtwCCQDDKKmEOwqI4DANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+SVQxEDAOBgNVBAcTB0JvbG9nbmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyND
+TlIgLSBBcmVhIGRlbGxhIFJpY2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmli
+bGlvdGVjYTEeMBwGA1UEAxMVYmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZI
+hvcNAQkBFhhhLnR1Z25vbGlAYXJlYS5iby5jbnIuaXQwHhcNMTYwMzMwMDgyMDI3
+WhcNNDYwMzIzMDgyMDI3WjCBuzELMAkGA1UEBhMCSVQxEDAOBgNVBAcTB0JvbG9n
+bmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyNDTlIgLSBBcmVhIGRlbGxhIFJp
+Y2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmlibGlvdGVjYTEeMBwGA1UEAxMV
+YmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZIhvcNAQkBFhhhLnR1Z25vbGlA
+YXJlYS5iby5jbnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5
+Sv5rRfMx/i+VbaR6FmuPGHqcJJ9V+IfbYNVu+/p6qOg+pFwqg5ZuaF674aQ1dczN
+hVgJOEG7p3TjUAGAqX46iURqX0bXVkOzwLKfXLhfqAKPr9eMSoWz6RAk0/IAQaZT
+58XEHpwTBxLqgDrH5M6gMNfXg7wY+iBsvhNakVp8Sw9vW7KiVT/fQSNu3EDSP0pB
+iqJOtUErupGBk8SdBvc1mI9ue5QkakcjsqnKdLI6cQ9jHIn4bUSBMmL3Q4b9q/0A
+/PlY4ZX29HzhGCJ8KrhpRzMjSf5CY317RSQNE9bI8KBkdng1ll8H47L7QM7Hig2P
+C5htmoaJA4Qx8omwc8uNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACsPRjQctB8Z
+4IM9iJnImqaOYamRDiRJuSTlEZ/dB2mmRf4UsQIBk6nyQY1/cGxamq6SWKUli1fR
+9NthLGYth+CKGV7CbrLYSRWleKTpJ2SKMG9AvtrgavY6ca6AxL6p3yckM71Eonx1
+BB0TdrYQKHiUhbbB9kXMXJNWC/fcd7comscB918uh0GynoYxXSowdnGl+OSZerti
+D69Oez5fVQ4PDv1iV3Uqd8zcUqxfsa9zX2UL4pnmHMANxFeWI4+om7rTFC0btcKQ
+IwD0Nf/pB+PAFyLHQPBrEjofpdriNJFDiDjW/+4yPxwnlQcMwXpBy4fK21gZCBqu
+LdV4oWGgz10=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -66,23 +71,28 @@ U54oXUKAY4FIYbrat+RdEKwrq3NlApysLNVT2glyptc217T7w0JuMUgwTb3DXyG+
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAJbpaoeYyF5GVt7G11oqdFKzTieoMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGJpYmxpby5iby5jbnIuaXQwHhcNMTEwNDI5MTU0ODM4
-WhcNMzEwNDI5MTU0ODM4WjAbMRkwFwYDVQQDExBiaWJsaW8uYm8uY25yLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJfFnp7SNaBBZ16ycfHpfG1A
-ZSmbJA1WQnMOkE/3LyHAcwuH4L3pzwZ+c8uHPEgb2XcWHT/ASPvVQ3WadwIhzHKM
-3xaS5Dp30fqlS/lB5jFdEOJaYGqsN0ZLsTH1krYcysm/ToDZ+PVhSCoOgdk6jG/G
-m/nrmnpyNai3uBAhOxugHadmcMGf87+fUz7W1mrqQrB+wHeF+LtogEsi77KcAwid
-snYqc/jQ5jvq2+x7ywlfFmf85aKMeyzfVO/6nXDYIEZaII/CkepegxP1CyqQsnmD
-2Wucrr+ZUo7JhgGFsF8js2vwXSQ/UAMsT+FvTni7QjhXK4jQXuiYrPhgrXKomwID
-AQABo2cwZTBEBgNVHREEPTA7ghBiaWJsaW8uYm8uY25yLml0hidodHRwczovL2Jp
-Ymxpby5iby5jbnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCT+SlxcKK+e
-etAAkTlQJ12HlnKLMA0GCSqGSIb3DQEBBQUAA4IBAQAbJeCTx4ki/AxCDbdFY9ae
-OUe1vwAPSpIKwkh4HgfxTQIYJ6qlgSDJp6tQBxU0kUMEQjVnNSm3wO1ybyAAyY09
-7ozayprctspLrZNnJ6mMac3xkJTKdndUmSaFt5P4iJCsoXAeFfnsbSgJdBmDvmYy
-wrmTmHCBy+x+Bffdkoct4jrEJLzzsegoW3Xef99vdLLUF3eABRkdqNGiSHrWxt4q
-U54oXUKAY4FIYbrat+RdEKwrq3NlApysLNVT2glyptc217T7w0JuMUgwTb3DXyG+
-1nkiY/BGUOL2/+jJkShC/nhoUFPUBy7VmLpTmaYnpLHyvSzFw/eJhmYdtWgOrHnU
+MIID9DCCAtwCCQDDKKmEOwqI4DANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+SVQxEDAOBgNVBAcTB0JvbG9nbmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyND
+TlIgLSBBcmVhIGRlbGxhIFJpY2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmli
+bGlvdGVjYTEeMBwGA1UEAxMVYmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZI
+hvcNAQkBFhhhLnR1Z25vbGlAYXJlYS5iby5jbnIuaXQwHhcNMTYwMzMwMDgyMDI3
+WhcNNDYwMzIzMDgyMDI3WjCBuzELMAkGA1UEBhMCSVQxEDAOBgNVBAcTB0JvbG9n
+bmExDjAMBgNVBAgTBUl0YWx5MSwwKgYDVQQKEyNDTlIgLSBBcmVhIGRlbGxhIFJp
+Y2VyY2EgZGkgQm9sb2duYTETMBEGA1UECxMKQmlibGlvdGVjYTEeMBwGA1UEAxMV
+YmlibGlvLXNlcnYuYm8uY25yLml0MScwJQYJKoZIhvcNAQkBFhhhLnR1Z25vbGlA
+YXJlYS5iby5jbnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5
+Sv5rRfMx/i+VbaR6FmuPGHqcJJ9V+IfbYNVu+/p6qOg+pFwqg5ZuaF674aQ1dczN
+hVgJOEG7p3TjUAGAqX46iURqX0bXVkOzwLKfXLhfqAKPr9eMSoWz6RAk0/IAQaZT
+58XEHpwTBxLqgDrH5M6gMNfXg7wY+iBsvhNakVp8Sw9vW7KiVT/fQSNu3EDSP0pB
+iqJOtUErupGBk8SdBvc1mI9ue5QkakcjsqnKdLI6cQ9jHIn4bUSBMmL3Q4b9q/0A
+/PlY4ZX29HzhGCJ8KrhpRzMjSf5CY317RSQNE9bI8KBkdng1ll8H47L7QM7Hig2P
+C5htmoaJA4Qx8omwc8uNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACsPRjQctB8Z
+4IM9iJnImqaOYamRDiRJuSTlEZ/dB2mmRf4UsQIBk6nyQY1/cGxamq6SWKUli1fR
+9NthLGYth+CKGV7CbrLYSRWleKTpJ2SKMG9AvtrgavY6ca6AxL6p3yckM71Eonx1
+BB0TdrYQKHiUhbbB9kXMXJNWC/fcd7comscB918uh0GynoYxXSowdnGl+OSZerti
+D69Oez5fVQ4PDv1iV3Uqd8zcUqxfsa9zX2UL4pnmHMANxFeWI4+om7rTFC0btcKQ
+IwD0Nf/pB+PAFyLHQPBrEjofpdriNJFDiDjW/+4yPxwnlQcMwXpBy4fK21gZCBqu
+LdV4oWGgz10=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
index 2ae28507..590e79c8 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ iaCTH9LM7/F3Hd+I
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml
index 02d5ba03..6a6a119d 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -55,6 +55,6 @@ Yddwdo55oZyYRtYPfvbI7ThZ1slkiND3U2W3u3G/XgbN0Jd8Mp6UBnLttIqus3iK
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
index 7b0467ed..87ef0225 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ Y0vFLNNUbts2J7AXDQK28bn0u2mnK6aC2eFqEgcTU6xg+qQbj81PxKigfSJRsh+R
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
index dcb69937..43cd5b6e 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ Zd682vK8XDpmc0mzv5AP2Bncmy2W1upHBNE=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml
index 25e30b97..a76ed2a5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -54,6 +54,6 @@ bNSPxoYF
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
index 0ad530f8..59552797 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ NNHD2yvkSucskE/3RZ6PzZLyXCqpyLE79J6EDbrO1gKPs6Kjqg5W0ljY
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
index ffe12fd6..ca5e4b5e 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ oDZnFjBuo5Hw31Z+O4L9t4eVzBM=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
index aa0b3571..297eb0e2 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ UFdljlsuM44ZHRRTQB7UThOzNtQaqFViwo1G86pznm4OQ5WhZqzFO8eoPb8bBtrk
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
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
index f81b7e00..b7525e7a 100644
--- 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
@@ -53,6 +53,6 @@ dPcr9FHbXBQ=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
index 1edd2b24..958e4a20 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ fwnoK0wK5Qy+Hac98sg1DygI
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
index 68873fe7..a4673b7c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ Kz+Iv2SAMUA=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
index e3b1d592..d64bbb42 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
@@ -52,6 +52,6 @@ Wma0d+CKLHPagLmm29t8EF37hZE=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
index fe1601b3..a063c8da 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
@@ -52,6 +52,6 @@ rBue0WdqjxUhj4Yyw2JK3w2jM3vzSNu7HWJ8AIBKco5rG/vo
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
index e86709c6..4795f2b4 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
@@ -54,6 +54,6 @@ I81cWocYw/rsAD2kW5C5T1nMZBlgoYk/+yXoXXGHuEI=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
index 6ac0f8d7..70502449 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ HM6p9FnQoiWszraaknJsQ8E+fjjqZ1dY
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
index 3693752d..eab832bf 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
@@ -53,6 +53,6 @@ t3FWDnyLxXBh+nay2r+6OQNF/HI0V54HHHXpFhvg3pAfZSmrhjI=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
index f8a9da46..77107bea 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ d3A0FABe5reA+KtzVrTieVTjWHGQtF2W1mNkWx2Gi1lGu25F
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml
index f82a35d2..85dc2d27 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ sIsugcTH6K28MleLFhFT1ZJ8bJ4C5QRPixp3NRKK/pTRUi24c/NtsxiW2I8=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
index e082af18..40053178 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ h8V01qfDTMmw4ASc
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
index c9134eb5..23819594 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
@@ -54,6 +54,6 @@ dQDb0gK1ALtFHsR6o+DkLOvLyImsQq8zCLwhzROY4ig=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
index 135eeff8..0661bcd4 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ uVff9vzTPfw=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml
index 1048552d..a83d98d3 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ mZA0QGYfa1EL1Q==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
index ddaf2118..8be4a74b 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ H8vDIZSNJeoj/SitEpgjanw5oNXtqn16gZcB2v/fPs2qDbs636amU6ELoV0gpQjv
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml
index 8d93b2e4..8d1a0a0f 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ GG6TK2xCAz6z3j5/OuMvrJGZ8BTGt2QC
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml
index d7f34452..f6e24f15 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ HkNhvouMOcU=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
index 92545964..48e8901c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
@@ -54,6 +54,6 @@ jZehS9P/tKKffrsqCxpzGtwrXTEfxfMsmYVKeQ==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
index 69cda8cb..428f515a 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ uZJ5q8OhIN1jFsxF2xY8T+xaHvObuZJ9246bmlRQrtx7fAkCtyfCN9zPu0STf68+
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
index 30e1a288..89eaa2d5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
@@ -52,6 +52,6 @@ TrFmg+sXdlIbAI8kQgy2xotEFE/2sXYFDC+fCZ838tg7R7cF
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
index 00cbcf9f..70351d51 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
@@ -54,6 +54,6 @@ b45SXMc+awoz7kMadUeuovVtd6ETEsnnNquJ7navnN/e7w==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
index 0e569235..557dee11 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ I7eDefwR237lfmpOKMk=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
index c3d12852..c1ddb0cd 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ y6n+48evSVkVMMX88HffZUVp9ZyNULPR3CbMua8+D0Omtx6NhUN9QPoE
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
index e3ca340d..a833dee0 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
@@ -54,6 +54,6 @@ YNCobCjLM8GtgKPZGSBhP+avu6w=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
index 209b9e9d..1797c6c5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ yPzz3RRNmKq5lLVVYikx8FVc4IVMw9++ixM=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
index f6d5f4c2..fa131cfe 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
@@ -54,6 +54,6 @@ DdbjKB6UO7mTuqPKUxkGG2oviO3YApEyi1jggBDOeblg450UyjsTJcivVg2prmgB
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
index 3f48ae33..a29faf11 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
@@ -52,6 +52,6 @@ waSgkcygO9PTBU5lKpmYMlUx
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
index dd0c04c3..6f8d7cc9 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -54,6 +54,6 @@ DoLyd1u8
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
index 29a30936..887eac87 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ dGs7tUiZlHqo6haH9iSvsbsBOq6pPaZR8cX1As206778PAS6Q6U=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml
index 97bc1987..9d34819c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -55,6 +55,6 @@ fxDMnDXCEVeGDaSfpKS59rujNM6pWzUKYjZQiokpUDvikcroFe8BbdhqDwndle76
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
index 9744cecf..9377e793 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
@@ -55,6 +55,6 @@ AQAN4xTeTap6sBe0PnPwfOfw8dqIaPHDqMmY0HsPSjxWsUHvBhtLFOi1dddIXjw8
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
index 4ef91847..14ee49fc 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ p+TiM/eBbXCraZ32+zNbKfPC
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml
deleted file mode 100644
index 6b21f5b1..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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://birk.wayf.dk/birk.php/wayf.kum.dk/saml2/idp/metadata.php">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-10-27T13:39:42Z" 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">dsn.dk</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="da">Dansk Sprognævn</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Danish Language Council</mdui:DisplayName>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>dsn.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>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
-YXlmLmt1bS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
-MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cHM6Ly93YXlmLmt1bS5k
-ay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
-lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
-x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
-jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
-tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
-d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQCrWx3Zrlrbj1kGSlbADTE1MQ40Q0dN+A9HdEUrt68BvTgvr0Qz5pinXL3gFFMv
-YgSprMT/PAGuXJeRiaxWFi6vsUbM8ie4KnP1tUsDvlKTGt8yZRzbiHBPJ+cl7iM/
-iNeJWFcLFamx4uXc0Lrn0mYdQCiknB6OOF11zl837WxOZILuFa7eZanR286emuIo
-JY3Dihrlt0esADrBci2CwRwSljlSJ/Y4FW+7bD8KY2ObxbQSxhzoeiDD8lSbOrVO
-cKGhtXil7cspCMSTbNpbSpIcgel6CauLSRw5R2qJBAd7KHm6eQGBOXzVDIOQR3tc
-j2IrcoJ3QM317FlrycurdCEq
-</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/wayf.kum.dk/saml2/idp/SSOService.php"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="da">Dansk Sprognævn</md:OrganizationName>
- <md:OrganizationName xml:lang="en">Danish Language Council</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="da">Dansk Sprognævn</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Danish Language Council</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="da">http://www.dsn.dk</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.dsn.dk</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/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
index 9154f45b..716331a6 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
@@ -52,6 +52,6 @@ v93+XEHzeHHw5pwvSa0YWMs2hXkVYFnHrTicG9bEV6qKoNYG
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
index ca5e4297..a2de999c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
@@ -52,6 +52,6 @@ G9baPBH3swAjkG8Aa/+wabJPIBCF5mR8nO9gQQk4wgs17mS6
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
index f1a09006..6519e816 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
@@ -53,6 +53,6 @@ FCi7nKlzaklaH/SOTHq/dQBIWfezdWZwzJez/ZlcHeFV8g==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
index 5f2fb9bf..798d8919 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
@@ -52,6 +52,6 @@ LvJ2p7KuCR1XMFXRBimf3zUsLH5CKx4AOaUJ+A==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
index 6c23adea..4f010773 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
@@ -53,6 +53,6 @@ r/xz9uFt2RzjLOXXnNTxdxNYM+57s7iSEGi7ysNfGUZJ8IY8sv2qGwGpYRcE+M6f
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml
index 47da105b..a69bf1ec 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml
@@ -56,6 +56,6 @@ LV8Nl3w74u1j520EDfu3HQ==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
index 4de1a3fe..0814c6cc 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
@@ -56,6 +56,6 @@ Z8bY2QouT70h3w+L
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml
index 9a415086..883bb3da 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml
@@ -54,6 +54,6 @@ YWDGqSgnwi1H313Tol8U/A==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml
index 1fe1ea03..e8812f84 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml
@@ -56,6 +56,6 @@ gldjnwhQkoXCB2mN
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml
index 0031edae..b92ada72 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml
@@ -56,6 +56,6 @@ q1H8RSir+nACRQ/fLPgySCU97iU=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
index 7c5c7d4f..23d5a547 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
@@ -56,6 +56,6 @@ Z0FIk7cDlCfAO6WS9Da4VQ==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
index 9ee33d27..85d96402 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
@@ -55,6 +55,6 @@ XUPP28ILRNV6EqIHjKw4XqDP
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
index 022d8ed6..8daa2096 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -55,6 +55,6 @@ p2YMU09Pb33T82fJfzyq0fwa2AhboACWsblekPEHoMxrzNQUuKzcoGbK+WI=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
index a057c503..3ba4ca3f 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
@@ -53,6 +53,6 @@ tPD3c+RitftZZdVVSFgdbMdcTZ3log==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml
index f216a466..0ea8336f 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml
@@ -55,6 +55,6 @@ Wl7WIRfFhXMrMTMiDDMGbZpFe+s=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
index 8ed99928..655583f4 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
@@ -53,6 +53,6 @@ adTtql0la2qKXumMxXSsTKT5/gU1yg==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
index 12ef2347..cbe6254e 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
@@ -53,6 +53,6 @@ oTQy5sOe4dSs2/n4/PlkBFwsHcE=
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
index 9bc5f3f8..48b4690a 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
@@ -55,6 +55,6 @@ AKktIsPch1tYllp+fb1/Be5pd2o+Aw==
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
index feb36a41..d322b706 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -54,6 +54,6 @@ lsZ14BWXRzkq1VI5Y+Zp/Zq3t8JSNW+T0O/TJXvjt5mdYhu9YKFTMVMujjE4v7qv
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml
index a25c46b7..9487dc5c 100644
--- a/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml
@@ -36,39 +36,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEhDCCA2ygAwIBAgIRAMLq8DxqQ9VM4MxH2N6y4W0wDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MDkwMDAwMDBaFw0xNjA0MDgyMzU5NTlaMEkxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbYndpZHBzMTIw
- MS5icmlkZ3dhdGVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
- AQEA0vlQR95+UaFwqN9If+FF/DU6lCK2B3IMNchzTjKYy+JjlA1HvOHRk3YvbqZZ
- HYER7PGKedRiSLXp84T3+j1LJt0NsCsusT2HqJUOMtmA4TIJykbUCszM1+AhdlrM
- EvZa64Sex4YHU/5pbhJM56Wvv407Zu8MadScmFI/wTUSbXFivXQ3Bo8oBS3noMGM
- Vm5zWZo25rhdz9TKqIiqH8zIIrNoSDT/euxWFQHC+SaL63hvClgGKTskQPHtawsZ
- eVwKvvK/3VA2kvp32cSyrakYQMSMUaDj/WJUL+hyhRAtVvHeF3cqiKj1260vbW26
- 1WGm1lm4Y2m4QTGnzvi/1TkO3wIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
- aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB33fJXVzgHhXKe+YK6Bry+6aYIV
- MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
- BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
- ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
- UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
- Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
- hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtid2lkcHMx
- MjAxLmJyaWRnd2F0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7LFjSMYEy9
- ZE++GoD34F7WvVSqKoHBKtAqemCe4xFzTCzskZhLkOY6SXnJJtbq5/DHpd2qL22g
- wnhNCJtzTTzZSuzNrFzOeWhp1m+bJH/8Xcjl/5Cf/Eo4BIfeSrQuJOPSdxMMWG6A
- tLzewEIs6Ibb+b8sUy7j8BA9ky+skXRQL2SlM3ioMDYIiK8Jckk1OKd1U35KQ++i
- VKdye05mxWSD5Mknta9K1c8biDUf2BqPgy8+QsE2AvfY8+Nov3+bJq6ksSuwAXb6
- nGnCuRnmVxN86RptKz5oaKroizlEAlQY7CaJ0vzcP9nqMA9B3A5JuUeIgKYEjEjA
- +4L3YUYYg5I=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -108,39 +75,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEhDCCA2ygAwIBAgIRAMLq8DxqQ9VM4MxH2N6y4W0wDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MDkwMDAwMDBaFw0xNjA0MDgyMzU5NTlaMEkxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbYndpZHBzMTIw
- MS5icmlkZ3dhdGVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
- AQEA0vlQR95+UaFwqN9If+FF/DU6lCK2B3IMNchzTjKYy+JjlA1HvOHRk3YvbqZZ
- HYER7PGKedRiSLXp84T3+j1LJt0NsCsusT2HqJUOMtmA4TIJykbUCszM1+AhdlrM
- EvZa64Sex4YHU/5pbhJM56Wvv407Zu8MadScmFI/wTUSbXFivXQ3Bo8oBS3noMGM
- Vm5zWZo25rhdz9TKqIiqH8zIIrNoSDT/euxWFQHC+SaL63hvClgGKTskQPHtawsZ
- eVwKvvK/3VA2kvp32cSyrakYQMSMUaDj/WJUL+hyhRAtVvHeF3cqiKj1260vbW26
- 1WGm1lm4Y2m4QTGnzvi/1TkO3wIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
- aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB33fJXVzgHhXKe+YK6Bry+6aYIV
- MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
- BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
- ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
- UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
- Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
- hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtid2lkcHMx
- MjAxLmJyaWRnd2F0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7LFjSMYEy9
- ZE++GoD34F7WvVSqKoHBKtAqemCe4xFzTCzskZhLkOY6SXnJJtbq5/DHpd2qL22g
- wnhNCJtzTTzZSuzNrFzOeWhp1m+bJH/8Xcjl/5Cf/Eo4BIfeSrQuJOPSdxMMWG6A
- tLzewEIs6Ibb+b8sUy7j8BA9ky+skXRQL2SlM3ioMDYIiK8Jckk1OKd1U35KQ++i
- VKdye05mxWSD5Mknta9K1c8biDUf2BqPgy8+QsE2AvfY8+Nov3+bJq6ksSuwAXb6
- nGnCuRnmVxN86RptKz5oaKroizlEAlQY7CaJ0vzcP9nqMA9B3A5JuUeIgKYEjEjA
- +4L3YUYYg5I=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/cafe.ufpel.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufpel.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..fe7e109b
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ufpel.edu.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.ufpel.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">UFPel - Universidade Federal de Pelotas</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</mdui:DisplayName>
+ <mdui:Description xml:lang="en">UFPel - Universidade Federal de Pelotas</mdui:Description>
+ <mdui:Description xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ufpel.edu.br</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="pt-br">http://www.ufpel.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>
+ MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxMDAuBgNVBAoTJ1VGUGVsIC0g
+VW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVsb3RhczESMBAGA1UECxMJQ1RJLVJl
+ZGVzMSEwHwYJKoZIhvcNAQkBFhJyZWRlc0B1ZnBlbC5lZHUuYnIxEDAOBgNVBAcT
+B1BlbG90YXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJC
+UjEaMBgGA1UEAxMRY2FmZS51ZnBlbC5lZHUuYnIwHhcNMTYwMjAzMTI0MjU4WhcN
+MTkwMjAyMTI0MjU4WjCBwDEwMC4GA1UEChMnVUZQZWwgLSBVbml2ZXJzaWRhZGUg
+RmVkZXJhbCBkZSBQZWxvdGFzMRIwEAYDVQQLEwlDVEktUmVkZXMxITAfBgkqhkiG
+9w0BCQEWEnJlZGVzQHVmcGVsLmVkdS5icjEQMA4GA1UEBxMHUGVsb3RhczEaMBgG
+A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFj
+YWZlLnVmcGVsLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKe6wNljSw+nFuwJHZWc9LEPraUrwTUmxVrZ7GQCrWQmw6Sci5cJU+qHGfN8r/Ca
+X/VqkJPk9IheSpzsvU+Jj5X0TUmG5HBhVHc5zsDaGdLxTmPPL8tMS8ZNJpzU7/vY
+JEH3rOYmW6ZQI44tiO+1/xS2NVBbDAd0QqNcz11tjSSe59Zg0mVi4xSePCcYT295
+B0ZcEkeFmPX38SZ8gw3AOGlCBmFFhkjUZ1WO1/K3qJpL716HJU2GlaZ4gB4FS2dz
+VbeebsT/hon8Pc+OkqZnJUiL3BrKkoPF0OhgP99ZAzb+Zp60lMzPbCd4oz3aJSh7
+23cIyqy1RDSvJX6Mn9XmKrsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAi3uyG/Sn
+FTbkDgpF1bK82QPwDs06lwy8Nf1Ob0lYCn9m76OIk4deCeBTTak98bLyN0VVmMUU
+CFsMMonKBkyDOOA3HZYZ5cxBw+3PZLa8Vb8PJ4siub9cgO+VMhN5sLrLU9LLf7H+
+Y0s+csJy3VSpe77RY+orKjNZHN9znrJN2tHYUtvsuhzQhDddEJ14y4XbHbao1KD6
+EXoDP3ldJUoUo3wDA3eN6urbwGYD/UNYWmT0hBUGoqFwwmCGv9oFWXHE8u3h6tMV
+aeix9kmKvF9h4GRe0+sqKoK44rQsbmrVjIAzSmjTyuqjmdppEjNboPIVGh109g5m
+7n6tw8BmIk3amQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpel.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.ufpel.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.ufpel.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufpel.edu.br/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufpel.edu.br/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufpel.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>
+
+MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxMDAuBgNVBAoTJ1VGUGVsIC0g
+VW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVsb3RhczESMBAGA1UECxMJQ1RJLVJl
+ZGVzMSEwHwYJKoZIhvcNAQkBFhJyZWRlc0B1ZnBlbC5lZHUuYnIxEDAOBgNVBAcT
+B1BlbG90YXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJC
+UjEaMBgGA1UEAxMRY2FmZS51ZnBlbC5lZHUuYnIwHhcNMTYwMjAzMTI0MjU4WhcN
+MTkwMjAyMTI0MjU4WjCBwDEwMC4GA1UEChMnVUZQZWwgLSBVbml2ZXJzaWRhZGUg
+RmVkZXJhbCBkZSBQZWxvdGFzMRIwEAYDVQQLEwlDVEktUmVkZXMxITAfBgkqhkiG
+9w0BCQEWEnJlZGVzQHVmcGVsLmVkdS5icjEQMA4GA1UEBxMHUGVsb3RhczEaMBgG
+A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFj
+YWZlLnVmcGVsLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKe6wNljSw+nFuwJHZWc9LEPraUrwTUmxVrZ7GQCrWQmw6Sci5cJU+qHGfN8r/Ca
+X/VqkJPk9IheSpzsvU+Jj5X0TUmG5HBhVHc5zsDaGdLxTmPPL8tMS8ZNJpzU7/vY
+JEH3rOYmW6ZQI44tiO+1/xS2NVBbDAd0QqNcz11tjSSe59Zg0mVi4xSePCcYT295
+B0ZcEkeFmPX38SZ8gw3AOGlCBmFFhkjUZ1WO1/K3qJpL716HJU2GlaZ4gB4FS2dz
+VbeebsT/hon8Pc+OkqZnJUiL3BrKkoPF0OhgP99ZAzb+Zp60lMzPbCd4oz3aJSh7
+23cIyqy1RDSvJX6Mn9XmKrsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAi3uyG/Sn
+FTbkDgpF1bK82QPwDs06lwy8Nf1Ob0lYCn9m76OIk4deCeBTTak98bLyN0VVmMUU
+CFsMMonKBkyDOOA3HZYZ5cxBw+3PZLa8Vb8PJ4siub9cgO+VMhN5sLrLU9LLf7H+
+Y0s+csJy3VSpe77RY+orKjNZHN9znrJN2tHYUtvsuhzQhDddEJ14y4XbHbao1KD6
+EXoDP3ldJUoUo3wDA3eN6urbwGYD/UNYWmT0hBUGoqFwwmCGv9oFWXHE8u3h6tMV
+aeix9kmKvF9h4GRe0+sqKoK44rQsbmrVjIAzSmjTyuqjmdppEjNboPIVGh109g5m
+7n6tw8BmIk3amQ==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpel.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpel.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">UFPel - Universidade Federal de Pelotas</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">UFPel - Universidade Federal de Pelotas</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">UFPel - Universidade Federal de Pelotas</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ufpel.edu.br</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="pt-br">http://www.ufpel.edu.br</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>CTI Redes</md:SurName>
+ <md:EmailAddress>redes@ufpel.edu.br</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
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
deleted file mode 100644
index 0e9858df..00000000
--- a/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.crous-lyon.fr/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-28T18:15:13Z">
- <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">crous-lyon.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">CROUS Lyon-Personnels</mdui:DisplayName>
- <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 Lyon-Personnels</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>
- 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>
- </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://cas.crous-lyon.fr/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.crous-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.crous-lyon.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">crous-lyon.fr</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- 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>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.crous-lyon.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">CROUS Lyon-Personnels</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">CROUS Lyon-Personnels</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.crous-lyon.fr</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>sinfo@crous-lyon.fr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml
index 93c87541..853c48f9 100644
--- a/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml
@@ -28,6 +28,14 @@
<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/df9b663261436f0d31a332a5e17161b1"/>
</md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="nl">Clusius College</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Clusius College</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="nl">Clusius College</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Clusius College</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="nl">http://www.clusius.nl</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.clusius.nl</md:OrganizationURL>
+ </md:Organization>
<md:ContactPerson contactType="administrative">
<md:GivenName>SURFconext support</md:GivenName>
<md:EmailAddress>support@surfconext.nl</md:EmailAddress>
diff --git a/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml b/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml
deleted file mode 100644
index da7fa6e1..00000000
--- a/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dl.acm.org/oa/metadata">
- <!--
- This is an OpenAthens 2 SP for Association for Computing Machinery, Inc.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
- </Extensions>
- <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDWDCCAkCgAwIBAgIJANUcbffHlTOXMA0GCSqGSIb3DQEBBQUAMCYxDzANBgNV
- BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZzAeFw0xMTA1MjUxNTUzMDVa
- Fw0yMTA1MjIxNTUzMDVaMCYxDzANBgNVBAoTBkFDTSBETDETMBEGA1UEAxMKZGwu
- YWNtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQ8v2TtExw3
- 8oEYHxxUGRz1IrTTL7S3oHxZjeBVo4ZayLZQH8bA1qiPIJOodP0i66TA1k3GzdFz
- jtXudOb6AitHb8Mk3G4JWlOsb+ADPUjFOJ3ju04F10TQfYbLojfWlyoZKwLQ3ah+
- ua0epuBbTj9dr/AgvCskfzqGthLCxc+MaQAX9bbiLrpaVLANVTg5NxXjJ3AQoWRD
- GSfnLFfeaj6P5X8w4ZVW7+a89I5BYyD9p4Dv41Y7JUJQYMrYO5ue56anlAnYfJOU
- 2iHiHRE1M55Bw/y8D73KzRJjHxEsbyOSeupyJnwrYPQdHNfTyZI+FG4qe6kOc3u0
- 8HSIqNoNrUcCAwEAAaOBiDCBhTAdBgNVHQ4EFgQUPEvl50vhfaxj5glDDqOnOXXA
- QTAwVgYDVR0jBE8wTYAUPEvl50vhfaxj5glDDqOnOXXAQTChKqQoMCYxDzANBgNV
- BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZ4IJANUcbffHlTOXMAwGA1Ud
- EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALDE3j+ryj/f1A0f2425vnckVzZd
- fu5I6YyyY6p4jYbc9iF72M2JqoQpZAsuzIM2Ma0mJqTCHRpwgfbKsDcIAXJPaIxL
- ssIElCPzTNvIKHRszZtf+bNoE9rVYa5l+PBkJGxtDy1kyzc65AU4uJTtmlgpgzmd
- 3UVCw4IF1iqhuU925ywULLDl+Ly7bFuif24A4ipqwPEzp9jOTfqkYSUPbCV8mJcE
- 6v6LJ5QxHWswmrQmKtsWxM/W+zqZHiUxfvJyP/iLtdFbnK8v60wK56zj5aTmP9Dy
- KJoG3T5FEG114OLU9sciO8Tq0Ck/Yhax6jFuAabY2lKXa/Q/gxw+e/+/JlA=
- </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>
- MIIDWDCCAkCgAwIBAgIJANUcbffHlTOXMA0GCSqGSIb3DQEBBQUAMCYxDzANBgNV
- BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZzAeFw0xMTA1MjUxNTUzMDVa
- Fw0yMTA1MjIxNTUzMDVaMCYxDzANBgNVBAoTBkFDTSBETDETMBEGA1UEAxMKZGwu
- YWNtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQ8v2TtExw3
- 8oEYHxxUGRz1IrTTL7S3oHxZjeBVo4ZayLZQH8bA1qiPIJOodP0i66TA1k3GzdFz
- jtXudOb6AitHb8Mk3G4JWlOsb+ADPUjFOJ3ju04F10TQfYbLojfWlyoZKwLQ3ah+
- ua0epuBbTj9dr/AgvCskfzqGthLCxc+MaQAX9bbiLrpaVLANVTg5NxXjJ3AQoWRD
- GSfnLFfeaj6P5X8w4ZVW7+a89I5BYyD9p4Dv41Y7JUJQYMrYO5ue56anlAnYfJOU
- 2iHiHRE1M55Bw/y8D73KzRJjHxEsbyOSeupyJnwrYPQdHNfTyZI+FG4qe6kOc3u0
- 8HSIqNoNrUcCAwEAAaOBiDCBhTAdBgNVHQ4EFgQUPEvl50vhfaxj5glDDqOnOXXA
- QTAwVgYDVR0jBE8wTYAUPEvl50vhfaxj5glDDqOnOXXAQTChKqQoMCYxDzANBgNV
- BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZ4IJANUcbffHlTOXMAwGA1Ud
- EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALDE3j+ryj/f1A0f2425vnckVzZd
- fu5I6YyyY6p4jYbc9iF72M2JqoQpZAsuzIM2Ma0mJqTCHRpwgfbKsDcIAXJPaIxL
- ssIElCPzTNvIKHRszZtf+bNoE9rVYa5l+PBkJGxtDy1kyzc65AU4uJTtmlgpgzmd
- 3UVCw4IF1iqhuU925ywULLDl+Ly7bFuif24A4ipqwPEzp9jOTfqkYSUPbCV8mJcE
- 6v6LJ5QxHWswmrQmKtsWxM/W+zqZHiUxfvJyP/iLtdFbnK8v60wK56zj5aTmP9Dy
- KJoG3T5FEG114OLU9sciO8Tq0Ck/Yhax6jFuAabY2lKXa/Q/gxw+e/+/JlA=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dl.acm.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dl.acm.org/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dl.acm.org/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dl.acm.org/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Association for Computing Machinery, Inc.</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Association For Computing Machinery: ACM Digital Library</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.acm.org/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Asad</GivenName>
- <SurName>Ali</SurName>
- <EmailAddress>mailto:ali@acm.org</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Adam</GivenName>
- <SurName>Greenberg</SurName>
- <EmailAddress>mailto:greenberg@acm.org</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..48c05039
--- /dev/null
+++ b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ed.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "public" TOPdesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T08:56:17Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDrzCCApegAwIBAgIJAMVROTQuFXoxMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+ BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+ CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1MFoXDTI2MDMzMDEyNTc1MFowQzEZ
+ MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+ AQDBSIaEqZsBLHTmdv2pTau02z5iX2M+Y/I7rY3SBWy/is2bfuBuEzPS58oPMeHi
+ wFjfr8CAPQ2bQ32GK3lbvQzVAZqwabe+s+hcsdLFSmm26GxrmgbiL/U1Inx32gHL
+ 8Y494i1DNURJl7ImhY1LtSQBg81C/7uOf1P6pDoWQcUSooN+I0WLKVf4S5JGU4WW
+ 7uCUGFTVIEGFwveU4cpE/B1i6kuu1zq1n3X0zRyFG1Uu34fzujM8+0rlh/w9yl67
+ hq8qAHL/9j0909WXeaOXj/TPYSRISQCnq2biEmzOb09Jb/2/5gRFUSRVxh3fm5HT
+ P1YDRav07OAGGhSmC75JTJvJAgMBAAGjgaUwgaIwHQYDVR0OBBYEFPHFACKjBapO
+ RoiScm580WU4EzPbMHMGA1UdIwRsMGqAFPHFACKjBapORoiScm580WU4EzPboUek
+ RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+ ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAMVROTQuFXoxMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBAFOywZTwbtNhO4YAicWZ1MLcJoZnD3diuQhccHKO
+ zaWZJju/OxbF4rurP3BH0rqJxruXwksD3bk45PKKTb6jLlBkRsqaTrSRL/Z/M6Hs
+ NWy1pBAjP4EMEB+2Tmnikqx/e6BdfhogcPAwFAtup6u9H+kFY/tzprNH20q+07Gk
+ yFKCJJwKZac1TFHLGA6PIzVFOuNqyFQGFqxVew/oL94UCJTTwtLTTuIPvpZaCTo+
+ IyjlIMVigvenyr68jnkrJCgsberkaoPyxP00uK4QvdA0E9by1SvwNVy420Kvvb6+
+ x/fFAXseVm8uRjmuM2HiffZhqgSKm1X1S4+nJ6HXYjGo8+g=
+ </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>
+ MIIDrzCCApegAwIBAgIJAMVROTQuFXoxMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+ BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+ CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1MFoXDTI2MDMzMDEyNTc1MFowQzEZ
+ MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+ AQDBSIaEqZsBLHTmdv2pTau02z5iX2M+Y/I7rY3SBWy/is2bfuBuEzPS58oPMeHi
+ wFjfr8CAPQ2bQ32GK3lbvQzVAZqwabe+s+hcsdLFSmm26GxrmgbiL/U1Inx32gHL
+ 8Y494i1DNURJl7ImhY1LtSQBg81C/7uOf1P6pDoWQcUSooN+I0WLKVf4S5JGU4WW
+ 7uCUGFTVIEGFwveU4cpE/B1i6kuu1zq1n3X0zRyFG1Uu34fzujM8+0rlh/w9yl67
+ hq8qAHL/9j0909WXeaOXj/TPYSRISQCnq2biEmzOb09Jb/2/5gRFUSRVxh3fm5HT
+ P1YDRav07OAGGhSmC75JTJvJAgMBAAGjgaUwgaIwHQYDVR0OBBYEFPHFACKjBapO
+ RoiScm580WU4EzPbMHMGA1UdIwRsMGqAFPHFACKjBapORoiScm580WU4EzPboUek
+ RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+ ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAMVROTQuFXoxMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBAFOywZTwbtNhO4YAicWZ1MLcJoZnD3diuQhccHKO
+ zaWZJju/OxbF4rurP3BH0rqJxruXwksD3bk45PKKTb6jLlBkRsqaTrSRL/Z/M6Hs
+ NWy1pBAjP4EMEB+2Tmnikqx/e6BdfhogcPAwFAtup6u9H+kFY/tzprNH20q+07Gk
+ yFKCJJwKZac1TFHLGA6PIzVFOuNqyFQGFqxVew/oL94UCJTTwtLTTuIPvpZaCTo+
+ IyjlIMVigvenyr68jnkrJCgsberkaoPyxP00uK4QvdA0E9by1SvwNVy420Kvvb6+
+ x/fFAXseVm8uRjmuM2HiffZhqgSKm1X1S4+nJ6HXYjGo8+g=
+ </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://ed.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Unidesk - University of Edinburgh</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..c931a7d9
--- /dev/null
+++ b/swamid-interfederations-2.0/ed.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ed.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "secure" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T08:58:23Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDrzCCApegAwIBAgIJAKj/uVWYBQrKMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+ BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+ CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1M1oXDTI2MDMzMDEyNTc1M1owQzEZ
+ MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+ AQCqrCvKLV1axFbGxCwT8E+BbMcGKXuG180hmZPwSXsrrAWg6ErYjOORQ2UCw2Xp
+ tVam+WiuRdpxHrtoT7tCM2VHrKcMleWhXPvSsoH6EZ3kzFVCgojnhCg6IiCpoG/7
+ n32HuoD8kWEKyKTrPeOriDz2LIgdMI2EWFFgLK2r9vBo8Ko7ANiGzgymnRyQSQjQ
+ gaHAgUowjFBxjH/0MOFut4rrCgA7o/7w46eBv5JpAvnrCBikfbiguQf36WACA1Qz
+ 307fSVQL7R60/KULWGmRoXjWWPSgCtyspnP8ILG/v+HlQag5ExDKcx36flIvwmp2
+ n3MsNNYVrXFt7Nn08Gec4ka/AgMBAAGjgaUwgaIwHQYDVR0OBBYEFOfVReESELZa
+ C7UqM5LhyvTG1uEDMHMGA1UdIwRsMGqAFOfVReESELZaC7UqM5LhyvTG1uEDoUek
+ RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+ ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAKj/uVWYBQrKMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBAHGzM2Pw3YkZy8lZrKHzXhTOM74v9hMiBJgQw9/d
+ b/NV7HdY3Qd0DuQfM1jlCiOzfh/tIF6Fh45NbuYcGZ5Aw6NeWg1H/Yd9OEDxdEnR
+ ChRBqMu3LFuaUk+88gnyCGg8hS2R00RNHIzYlXlh+JgWnE+/2q5tGFQ8CfMl95XG
+ 50w/eWY19/pfqosdNZyutk/tXwzHPcrI+n8iW2JkUe9Gasfg7JvQeCNpoF2erM4v
+ EvEue9SE6lLcP4L5gVPVo0ibvIIWUPIYVXjbKCDZjBgOWafwklfYdRbclNyPSSVq
+ vzrXt+sPz4+CBoOXgthUcvZwFNzMBoIm2wWZdJn4RI38rHA=
+ </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>
+ MIIDrzCCApegAwIBAgIJAKj/uVWYBQrKMA0GCSqGSIb3DQEBCwUAMEMxGTAXBgNV
+ BAMTEGVkLnVuaWRlc2suYWMudWsxGTAXBgNVBAoTEGVkLnVuaWRlc2suYWMudWsx
+ CzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyNTc1M1oXDTI2MDMzMDEyNTc1M1owQzEZ
+ MBcGA1UEAxMQZWQudW5pZGVzay5hYy51azEZMBcGA1UEChMQZWQudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+ AQCqrCvKLV1axFbGxCwT8E+BbMcGKXuG180hmZPwSXsrrAWg6ErYjOORQ2UCw2Xp
+ tVam+WiuRdpxHrtoT7tCM2VHrKcMleWhXPvSsoH6EZ3kzFVCgojnhCg6IiCpoG/7
+ n32HuoD8kWEKyKTrPeOriDz2LIgdMI2EWFFgLK2r9vBo8Ko7ANiGzgymnRyQSQjQ
+ gaHAgUowjFBxjH/0MOFut4rrCgA7o/7w46eBv5JpAvnrCBikfbiguQf36WACA1Qz
+ 307fSVQL7R60/KULWGmRoXjWWPSgCtyspnP8ILG/v+HlQag5ExDKcx36flIvwmp2
+ n3MsNNYVrXFt7Nn08Gec4ka/AgMBAAGjgaUwgaIwHQYDVR0OBBYEFOfVReESELZa
+ C7UqM5LhyvTG1uEDMHMGA1UdIwRsMGqAFOfVReESELZaC7UqM5LhyvTG1uEDoUek
+ RTBDMRkwFwYDVQQDExBlZC51bmlkZXNrLmFjLnVrMRkwFwYDVQQKExBlZC51bmlk
+ ZXNrLmFjLnVrMQswCQYDVQQGEwJVS4IJAKj/uVWYBQrKMAwGA1UdEwQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggEBAHGzM2Pw3YkZy8lZrKHzXhTOM74v9hMiBJgQw9/d
+ b/NV7HdY3Qd0DuQfM1jlCiOzfh/tIF6Fh45NbuYcGZ5Aw6NeWg1H/Yd9OEDxdEnR
+ ChRBqMu3LFuaUk+88gnyCGg8hS2R00RNHIzYlXlh+JgWnE+/2q5tGFQ8CfMl95XG
+ 50w/eWY19/pfqosdNZyutk/tXwzHPcrI+n8iW2JkUe9Gasfg7JvQeCNpoF2erM4v
+ EvEue9SE6lLcP4L5gVPVo0ibvIIWUPIYVXjbKCDZjBgOWafwklfYdRbclNyPSSVq
+ vzrXt+sPz4+CBoOXgthUcvZwFNzMBoIm2wWZdJn4RI38rHA=
+ </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://ed.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Unidesk - University of Edinburgh</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml
deleted file mode 100644
index beaa26a8..00000000
--- a/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eduid.jamu.cz/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-11-08T10:04:45Z">
- <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">jamu.cz</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Janacek Academy of Music and Performing Arts in Brno</mdui:DisplayName>
- <mdui:DisplayName xml:lang="cs">Janáčkova akademie múzických umění v Brně</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for employees and students of the Janacek Academy of Music and Performing Arts in Brno</mdui:Description>
- <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Janáčkovy akademie múzických umění v Brně</mdui:Description>
- <mdui:Logo height="113" width="111">https://www.jamu.cz/graphics/janacek.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>
-MIIFqDCCBJCgAwIBAgIQCBZxmLU34g304oOobnlcojANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTAzMTMwMDAwMDBaFw0xODAzMTIyMzU5NTlaMDsxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNZWR1aWQuamFtdS5j
-ejCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5hgfGmKJOxvo77wH72
-QCm33kBmqxoaP3vR+8mmfMKy2an5OfGLdurbiaECmgwBxCgyknaodqRU7uXVBwki
-aIMNsKvv26KcAIekFKe/GWwIgYVnFsncLZDbGTy+vI0SKthLdapJtiL7xzxJgrx4
-ymiMHeubEuOC6Cgfpi4mpUzPPMff2O21F8B5PCZeRT0N2PzucQJhndW1lqUZoDM5
-JBKWjnTm+uQv+ogbB1Pyv+eFPohhvJLa6nNYVVPeMCMzDFZMtlfGwddfV6/SQqss
-ye+fivGL4mNZw1orP0c5YCZIYFeL5heg5kvfNO27RpKYoR1jysvtx4kj61zjKdwx
-pTHcFVa0IrUgk1B+NVUoEqcmFYfqb+v2k88WZmwbRpgS5oqHB8ghULejGDVdPeE2
-EKbO8NlUf79+e/XdkV0iC+BXKCtslWV6KT1j/rkPFDg3gln+kuOx0VWVZNsDbp7u
-o7YyxAo6nnZr/BsG91KzLmq0x7b+2PhQKU+y1zXDZRXFw3NirwSho55VCT2ojhMM
-bVU2yPFKBwankWvurAUwdYRnMNivUxlFtIZPwd6puZC/h/UdFnOKhrcC0SFp63Cj
-kVYc4aDeyk5eK3DczVGsHLLcNmQxA8m7pkBguBvJ++SLEiW5oEVRaXKr3PAy7b36
-Z86HO5jX6vcOslx3q+oiBwNTAgMBAAGjggF9MIIBeTAfBgNVHSMEGDAWgBRb0Ioc
-mjJb4LXdllQb4YYosP22vTAdBgNVHQ4EFgQUUlDt3t01Naw+DK2fBg+WZHWpYpIw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJF
-TkFTU0xDQTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGG
-GWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wLAYDVR0RBCUwI4INZWR1aWQuamFt
-dS5jeoISc2hpYmJvbGV0aC5qYW11LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA3OyhB
-6PSVkoWQp37t1AcSR4irdkjT5+9gpHRortS6m1ydhcdFxcB/BW+85/yvWgpHxBnb
-t9g5b5fa0jyl6sp0M2VeSTdCb3uelqOnapBiIagdR7wyagxfBCbpdVqD1UZX5vFQ
-g4C0mjiaSQd9Ksvo6L9NMCtcameYBuxtUKi/Of88dRZPX/WQRTHYYsq4gTmRekgL
-FoJ7e0uBbvvNNVEwiriba9C1hreED5k8Tdlun0dk3QNCZP4uEOM3kng/Hy/ZDKIf
-DdDexXrGQ9wBME/kfcV3Rb4KluRSh3UhTVSXGgOjQ0f6WlEBO+NMdsYH+kDe1YDw
-yASlKAcsuc4JfDB8
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://eduid.jamu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eduid.jamu.cz/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.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://eduid.jamu.cz/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eduid.jamu.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">jamu.cz</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIFqDCCBJCgAwIBAgIQCBZxmLU34g304oOobnlcojANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTAzMTMwMDAwMDBaFw0xODAzMTIyMzU5NTlaMDsxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNZWR1aWQuamFtdS5j
-ejCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5hgfGmKJOxvo77wH72
-QCm33kBmqxoaP3vR+8mmfMKy2an5OfGLdurbiaECmgwBxCgyknaodqRU7uXVBwki
-aIMNsKvv26KcAIekFKe/GWwIgYVnFsncLZDbGTy+vI0SKthLdapJtiL7xzxJgrx4
-ymiMHeubEuOC6Cgfpi4mpUzPPMff2O21F8B5PCZeRT0N2PzucQJhndW1lqUZoDM5
-JBKWjnTm+uQv+ogbB1Pyv+eFPohhvJLa6nNYVVPeMCMzDFZMtlfGwddfV6/SQqss
-ye+fivGL4mNZw1orP0c5YCZIYFeL5heg5kvfNO27RpKYoR1jysvtx4kj61zjKdwx
-pTHcFVa0IrUgk1B+NVUoEqcmFYfqb+v2k88WZmwbRpgS5oqHB8ghULejGDVdPeE2
-EKbO8NlUf79+e/XdkV0iC+BXKCtslWV6KT1j/rkPFDg3gln+kuOx0VWVZNsDbp7u
-o7YyxAo6nnZr/BsG91KzLmq0x7b+2PhQKU+y1zXDZRXFw3NirwSho55VCT2ojhMM
-bVU2yPFKBwankWvurAUwdYRnMNivUxlFtIZPwd6puZC/h/UdFnOKhrcC0SFp63Cj
-kVYc4aDeyk5eK3DczVGsHLLcNmQxA8m7pkBguBvJ++SLEiW5oEVRaXKr3PAy7b36
-Z86HO5jX6vcOslx3q+oiBwNTAgMBAAGjggF9MIIBeTAfBgNVHSMEGDAWgBRb0Ioc
-mjJb4LXdllQb4YYosP22vTAdBgNVHQ4EFgQUUlDt3t01Naw+DK2fBg+WZHWpYpIw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJF
-TkFTU0xDQTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGG
-GWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wLAYDVR0RBCUwI4INZWR1aWQuamFt
-dS5jeoISc2hpYmJvbGV0aC5qYW11LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA3OyhB
-6PSVkoWQp37t1AcSR4irdkjT5+9gpHRortS6m1ydhcdFxcB/BW+85/yvWgpHxBnb
-t9g5b5fa0jyl6sp0M2VeSTdCb3uelqOnapBiIagdR7wyagxfBCbpdVqD1UZX5vFQ
-g4C0mjiaSQd9Ksvo6L9NMCtcameYBuxtUKi/Of88dRZPX/WQRTHYYsq4gTmRekgL
-FoJ7e0uBbvvNNVEwiriba9C1hreED5k8Tdlun0dk3QNCZP4uEOM3kng/Hy/ZDKIf
-DdDexXrGQ9wBME/kfcV3Rb4KluRSh3UhTVSXGgOjQ0f6WlEBO+NMdsYH+kDe1YDw
-yASlKAcsuc4JfDB8
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://eduid.jamu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Janacek Academy of Music and Performing Arts in Brno</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Janacek Academy of Music and Performing Arts in Brno</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="cs">Janáčkova akademie múzických umění v Brně</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://english.jamu.cz/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="cs">http://www.jamu.cz/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Jaroslav</md:GivenName>
- <md:SurName>Meixner</md:SurName>
- <md:EmailAddress>meixner@jamu.cz</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml
deleted file mode 100644
index 28c343b8..00000000
--- a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edustore.adeptscience.co.uk/oa/metadata">
- <!--
- This is a "UK Education Store" OpenAthens SP for Adept Scientific plc.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-04T10:38:08Z">
- <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 urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Adept Scientific UK Education Store</mdui:DisplayName>
- <mdui:Description xml:lang="en">Fast track access to low software prices for students and educators with no post purchase verification. If you are a student at an organisation that has a site licence, you may also be eligible for special reduced prices for personal licences.</mdui:Description>
- <mdui:Logo height="164" width="207">https://edustore.adeptscience.co.uk/images/Adept-LH-logo-store-WEB.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
- tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
- ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
- YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
- VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
- MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
- DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
- ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
- LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
- c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
- bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
- sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
- 6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
- cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
- CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
- DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
- AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
- cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
- AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
- MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
- U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
- dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
- Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
- BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
- lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
- b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
- 2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
- plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
- YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
- jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
- CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
- </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>
- MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
- tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
- ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
- YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
- VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
- MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
- DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
- ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
- LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
- c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
- bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
- sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
- 6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
- cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
- CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
- DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
- AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
- cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
- AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
- MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
- U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
- dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
- Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
- BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
- lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
- b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
- 2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
- plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
- YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
- jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
- CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Adept Scientific plc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Adept Scientific UK Education Store</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/about/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Mark</GivenName>
- <SurName>Ridley</SurName>
- <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Mark</GivenName>
- <SurName>Ridley</SurName>
- <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml
deleted file mode 100644
index 69cdb940..00000000
--- a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edustore.adeptscience.co.uk/oasp">
- <!--
- This is an OpenAthens SP for Adept Scientific plc.
- -->
- <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:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
- tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
- ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
- YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
- VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
- MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
- DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
- ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
- LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
- c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
- bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
- sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
- 6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
- cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
- CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
- DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
- AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
- cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
- AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
- MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
- U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
- dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
- Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
- BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
- lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
- b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
- 2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
- plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
- YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
- jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
- CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="0"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="3"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Adept Scientific plc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Adept Scientific plc: Adept4Education</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Mark</GivenName>
- <SurName>Ridley</SurName>
- <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Mark</GivenName>
- <SurName>Ridley</SurName>
- <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml b/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
index ec0f08c1..f61f8889 100644
--- a/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
+++ b/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
@@ -48,8 +48,7 @@
<md:OrganizationURL xml:lang="en">http://uniwise.dk</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:GivenName>Administrator</md:GivenName>
+ <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/europe.wiseflow.net.xml b/swamid-interfederations-2.0/europe.wiseflow.net.xml
index f52e0002..403e7561 100644
--- a/swamid-interfederations-2.0/europe.wiseflow.net.xml
+++ b/swamid-interfederations-2.0/europe.wiseflow.net.xml
@@ -48,8 +48,7 @@
<md:OrganizationURL xml:lang="en">http://uniwise.dk</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:GivenName>Administrator</md:GivenName>
+ <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml
index b8c7ddf7..a2b06f14 100644
--- a/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml
@@ -13,6 +13,9 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nebraska.edu</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">University of Nebraska</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="en">http://www.nebraska.edu/about</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.nebraska.edu/bylaws-and-policies.html</mdui:PrivacyStatementURL>
+ <mdui:Logo height="75" width="284" xml:lang="en">https://fed.nebraska.edu/idp/images/un_master_bk_incommon.jpg</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
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
deleted file mode 100644
index d9b4d642..00000000
--- a/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fed.nhtv.nl/adfs/services/trust">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-08-09T12: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: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/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>
- </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/d5f955107c70b084e9df9a1e8261e973"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="nl">NHTV internationaal hoger onderwijs Breda</md:OrganizationName>
- <md:OrganizationName xml:lang="en">NHTV Breda University of Applied Sciences</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="nl">NHTV internationaal hoger onderwijs Breda</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">NHTV Breda University of Applied Sciences</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="nl">http://www.nhtv.nl</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.nhtv.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/federatie.clusius.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml
deleted file mode 100644
index 1dbaa255..00000000
--- a/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federatie.clusius.nl/adfs/services/trust">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-23T12: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">Clusius College (old)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Clusius College (old)</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/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>
- </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/47d9881f7198a3e15644c76503f0402d"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Clusius College (old)</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Clusius College (old)</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.surffederatie.nl</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>SURFconext support</md:GivenName>
- <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
index c004ee9f..263b143f 100644
--- a/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
@@ -20,6 +20,32 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDVzCCAj+gAwIBAgIUKmBCYXflPLtHr7RZnoMPn/DvtmgwDQYJKoZIhvcNAQEF
+BQAwJjEkMCIGA1UEAxMbZmVkZXJhdGlvbi5icmV0YWduZS5pdWZtLmZyMB4XDTEz
+MDIwNTEzMTQxNVoXDTMzMDIwNTEzMTQxNVowJjEkMCIGA1UEAxMbZmVkZXJhdGlv
+bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAnGjACvIl7EYKjKCH0NF4ebs+TiUOvceisAhINr5e4O/BgsEV0pdwWky84VW4
+34IOhhS1OZfNof3DGqIFjIG10D+MMYR56+VWjLV1l4jTzPhxEM1Da4B9opclIqfa
+TuvYTG5taAQ0zH5F0/igiQwgfdQnb8JUb4GlKfvjrwGBEBrV4EdCwuII5gPTWlJP
+q5g5b4fYuLoCxpd21mzi85oVMB39IHCi8r3hlVHvnmdPCINW7DGF9ZSeQzmhJnCB
+D6qm+tOmLtj8PJTNvQ+w89BYCbcdEUOIc8QnGPcupP3eYbp3O03YE4Dslwxed2pT
+S/rBd8Nug44TIPqTPX5V7DaRNQIDAQABo30wezBaBgNVHREEUzBRghtmZWRlcmF0
+aW9uLmJyZXRhZ25lLml1Zm0uZnKGMmh0dHBzOi8vZmVkZXJhdGlvbi5icmV0YWdu
+ZS5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQs9Bw6sfV70qXt48wu
+K1zo2uyoYzANBgkqhkiG9w0BAQUFAAOCAQEAY3y7sMljpfd/g1fNhDxnOYRevqi1
+Ee88d37yE/yVPapmcSHdIzV6vrDl+g+2cD1+sPB5Y5dMVixiptVX5+1ey55Mpb4e
+MTzmP7yDaL1eHKN+7NndjBOdF8nXheaB+/PRXuwp3dlSQrumH2kIPGA2iLHXHDlp
+ytKmSaXH1HkcgcjQe5cgHinQd9sA22s4pMJ309e6Y/8+IUq7Vc75+1YrnnDHF7mx
+XwWUOQkoMHoHa30vcT2jQVKThDWJj7WLPSDv9t0CTUy8ToOSBTfvooHJOZhsLQzG
+Igfeq0NJEYoEobPu+TwPdcY7Mzham8UC11Kt0r95Ti9Wpfe7OfMDHhPmfA==
+ </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>
MIIEhDCCA2ygAwIBAgIRAPSODBFpc8g+0TGgl6Q8SN8wDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzAyMTEwMDAwMDBaFw0xNjA0MDUyMzU5NTlaMEkxITAfBgNV
@@ -49,39 +75,6 @@ hjz3pTN+SFo=
</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>
- MIIErDCCA5SgAwIBAgIQRmz9EXsKgXSG7w3iHBAacTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDQwODAwMDAwMFoXDTEzMDQwNzIzNTk1OVowfDELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBUJyZXN0MRwwGgYDVQQKExNVTklWRVJTSVRFIERFIEJS
-RVNUMRkwFwYDVQQLExBJVUZNIGRlIEJyZXRhZ25lMSQwIgYDVQQDExtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC9io/anctVdl1XJKVAOdH/smD4k5iu6z/izJwt32LXFSgs5KLYi7pUThAv
-awK8Iky5+60HAXI6Oyxj4GYY9+2mlyjTi+HXeE4BeIUzznGFcp0tL+Iz3WrY5x+P
-HQaR9YdjhRbe72jyGPA0lnS6OI7dxJaI18IXqh8nmcS1uJcxyFBsRG9MGVX2PWWZ
-8hB3TEL3vNybl59VOltoAjm1m2NikQK70Hr6w+TofDEmht0qAubTWLN7c9v2UGos
-+/Z1qfAJTZ5En4eG0V2z2NHDwcqbg8dUjUVgmw05aIkhS1ecIp9EkRLdUzbyh5aY
-yFXaM/6L77+BqHTSswf6X4sKjn9NAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUzLxiXZeukJyQudQQyHUqS7vX
-9XwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbZmVkZXJhdGlvbi5icmV0
-YWduZS5pdWZtLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQChVtxeBUo5Y/kZfvLjKZB2
-lgotm/dUiZHxscZRh/Rcnb37Eo9NcuA3UbY9IjkUbS3p1VbLtfFQxjK7SEa/z0ry
-qxZy9/94Zs43Ntpm2XijY5uL9x6pykzLVFDLG3ZdpnrnJz3MMC6wtF14VcOTwfjm
-10hAOLHnc4xuPCEKBZMTeeNaBmARfnbrBiv0cdWI74sE0hJbq2W7e3/atzwvH1O4
-LJWCNOb6ewDwXycbnYzCnEvL1z34BTU6GAb4t4yEjQEyPmqOTMbHeE/TD9//7LO6
-HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.bretagne.iufm.fr/idp/profile/SAML2/POST/SSO"/>
@@ -97,6 +90,32 @@ HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDVzCCAj+gAwIBAgIUKmBCYXflPLtHr7RZnoMPn/DvtmgwDQYJKoZIhvcNAQEF
+BQAwJjEkMCIGA1UEAxMbZmVkZXJhdGlvbi5icmV0YWduZS5pdWZtLmZyMB4XDTEz
+MDIwNTEzMTQxNVoXDTMzMDIwNTEzMTQxNVowJjEkMCIGA1UEAxMbZmVkZXJhdGlv
+bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAnGjACvIl7EYKjKCH0NF4ebs+TiUOvceisAhINr5e4O/BgsEV0pdwWky84VW4
+34IOhhS1OZfNof3DGqIFjIG10D+MMYR56+VWjLV1l4jTzPhxEM1Da4B9opclIqfa
+TuvYTG5taAQ0zH5F0/igiQwgfdQnb8JUb4GlKfvjrwGBEBrV4EdCwuII5gPTWlJP
+q5g5b4fYuLoCxpd21mzi85oVMB39IHCi8r3hlVHvnmdPCINW7DGF9ZSeQzmhJnCB
+D6qm+tOmLtj8PJTNvQ+w89BYCbcdEUOIc8QnGPcupP3eYbp3O03YE4Dslwxed2pT
+S/rBd8Nug44TIPqTPX5V7DaRNQIDAQABo30wezBaBgNVHREEUzBRghtmZWRlcmF0
+aW9uLmJyZXRhZ25lLml1Zm0uZnKGMmh0dHBzOi8vZmVkZXJhdGlvbi5icmV0YWdu
+ZS5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQs9Bw6sfV70qXt48wu
+K1zo2uyoYzANBgkqhkiG9w0BAQUFAAOCAQEAY3y7sMljpfd/g1fNhDxnOYRevqi1
+Ee88d37yE/yVPapmcSHdIzV6vrDl+g+2cD1+sPB5Y5dMVixiptVX5+1ey55Mpb4e
+MTzmP7yDaL1eHKN+7NndjBOdF8nXheaB+/PRXuwp3dlSQrumH2kIPGA2iLHXHDlp
+ytKmSaXH1HkcgcjQe5cgHinQd9sA22s4pMJ309e6Y/8+IUq7Vc75+1YrnnDHF7mx
+XwWUOQkoMHoHa30vcT2jQVKThDWJj7WLPSDv9t0CTUy8ToOSBTfvooHJOZhsLQzG
+Igfeq0NJEYoEobPu+TwPdcY7Mzham8UC11Kt0r95Ti9Wpfe7OfMDHhPmfA==
+ </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>
MIIEhDCCA2ygAwIBAgIRAPSODBFpc8g+0TGgl6Q8SN8wDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzAyMTEwMDAwMDBaFw0xNjA0MDUyMzU5NTlaMEkxITAfBgNV
@@ -126,39 +145,6 @@ hjz3pTN+SFo=
</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>
- MIIErDCCA5SgAwIBAgIQRmz9EXsKgXSG7w3iHBAacTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDQwODAwMDAwMFoXDTEzMDQwNzIzNTk1OVowfDELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBUJyZXN0MRwwGgYDVQQKExNVTklWRVJTSVRFIERFIEJS
-RVNUMRkwFwYDVQQLExBJVUZNIGRlIEJyZXRhZ25lMSQwIgYDVQQDExtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC9io/anctVdl1XJKVAOdH/smD4k5iu6z/izJwt32LXFSgs5KLYi7pUThAv
-awK8Iky5+60HAXI6Oyxj4GYY9+2mlyjTi+HXeE4BeIUzznGFcp0tL+Iz3WrY5x+P
-HQaR9YdjhRbe72jyGPA0lnS6OI7dxJaI18IXqh8nmcS1uJcxyFBsRG9MGVX2PWWZ
-8hB3TEL3vNybl59VOltoAjm1m2NikQK70Hr6w+TofDEmht0qAubTWLN7c9v2UGos
-+/Z1qfAJTZ5En4eG0V2z2NHDwcqbg8dUjUVgmw05aIkhS1ecIp9EkRLdUzbyh5aY
-yFXaM/6L77+BqHTSswf6X4sKjn9NAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUzLxiXZeukJyQudQQyHUqS7vX
-9XwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbZmVkZXJhdGlvbi5icmV0
-YWduZS5pdWZtLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQChVtxeBUo5Y/kZfvLjKZB2
-lgotm/dUiZHxscZRh/Rcnb37Eo9NcuA3UbY9IjkUbS3p1VbLtfFQxjK7SEa/z0ry
-qxZy9/94Zs43Ntpm2XijY5uL9x6pykzLVFDLG3ZdpnrnJz3MMC6wtF14VcOTwfjm
-10hAOLHnc4xuPCEKBZMTeeNaBmARfnbrBiv0cdWI74sE0hJbq2W7e3/atzwvH1O4
-LJWCNOb6ewDwXycbnYzCnEvL1z34BTU6GAb4t4yEjQEyPmqOTMbHeE/TD9//7LO6
-HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.bretagne.iufm.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/federation.hanze.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml
deleted file mode 100644
index 41bd866b..00000000
--- a/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federation.hanze.nl/adfs/services/trust">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-12T10:50: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">Hanzehogeschool 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 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">
- <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/193a3229f49c46a0b0a0f063f44b7696"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="nl">Hanzehogeschool 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 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>
- <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/fod.geant.net-shibboleth.xml b/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
deleted file mode 100644
index 2131d427..00000000
--- a/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fod.geant.net/shibboleth">
- <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>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://fod.geant.net/Shibboleth.sso/Login"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">GÉANT FoD pilot</mdui:DisplayName>
- <mdui:Description xml:lang="en">GÉANT FoD pilot</mdui:Description>
- <mdui:InformationURL xml:lang="en">https://fod.geant.net/</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">https://fod.geant.net/</mdui:PrivacyStatementURL>
- <mdui:Logo height="45" width="220" xml:lang="en">https://fod.geant.net/static/fodlogo2.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>fod.geant.net</ds:KeyName>
- <ds:KeyName>https://fod.geant.net/shibboleth</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=fod.geant.net</ds:X509SubjectName>
- <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJALpwpqVM41ahMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
- BAMTDWZvZC5nZWFudC5uZXQwHhcNMTQwNjIzMTAwMDQ3WhcNMTkwNjIyMTAwMDQ3
- WjAYMRYwFAYDVQQDEw1mb2QuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
- AQ8AMIIBCgKCAQEA7xERTh1Nm2VyuqI9t3nPILhB0OT2gwNZZYQ7S0YWDbwQSZu8
- 98n9ky46onJm6ie3hA3CQKO86/0IqoF8idhnMFrODrvVNL+MTXj/kfb3oRwm0HzR
- ZXOExZM4zCLCaAAmlIvkYASjjRrY8tZnyXkw1IXE/wApfU4foL8as0Wskq3vQgvm
- dL9xXc+T7CsR7ZkvzgekLw8IhXT8zwoiKKWzw7cNJMr0yvkow2El0GJevpT4H1n4
- B0L4WeipLH3grmBa4vL7fjOnBomnou6mjbfeKy3e0sbeMq64fLeJoJyDdoxx8s3r
- uketgyYh5BG7Z6tFpHVrrQ5lxqAk8eSOC+tziwIDAQABo10wWzA6BgNVHREEMzAx
- gg1mb2QuZ2VhbnQubmV0hiBodHRwczovL2ZvZC5nZWFudC5uZXQvc2hpYmJvbGV0
- aDAdBgNVHQ4EFgQUWYtmspsehNvR1pD1f1+qEUfoDEIwDQYJKoZIhvcNAQEFBQAD
- ggEBAHV/TTiiQGeGW3YhuyV5dA+FkSNPMJbYPi38Oy36Vv732NYv22ONtKjop45I
- LVz6tPVLtpV+TVwtSGw+Rca79FwDf6g3tu2rLN+xElLk8M7gYtoRY2kdoq1A/UaO
- 51L2b9wEqYcXQMig2hRwdtxSUgfRcGSwDO75us6b6OsSs3L1UZoWgsHbyynT04Hz
- +pgaYx67ZJZZ7Mb26w1ScHJUenjHhFY3Xqr/yG6+cwmA/7ihdnpwyOp8VGLA8kKD
- Faf69w08P93wE8CS9U+gcN8RdvhC9W+iYhGRLHCPg7o6gRjeFB+p6zeyb/kNuuLU
- VYAFoJvsnMeKzPxMe+iSHgeolLI=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
- <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fod.geant.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fod.geant.net/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fod.geant.net/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/Shibboleth.sso/SLO/Artifact"/>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fod.geant.net/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fod.geant.net/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fod.geant.net/Shibboleth.sso/SAML/Artifact" index="6"/>
- <md:AttributeConsumingService index="0" isDefault="true">
- <md:ServiceName xml:lang="en">GÉANT FoD pilot</md:ServiceName>
- <md:ServiceDescription xml:lang="en">GÉANT FoD pilot</md:ServiceDescription>
- <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
- <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>Leonidas</md:GivenName>
- <md:SurName>Poulopoulos</md:SurName>
- <md:EmailAddress>leopoul@noc.grnet.gr</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Leonidas</md:GivenName>
- <md:SurName>Poulopoulos</md:SurName>
- <md:EmailAddress>leopoul@noc.grnet.gr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
index 8787f105..abdaa91b 100644
--- a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
+++ b/swamid-interfederations-2.0/forge.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://forge.switch.ch/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-27T15:54:56Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-06T06:41:43Z">
<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">
@@ -91,15 +91,15 @@ D5s3OfoyrsZf5VHSjcxoteZ+NQBmcCgYkgjzXQ==
<md:OrganizationURL xml:lang="it">http://www.switch.ch/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="support">
- <md:GivenName>SWITCHaai</md:GivenName>
+ <md:GivenName>forge</md:GivenName>
<md:SurName>Team</md:SurName>
- <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+ <md:EmailAddress>mailto:support@switch.ch</md:EmailAddress>
<md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
- <md:GivenName>Lukas</md:GivenName>
- <md:SurName>Hämmerle</md:SurName>
- <md:EmailAddress>mailto:lukas.haemmerle@switch.ch</md:EmailAddress>
- <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+ <md:GivenName>Fergus</md:GivenName>
+ <md:SurName>Kerins</md:SurName>
+ <md:EmailAddress>mailto:fergus.kerins@switch.ch</md:EmailAddress>
+ <md:TelephoneNumber>+41 44 268 15 42</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml b/swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml
deleted file mode 100644
index ad461be3..00000000
--- a/swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fr-rennes1-shibboleth.moveon4.com/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-10T13:01:10Z">
- <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/logiciel</saml:AttributeValue>
- <saml:AttributeValue>https://federation.renater.fr/scope/commercial</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">MoveON - software for international activity management</mdui:DisplayName>
- <mdui:InformationURL xml:lang="fr">https://moveon4.com/513</mdui:InformationURL>
- <mdui:Description xml:lang="en">Moveon enables institutions of higher education to succeed in the highly internationalised world of higher education. International offices can easily control and manage all internationalisation activities, reduce their daily administrative workload and save time and money.</mdui:Description>
- <mdui:DisplayName xml:lang="fr">MoveON - Logiciel de gestion des activités Internationales</mdui:DisplayName>
- <mdui:Description xml:lang="fr">Dans le monde fortement internationalisé de l'enseignement supérieur, MoveON appuie les établissements d'enseignement supérieur dans leur réussite quotidienne. Les services des Relations Internationales peuvent ainsi facilement contrôler et gérer toutes les activités d'internationalisation, réduire leur charge de travail administrative quotidienne et gagner en temps et en argent.</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>
- MIIFgTCCA2mgAwIBAgIJAMwjeTq6427PMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSowKAYDVQQDDCFm
-ci1yZW5uZXMxLXNoaWJib2xldGgubW92ZW9uNC5jb20wHhcNMTMxMDE4MTIzMjAx
-WhcNMzMxMDEzMTIzMjAxWjBXMQswCQYDVQQGEwJERTEcMBoGA1UECgwTUVMgdW5p
-c29sdXRpb24gR21iSDEqMCgGA1UEAwwhZnItcmVubmVzMS1zaGliYm9sZXRoLm1v
-dmVvbjQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAo5gJXFe1
-2g8Quhi/cNXAjEfKIWAknNVglyr2j+bQW0LJC4qbbYBgi76Xi0jiYXs0BFW1Fn5U
-u6SYjneFdhvBuchwO1yRYhA/DGk71dro07qbWBlnyZE173/5MEA2GcdcFI7nwlzO
-hIMZ3Stair2e/kkl/Jasv3x1qDGWYLnRruVwiWoYsTJ9rPTjYwvSBRlF8xkBn138
-v3+pp2OgbZ7OwXNKGkg7CWsDEIo9rsJ5pfTI9iIHD4CtBylZltXGZM3Ur5DysJKa
-cjnax3wqcNdi2oepq2p/uzb99oP6qty01h26q+RvHyXZ35Rr8WAA01eGgcceKwIy
-ZIt92WD8CCtNCLb9ZollbYfuQrS8zLvPgYcy6cMgngDiqm+QN6H3fHq5zyxJ7+/X
-7Xn8yNi3fwNX5UAM4UVnnRKMDugqdY7Tn3TQr1ciIhyslEaW2PtwyOfL8eOLAdtx
-8psVs2g2jkvhxMYreR8IKEyevoXu6tEzjbEArfmg3PVk6rjVb1ecpH+u9s6LfoRb
-+VL7QcfMQP/pzyI7wnGBq+eur2779yCJ7eDoAlsYoSYFXiQzjVOFSAaiibU+9URL
-PCYApGw5n/9AE8722lAbq8lfo3Roe/nKv9FaPHr96CzTLUemF7tXRnTT6ttvWtOj
-g94reZ34ZscGngAZUIvc+ASXWrh5iPIKH4ECAwEAAaNQME4wHQYDVR0OBBYEFCZU
-Hgz/G7GV+x27JvXYq0sRSmmpMB8GA1UdIwQYMBaAFCZUHgz/G7GV+x27JvXYq0sR
-SmmpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAAOq5QsqOL/SBiq4
-7tIXdOw8VNM/FtleNM0hMpIoS9ivRk075F4jcZymbMNq0gwbj3lIKAji9RO7dIPY
-ll5EL4jdjqVzxtg1iEb6xJS9G8m5QZC0IaNPoEGeWRwIYIdRldDEum4LRnWqYXAq
-SlVCRayRQCCs4DlO7RIH84lxPuaVlVDahDVjX2eR9lf/uul+d0zoP/C8Mz5Cvatn
-51NZoFLZpFZ1PxiqxylggSzVmygXLWpfWhqX8Prx/eXjXRKjUHnzFPWgmNmnGpcb
-UCpF7K5PPMz4FiUYid0v0Ac84zg+rPEV+9dPEL1usKOl9BvuH3lTyZtuBmp0Kx1e
-OqTC8Mf+b414tRV0KhZzCTaITouTcPi6kN9Jtr200Ig5R4WJ0hQwrwz76+Zc5T/P
-Q4fYDZE+qVryDsGh3IRMtsiYJ+/pPKk3HgSwEicXP7HApZbGvCco/rHXrW+KiHgT
-l/BRl/FYOs2w8wRLADgOiQGT92xtLIjuDUcGVzxRK1dyTaCR4aMX1YIAb+h3im0f
-rrPJSF3aEIjK187ZpbTIY0gOLJUF0ELDLJy4Ql2EW1Z5hSJEo9VJy3z/3auv9IyH
-fYz9g//4YOQZaSQ5c3wgr+got1KVUh3fFQ82d2DC1YFp/wufjKeLfA6zhQYZU1g3
-5l0v1ZR1poQgqV6AJfPMlW+DyGU+
-
- </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>
- MIIFgTCCA2mgAwIBAgIJAMwjeTq6427PMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSowKAYDVQQDDCFm
-ci1yZW5uZXMxLXNoaWJib2xldGgubW92ZW9uNC5jb20wHhcNMTMxMDE4MTIzMjAx
-WhcNMzMxMDEzMTIzMjAxWjBXMQswCQYDVQQGEwJERTEcMBoGA1UECgwTUVMgdW5p
-c29sdXRpb24gR21iSDEqMCgGA1UEAwwhZnItcmVubmVzMS1zaGliYm9sZXRoLm1v
-dmVvbjQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAo5gJXFe1
-2g8Quhi/cNXAjEfKIWAknNVglyr2j+bQW0LJC4qbbYBgi76Xi0jiYXs0BFW1Fn5U
-u6SYjneFdhvBuchwO1yRYhA/DGk71dro07qbWBlnyZE173/5MEA2GcdcFI7nwlzO
-hIMZ3Stair2e/kkl/Jasv3x1qDGWYLnRruVwiWoYsTJ9rPTjYwvSBRlF8xkBn138
-v3+pp2OgbZ7OwXNKGkg7CWsDEIo9rsJ5pfTI9iIHD4CtBylZltXGZM3Ur5DysJKa
-cjnax3wqcNdi2oepq2p/uzb99oP6qty01h26q+RvHyXZ35Rr8WAA01eGgcceKwIy
-ZIt92WD8CCtNCLb9ZollbYfuQrS8zLvPgYcy6cMgngDiqm+QN6H3fHq5zyxJ7+/X
-7Xn8yNi3fwNX5UAM4UVnnRKMDugqdY7Tn3TQr1ciIhyslEaW2PtwyOfL8eOLAdtx
-8psVs2g2jkvhxMYreR8IKEyevoXu6tEzjbEArfmg3PVk6rjVb1ecpH+u9s6LfoRb
-+VL7QcfMQP/pzyI7wnGBq+eur2779yCJ7eDoAlsYoSYFXiQzjVOFSAaiibU+9URL
-PCYApGw5n/9AE8722lAbq8lfo3Roe/nKv9FaPHr96CzTLUemF7tXRnTT6ttvWtOj
-g94reZ34ZscGngAZUIvc+ASXWrh5iPIKH4ECAwEAAaNQME4wHQYDVR0OBBYEFCZU
-Hgz/G7GV+x27JvXYq0sRSmmpMB8GA1UdIwQYMBaAFCZUHgz/G7GV+x27JvXYq0sR
-SmmpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAAOq5QsqOL/SBiq4
-7tIXdOw8VNM/FtleNM0hMpIoS9ivRk075F4jcZymbMNq0gwbj3lIKAji9RO7dIPY
-ll5EL4jdjqVzxtg1iEb6xJS9G8m5QZC0IaNPoEGeWRwIYIdRldDEum4LRnWqYXAq
-SlVCRayRQCCs4DlO7RIH84lxPuaVlVDahDVjX2eR9lf/uul+d0zoP/C8Mz5Cvatn
-51NZoFLZpFZ1PxiqxylggSzVmygXLWpfWhqX8Prx/eXjXRKjUHnzFPWgmNmnGpcb
-UCpF7K5PPMz4FiUYid0v0Ac84zg+rPEV+9dPEL1usKOl9BvuH3lTyZtuBmp0Kx1e
-OqTC8Mf+b414tRV0KhZzCTaITouTcPi6kN9Jtr200Ig5R4WJ0hQwrwz76+Zc5T/P
-Q4fYDZE+qVryDsGh3IRMtsiYJ+/pPKk3HgSwEicXP7HApZbGvCco/rHXrW+KiHgT
-l/BRl/FYOs2w8wRLADgOiQGT92xtLIjuDUcGVzxRK1dyTaCR4aMX1YIAb+h3im0f
-rrPJSF3aEIjK187ZpbTIY0gOLJUF0ELDLJy4Ql2EW1Z5hSJEo9VJy3z/3auv9IyH
-fYz9g//4YOQZaSQ5c3wgr+got1KVUh3fFQ82d2DC1YFp/wufjKeLfA6zhQYZU1g3
-5l0v1ZR1poQgqV6AJfPMlW+DyGU+
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fr-rennes1-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fr-rennes1-shibboleth.moveon4.com/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AttributeConsumingService index="0">
- <md:ServiceName xml:lang="fr">MoveON - Logiciel de gestion des activités Internationales</md:ServiceName>
- <md:ServiceName xml:lang="en">MoveON - software for international activity management</md:ServiceName>
- <md:ServiceDescription xml:lang="fr">Dans le monde fortement internationalisé de l'enseignement supérieur, MoveON appuie les établissements d'enseignement supérieur dans leur réussite quotidienne. Les services des Relations Internationales peuvent ainsi facilement contrôler et gérer toutes les activités d'internationalisation, réduire leur charge de travail administrative quotidienne et gagner en temps et en argent.</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">Moveon enables institutions of higher education to succeed in the highly internationalised world of higher education. International offices can easily control and manage all internationalisation activities, reduce their daily administrative workload and save time and money.</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">QS UNISOLUTION</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">QS UNISOLUTION</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Kamran Tabassum</md:SurName>
- <md:EmailAddress>kamran@zeptosystems.com</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
index a5722f1e..6a96c976 100644
--- a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
@@ -13,7 +13,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Digimap Collections</mdui:DisplayName>
<mdui:Description xml:lang="en">Online maps and spatial data of Great Britain</mdui:Description>
- <mdui:Logo height="90" width="350">https://vsp2.edina.ac.uk/public/images/splogos/digimap.png</mdui:Logo>
+ <mdui:Logo height="90" width="350">https://auth.edina.ac.uk/public/images/splogos/digimap.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
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
index f4ab8b45..626005fc 100644
--- 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
@@ -46,8 +46,8 @@
<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:GivenName>Lasse</md:GivenName>
+ <md:SurName>Birnbaum Jensen</md:SurName>
+ <md:EmailAddress>lasse@sdu.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
new file mode 100644
index 00000000..896d5df9
--- /dev/null
+++ b/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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.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>
+ </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">unisalento.it</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">University of Salento</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="it">Università del Salento</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider for the users of University of Salento</mdui:Description>
+ <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università del Salento</mdui:Description>
+ <mdui:InformationURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://idem-idp.unisalento.it/infoeng/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://idem-idp.unisalento.it/infoeng/</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMzCCAhugAwIBAgIUA+PvTTuv3pJPbxuuJd/3LE3JtcEwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0MB4XDTEwMDcxMzEyMTg1
+NloXDTMwMDcxMzEyMTg1NlowHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgla3juJH8iD+hOUKUgES
+hp9QqZOEuEPDSaS9SpYZHxscsgz0RXljN2yMw8fS7ih4LCZT98okH+lBG4wKndMg
+0X2gDQfpMpA9ly/Ei5htxtBQGcuIVtmfI1BPwMTGqlvxnO3HCRNdzbb/UivCtvZt
+g0cr0P6qYr11ExntVQInEq2S18S1xRLAZOL5SId8AcGUugVqZM1Q4L8anJclCww5
+Hmnl27QQSrVTgoPjPt2KI7ALVEsTbY54gEti6YRX6VmXYtCiFOkLFK0A/Q5hcy7Z
+XDuZnhqYGh11iwh2xGRu8ZXYPKtEhKf+Y3+BqOB9j7+kSHRHbVqegREOm/Ude+WC
+lwIDAQABo2swaTBIBgNVHREEQTA/ghJpZGVtLnVuaXNhbGVudG8uaXSGKWh0dHBz
+Oi8vaWRlbS51bmlzYWxlbnRvLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSD
+vtPQz4E2/RAEnZwWLaMi6MgpXzANBgkqhkiG9w0BAQUFAAOCAQEALqmALOf4h9Q+
+OT27WFz2eBzr8X39M3MZ60b2xXxGn36VRlkfrBS2sCSZz/8JZrFsDr650I0v5ZHV
+8I0pMfTzUyylxch4T8Y92779JifANL1ypLKLzsgXtO0zKut6AvxRG+6AnECQtFMg
+i3JWjW8VY7HVpvCSRpIZtLEBoYfSsGEB8vkdhbJvz15cmwwtBX9bHGyiqGdG8NSi
+t8hsGA3CsRPAhEgvzTX5bXdp9P2SZYcc/+jbsOLy2i5ECApA/BAUFkWVxo3zpdQc
+TuRSdi628uP4JhrF+naNDmjtypIhcFWxTb9nS0Q7pNztRk8WeKJWRJOPpmUcOti9
+cwGgvFbTug==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisalento.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisalento.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.unisalento.it/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.unisalento.it/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.unisalento.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.unisalento.it/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">unisalento.it</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDMzCCAhugAwIBAgIUA+PvTTuv3pJPbxuuJd/3LE3JtcEwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0MB4XDTEwMDcxMzEyMTg1
+NloXDTMwMDcxMzEyMTg1NlowHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgla3juJH8iD+hOUKUgES
+hp9QqZOEuEPDSaS9SpYZHxscsgz0RXljN2yMw8fS7ih4LCZT98okH+lBG4wKndMg
+0X2gDQfpMpA9ly/Ei5htxtBQGcuIVtmfI1BPwMTGqlvxnO3HCRNdzbb/UivCtvZt
+g0cr0P6qYr11ExntVQInEq2S18S1xRLAZOL5SId8AcGUugVqZM1Q4L8anJclCww5
+Hmnl27QQSrVTgoPjPt2KI7ALVEsTbY54gEti6YRX6VmXYtCiFOkLFK0A/Q5hcy7Z
+XDuZnhqYGh11iwh2xGRu8ZXYPKtEhKf+Y3+BqOB9j7+kSHRHbVqegREOm/Ude+WC
+lwIDAQABo2swaTBIBgNVHREEQTA/ghJpZGVtLnVuaXNhbGVudG8uaXSGKWh0dHBz
+Oi8vaWRlbS51bmlzYWxlbnRvLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSD
+vtPQz4E2/RAEnZwWLaMi6MgpXzANBgkqhkiG9w0BAQUFAAOCAQEALqmALOf4h9Q+
+OT27WFz2eBzr8X39M3MZ60b2xXxGn36VRlkfrBS2sCSZz/8JZrFsDr650I0v5ZHV
+8I0pMfTzUyylxch4T8Y92779JifANL1ypLKLzsgXtO0zKut6AvxRG+6AnECQtFMg
+i3JWjW8VY7HVpvCSRpIZtLEBoYfSsGEB8vkdhbJvz15cmwwtBX9bHGyiqGdG8NSi
+t8hsGA3CsRPAhEgvzTX5bXdp9P2SZYcc/+jbsOLy2i5ECApA/BAUFkWVxo3zpdQc
+TuRSdi628uP4JhrF+naNDmjtypIhcFWxTb9nS0Q7pNztRk8WeKJWRJOPpmUcOti9
+cwGgvFbTug==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisalento.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisalento.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">Università del Salento</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University of Salento</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="it">Università del Salento</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Salento</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="it">http://www.unisalento.it</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">https://international.unisalento.it/about</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Antonio Campa</md:SurName>
+ <md:EmailAddress>mailto:dorsale@unisalento.it</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
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
index ec8abe54..9614dbd9 100644
--- a/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
@@ -9,10 +9,10 @@
<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:DisplayName xml:lang="en">RENATER Connect</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:DisplayName xml:lang="fr">RENATER Connect</mdui:DisplayName>
<mdui:Description xml:lang="fr">IdP Hosting</mdui:Description>
</mdui:UIInfo>
</md:Extensions>
@@ -83,8 +83,8 @@ eTynT1A7tmOPmxyMyv76cficIt0xGao=
<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:OrganizationName xml:lang="en">RENATER Connect</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">RENATER Connect</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
index 79007840..99fc1912 100644
--- a/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
@@ -84,9 +84,9 @@ iVr4j+vsHmoBJB+J5VAC8/SAzG/s4VDMBZ2yqMvzeEXkmaOTrso=
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/Redirect/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/Redirect/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/POST/SSO"/>
</md:IDPSSODescriptor>
<md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<md:Extensions>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
index a94e8911..ffe0cfe7 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
@@ -100,7 +100,6 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gros-radgona.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdravlje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmokronog.si</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgtsizola.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmetlika.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmsn.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrusevec.si</shibmd:Scope>
@@ -418,6 +417,7 @@
<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">ucenec.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>
@@ -525,6 +525,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vperka.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmedvode.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-velikapolana.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-velikapolana.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonetacufarja.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tinje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-tinje.si</shibmd:Scope>
@@ -542,6 +543,7 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-store.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osradlje.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">1os-zalec.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.1os-zalec.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ptrubar.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfpcrensovci.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ravne.si</shibmd:Scope>
@@ -578,6 +580,18 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrecica.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voranc.si</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbovec.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-razkrizje.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">srednjasolaizola.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knjiznica-slovenskabistrica.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zelenajama.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-stari-trg-ok.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-koprivnica.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vransko.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfpkr.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjdol.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-malanedelja.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-montessori.si</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pei.si</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
<mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
diff --git a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
index 8e97b844..918903ce 100644
--- a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
@@ -18,14 +18,14 @@
<mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
<mdui:Description xml:lang="sv">Åbo Akademi är Finlands svenskspråkiga universitet</mdui:Description>
- <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
<mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
+ <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
<mdui:Logo height="325" width="314">https://web.abo.fi/dc/logo/aalogo-314x325.png</mdui:Logo>
<mdui:Keywords xml:lang="sv">ÅA</mdui:Keywords>
<mdui:Keywords xml:lang="en">ÅA</mdui:Keywords>
<mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
- <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DomainHint>abo.fi</mdui:DomainHint>
diff --git a/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml
deleted file mode 100644
index a0a1af26..00000000
--- a/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed2.openathens.net/openathens">
- <!--
- This is an OpenAthens MD "athukfed2" IdP for Eduserv.
- -->
- <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-01-29T10:19:00Z"/>
- </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">athukfed2.openathens.net</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>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfederation"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed2.openathens.net</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>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv athukfed2</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.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.athukfed3.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml
deleted file mode 100644
index 0bf96500..00000000
--- a/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed3.openathens.net/openathens">
- <!--
- This is an "athukfed3" OpenAthens MD Test IdP for Eduserv.
- -->
- <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-12T16:04:09Z"/>
- </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">athukfed3.openathens.net</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>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfederation"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfederation"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed3.openathens.net</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>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv athukfed3</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.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.athukfed4.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml
deleted file mode 100644
index 5980e81a..00000000
--- a/swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed4.openathens.net/openathens">
- <!--
- This is an "athukfed4" OpenAthens MD Test IdP for Eduserv.
- -->
- <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-25T13:51:09Z"/>
- </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">athukfed4.openathens.net</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>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfed/67475576"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfed/67475576"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed4.openathens.net</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>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv athukfed4</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.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.athukfed5.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml
deleted file mode 100644
index 9a6690e2..00000000
--- a/swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed5.openathens.net/openathens">
- <!--
- This is an "athukfed5" OpenAthens MD Test IdP for Eduserv.
- -->
- <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-25T13:51:09Z"/>
- </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">athukfed5.openathens.net</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>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfed/67484437"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfed/67484437"/>
- </IDPSSODescriptor>
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed5.openathens.net</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>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv athukfed5</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.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.chesterfield.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
index 141e9761..674177f5 100644
--- a/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
@@ -102,8 +102,7 @@
<EmailAddress>mailto:helpdesk@chesterfield.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Richard</GivenName>
- <SurName>Houghton</SurName>
- <EmailAddress>mailto:houghtonr@chesterfield.ac.uk</EmailAddress>
+ <GivenName>Helpdesk</GivenName>
+ <EmailAddress>mailto:helpdesk@chesterfield.ac.uk</EmailAddress>
</ContactPerson>
</EntityDescriptor>
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 bd450df8..2ed3a0da 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
@@ -24,6 +24,38 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+MIIEfDCCA2SgAwIBAgIRAOgs3+B31TERERfJASxzXvYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMjgwMDAwMDBaFw0xNjAxMjgyMzU5NTlaMFYxCzAJBgNV
+BAYTAklUMSwwKgYDVQQKDCNVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBDYW1l
+cmlubzEZMBcGA1UEAxMQaWRwLmNzLnVuaWNhbS5pdDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKT3N48e6nmcWjwBz3ePL+7tU5Nc+Lw26bQDeFWBSQvv
+kydsS1lXrgX3KOpQrRcPxJjGj9zGIjm7xtUVzWkPrrs31xOI32DJEwcXoGAE1xYu
+H2KiBJU0dOcBKFIzmG5gROYupg2nfFglw8c9UYon68ijwJyvrfJA5FVsDmHOV1ye
+UlL2xByb/+4xAObDcgh7Ch5o0Gftoo61whsrwmdUTtULdyYtxRXXrvVHn4+Kvhvb
+yOJTkO1FhqhYiZJg/pVqZE3oP7jm4juLJnyOgcCavCp6tUDG8PyDozO/pGf8TFUM
+AJZwhnDhGOVmDVmC1gAFKBip4S2U82x5//2UK+eiEgkCAwEAAaOCAWMwggFfMB8G
+A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR3pdAQO58E
+cxsg3VQr4ZHa5XCPGDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAu
+Y3MudW5pY2FtLml0MA0GCSqGSIb3DQEBBQUAA4IBAQC26PQ1dLZLbyh3ju1J09C4
+oiR0SmJPN/R4U7HDQyl4XEKe5mSuCgQoLPdcmmLQAMtoLZYOLA4IJKKcSF35wnU2
+vX0bR2tykCgLm2MHwX6FLICf29LV1FrfU4JkzK5MWEwgldsJgE7z3sSlmnXQG+Qb
+ZFZil9eNRDQZufyYoGXYjmgD7OeipgCkiehoAmEwCma9bh+0g6HKxx+Sq0Lu3HB8
+LY1z9p7iDg7if8hjoMenPCR4IZnwo/h2GMCUbwYa662rz47L0ljNySq+tc8XbAIw
+rDw7hsCAc6V/pEBg0fiRxhcmkoGuctH13pNHAPNBIu0IXOn4SQbSOAuD0As+SpR2
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDCTCCAfGgAwIBAgIJAODqdYOcRuvYMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
BAMMEGlkcC5jcy51bmljYW0uaXQwHhcNMTYwMzI0MTExMTI0WhcNNDYwMzE3MTEx
MTI0WjAbMRkwFwYDVQQDDBBpZHAuY3MudW5pY2FtLml0MIIBIjANBgkqhkiG9w0B
@@ -62,6 +94,38 @@ N+v+oW0soUwCiTs30w==
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+MIIEfDCCA2SgAwIBAgIRAOgs3+B31TERERfJASxzXvYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMjgwMDAwMDBaFw0xNjAxMjgyMzU5NTlaMFYxCzAJBgNV
+BAYTAklUMSwwKgYDVQQKDCNVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBDYW1l
+cmlubzEZMBcGA1UEAxMQaWRwLmNzLnVuaWNhbS5pdDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKT3N48e6nmcWjwBz3ePL+7tU5Nc+Lw26bQDeFWBSQvv
+kydsS1lXrgX3KOpQrRcPxJjGj9zGIjm7xtUVzWkPrrs31xOI32DJEwcXoGAE1xYu
+H2KiBJU0dOcBKFIzmG5gROYupg2nfFglw8c9UYon68ijwJyvrfJA5FVsDmHOV1ye
+UlL2xByb/+4xAObDcgh7Ch5o0Gftoo61whsrwmdUTtULdyYtxRXXrvVHn4+Kvhvb
+yOJTkO1FhqhYiZJg/pVqZE3oP7jm4juLJnyOgcCavCp6tUDG8PyDozO/pGf8TFUM
+AJZwhnDhGOVmDVmC1gAFKBip4S2U82x5//2UK+eiEgkCAwEAAaOCAWMwggFfMB8G
+A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR3pdAQO58E
+cxsg3VQr4ZHa5XCPGDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAu
+Y3MudW5pY2FtLml0MA0GCSqGSIb3DQEBBQUAA4IBAQC26PQ1dLZLbyh3ju1J09C4
+oiR0SmJPN/R4U7HDQyl4XEKe5mSuCgQoLPdcmmLQAMtoLZYOLA4IJKKcSF35wnU2
+vX0bR2tykCgLm2MHwX6FLICf29LV1FrfU4JkzK5MWEwgldsJgE7z3sSlmnXQG+Qb
+ZFZil9eNRDQZufyYoGXYjmgD7OeipgCkiehoAmEwCma9bh+0g6HKxx+Sq0Lu3HB8
+LY1z9p7iDg7if8hjoMenPCR4IZnwo/h2GMCUbwYa662rz47L0ljNySq+tc8XbAIw
+rDw7hsCAc6V/pEBg0fiRxhcmkoGuctH13pNHAPNBIu0IXOn4SQbSOAuD0As+SpR2
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIDCTCCAfGgAwIBAgIJAODqdYOcRuvYMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
BAMMEGlkcC5jcy51bmljYW0uaXQwHhcNMTYwMzI0MTExMTI0WhcNNDYwMzE3MTEx
MTI0WjAbMRkwFwYDVQQDDBBpZHAuY3MudW5pY2FtLml0MIIBIjANBgkqhkiG9w0B
diff --git a/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
index 6fdbbf7f..14f00c75 100644
--- a/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
@@ -18,14 +18,14 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cvgz.cas.cz</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Global Change Research Centre AS CR</mdui:DisplayName>
- <mdui:DisplayName xml:lang="cs">Centrum výzkumu globální změny AV ČR</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider GCRC AV CR employees.</mdui:Description>
- <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance CVGZ AV ČR</mdui:Description>
+ <mdui:DisplayName xml:lang="en">Global Change Research Institute CAS</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Ústav výzkumu globální změny AV ČR, v. v. i.</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider GCRI AV CR employees.</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚVGZ AV ČR</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.czechglobe.cz/en/</mdui:InformationURL>
<mdui:InformationURL xml:lang="cs">http://www.czechglobe.cz/cs/</mdui:InformationURL>
- <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-cvgz-44.png</mdui:Logo>
- <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-cvgz-148.png</mdui:Logo>
+ <mdui:Logo height="44" width="119">https://jiftach.cas.cz/loga/logo-uvgz-44.png</mdui:Logo>
+ <mdui:Logo height="137" width="371">https://jiftach.cas.cz/loga/logo-uvgz-137.png</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -103,10 +103,10 @@ Lkio9BWK20qYnioVmdQhMS9PZ7ZE0a0/waCeF9gfzEvW+7LT1muTh7oLPO8=
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">Global Change Research Centre AS CR</md:OrganizationName>
- <md:OrganizationName xml:lang="cs">Centrum výzkumu globální změny AV ČR</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Global Change Research Centre AS CR, v. v. i.</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="cs">Centrum výzkumu globální změny AV ČR, v. v. i.</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">Global Change Research Institute CAS</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">Ústav výzkumu globální změny AV ČR</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Global Change Research Institute CAS, v. v. i.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">Ústav výzkumu globální změny AV ČR, v. v. i.</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.czechglobe.cz/en/</md:OrganizationURL>
<md:OrganizationURL xml:lang="cs">http://www.czechglobe.cz/cs/</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..adc7ac5e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.efc.ac.uk/idp/shibboleth">
+ <!--
+ This is an IdP for Epping Forest 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="2016-04-11T12:54: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">efc.ac.uk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Epping Forest College</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Epping Forest College Shibboleth IdP</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDIDCCAgigAwIBAgIVAJFRmkgwhw52LYLRaMPn4753oNLdMA0GCSqGSIb3DQEB
+ CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+ MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+ hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApNTw5TLO9Ge/T8f0r55g3oYeWEIcsunU
+ 7e0Mqn3f5Bx+9Jq2gPKKoKJwGAbM44ZHp9kT2lv9fbgLoqV4wsN5kAaUyQ0V1I2T
+ R2HQ1WGYaYyB0NQFZB30SVZ/NA446OO7/JQjvC6UrgDjLlh+tHKfvtr9M7p/t5aA
+ OiJK78plnV/YyRkAmGMNjqtqC5UYaknQsRyd5FaKJkmxA/LDtn50yZUDrtmSVCco
+ wGPPAvSjtrtKMXvIOleR7IUd8RTGcLm9FRe0PSMwlq5Wni0E7/VNVD2cbVQ/N4JL
+ cFZkRL6k3hNj8LZvwz8RVm3ihPuPhs9N72ML5+LK2POCZ1zjceC9VwIDAQABo2Ew
+ XzAdBgNVHQ4EFgQUCueTLaZVrYTMUiuPwdJTc4lvcNkwPgYDVR0RBDcwNYINaWRw
+ LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBCwUAA4IBAQCAGITy3H8BKF/HwonbKtRsEG1nAlU5I+rTp4/m
+ SW2Hm76+w4xicHWvHiDOOfvOU/xiTJgWRiubpY6Lu2+m4yrArcYGvOdUrw5tB7bQ
+ mZBl/xr6JQAjbqKypBO+W95x3KWFWTtq3vNTRPsW8skCArzhLnJJNg4/nwr2IE4X
+ aEi2HUCZ6uy3OFf9gUAXuUIQIEtWzEfYcu5IXlWYk7H1Jh2qyBVLfdYE4J5zEt/6
+ txchHGxkg1bMiMIjEv+sfkrQm1Vvk5p71nqcBdb+i0/u1zBDQR6fPtn7dzqGR5jx
+ FESrzA5BMELrUJnQ3KIkLgFEGDGnWM9gSQwnfMhMRvuLMqy6
+ </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>
+ MIIDHzCCAgegAwIBAgIUOXBO8f5f0h/99rHsjUGvuzOOJCwwDQYJKoZIhvcNAQEL
+ BQAwGDEWMBQGA1UEAwwNaWRwLmVmYy5hYy51azAeFw0xNjAzMTcxMTQzMzdaFw0z
+ NjAzMTcxMTQzMzdaMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswggEiMA0GCSqG
+ SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQoowAbiQx7g+RBCwYkM3QolXf8opzpjWr
+ X5kD6C+lc9FyRbPBWUsewQlcKOuNy46ernfLi+K49WKD0bdjffK42Y4c0jhi7XMf
+ Gg2PfD5xSQy3v6A+P6lpbYbxTQlqenUFRb5djFsot8gsKaLdfTGNizE8lPYaMJPw
+ 8ELTmgBdeXkhFFXJCRxEeFTjBstc0HcyVAgnYr8nZEZzpFIUxpi1A81Qcq5OCk7+
+ yph8Gp2Ossneh4L0ZzHKvbCMjxHBhF6zrdneJfTKed9JzYKLm4L0QPvIE46CiAnD
+ oUAz5weBBvdqox6rh3E4Q6mH5+eguiDeLy5jIubyOAq6ai8SelCNAgMBAAGjYTBf
+ MB0GA1UdDgQWBBR/+c7vffPYnB1eNa6B2zavd7rzJDA+BgNVHREENzA1gg1pZHAu
+ ZWZjLmFjLnVrhiRodHRwczovL2lkcC5lZmMuYWMudWsvaWRwL3NoaWJib2xldGgw
+ DQYJKoZIhvcNAQELBQADggEBABepHt+qyj0kAJRbJOo/r85+JGibsxsz6bgezVHx
+ /maSj3XFDgVzC9LjuHG3y8Hd1se4hIWg92RjoC3fBI2x1GjwOdGga7oQHiREv4+V
+ 3wBimcmqztPK8G0U3rGDMeDVy+kyUYMgpdf5MxTFDjLx91FdACMaNTTMigAGWVbw
+ C3srGBGXk0RsEgZD4JkP9LUW91oXuqhxki6kZO+Isyw4PlgazdB4y4Uc+VlCh6y6
+ P9e8ihxbhKaN/zpepysWoPpTh8GjPnz6Z4OOVtvZNvFaPk5uQcotBVdW3B3IvGe3
+ k5Yp5NSOAwlFfg9z/Xil7SQY8qxGi3ubkN5uRIoo0aay6/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>
+ MIIDIDCCAgigAwIBAgIVAP6ohCGvdEG1dnh4PrjWIjzXKARGMA0GCSqGSIb3DQEB
+ CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+ MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+ hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg5NOOh728m29wPobTiOHr6UuEnHccxZR
+ rJ6cCVxWkJMdyb9FVJ53pMWbCmLrMpPl63uxs1LsJN+y+ksmoFEkBledGMhCsBlh
+ INwjraPHgtYdX5tvlOWtPBDvadI7yAjTohmzC18Y4HicGyf+N8wd7o2ZIf8Emkoy
+ xemehjPHPrydJMMYpFjKkh5SJovAiTIIfBXpg/5zUJ8hi8Mm5kSW+5AQVoGensvp
+ pG91nLp+jcaKGawlg0d/pvca0Qrw4eJTFukAKT6U2O7TrC1qpK0GcC/oMmHSC0C8
+ dGAvgwEYWyg5w5WIAQVntzqgWfGlm0RGR0rDStQ7oyhtlOz1lHmMcwIDAQABo2Ew
+ XzAdBgNVHQ4EFgQUEGCQsUv3Uai6wzZ7Hwq7hfU3bpMwPgYDVR0RBDcwNYINaWRw
+ LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBCwUAA4IBAQBtbPSWiXrw62ZbVJHSaouA2rV6wtwlbPmuLAhc
+ Z5F6LEtTdyXGkzK/5arRzqXmOjZe/ym4Y25MNf2kgtcL5XDjH0CtryNxJRZEnnRQ
+ St9xyxZjBl41QGNE//h4hiNyFSBERQ8rMgPn/eZ6/C0fD2MYcUjQqY2K0eINHWFK
+ twO/Qhc+Ap85rvUlnxkHJuhOqjQrD0VkENe1Z47Rnx1pyr4RgRt/K8dWHXOpQGBt
+ HQSlmxxBb+6hFpDrrOq7cW+mG/niWbp0vh118CM21W8xUWeU+7Is2JuHhic5oImZ
+ fme2bStBabIJQ5C7qVD0H+E6Hoa3Qe80s5fsVerqwK0KaW7s
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.efc.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.efc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.efc.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.efc.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.efc.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">efc.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDIDCCAgigAwIBAgIVAJFRmkgwhw52LYLRaMPn4753oNLdMA0GCSqGSIb3DQEB
+ CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+ MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+ hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApNTw5TLO9Ge/T8f0r55g3oYeWEIcsunU
+ 7e0Mqn3f5Bx+9Jq2gPKKoKJwGAbM44ZHp9kT2lv9fbgLoqV4wsN5kAaUyQ0V1I2T
+ R2HQ1WGYaYyB0NQFZB30SVZ/NA446OO7/JQjvC6UrgDjLlh+tHKfvtr9M7p/t5aA
+ OiJK78plnV/YyRkAmGMNjqtqC5UYaknQsRyd5FaKJkmxA/LDtn50yZUDrtmSVCco
+ wGPPAvSjtrtKMXvIOleR7IUd8RTGcLm9FRe0PSMwlq5Wni0E7/VNVD2cbVQ/N4JL
+ cFZkRL6k3hNj8LZvwz8RVm3ihPuPhs9N72ML5+LK2POCZ1zjceC9VwIDAQABo2Ew
+ XzAdBgNVHQ4EFgQUCueTLaZVrYTMUiuPwdJTc4lvcNkwPgYDVR0RBDcwNYINaWRw
+ LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBCwUAA4IBAQCAGITy3H8BKF/HwonbKtRsEG1nAlU5I+rTp4/m
+ SW2Hm76+w4xicHWvHiDOOfvOU/xiTJgWRiubpY6Lu2+m4yrArcYGvOdUrw5tB7bQ
+ mZBl/xr6JQAjbqKypBO+W95x3KWFWTtq3vNTRPsW8skCArzhLnJJNg4/nwr2IE4X
+ aEi2HUCZ6uy3OFf9gUAXuUIQIEtWzEfYcu5IXlWYk7H1Jh2qyBVLfdYE4J5zEt/6
+ txchHGxkg1bMiMIjEv+sfkrQm1Vvk5p71nqcBdb+i0/u1zBDQR6fPtn7dzqGR5jx
+ FESrzA5BMELrUJnQ3KIkLgFEGDGnWM9gSQwnfMhMRvuLMqy6
+ </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>
+ MIIDHzCCAgegAwIBAgIUOXBO8f5f0h/99rHsjUGvuzOOJCwwDQYJKoZIhvcNAQEL
+ BQAwGDEWMBQGA1UEAwwNaWRwLmVmYy5hYy51azAeFw0xNjAzMTcxMTQzMzdaFw0z
+ NjAzMTcxMTQzMzdaMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswggEiMA0GCSqG
+ SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQoowAbiQx7g+RBCwYkM3QolXf8opzpjWr
+ X5kD6C+lc9FyRbPBWUsewQlcKOuNy46ernfLi+K49WKD0bdjffK42Y4c0jhi7XMf
+ Gg2PfD5xSQy3v6A+P6lpbYbxTQlqenUFRb5djFsot8gsKaLdfTGNizE8lPYaMJPw
+ 8ELTmgBdeXkhFFXJCRxEeFTjBstc0HcyVAgnYr8nZEZzpFIUxpi1A81Qcq5OCk7+
+ yph8Gp2Ossneh4L0ZzHKvbCMjxHBhF6zrdneJfTKed9JzYKLm4L0QPvIE46CiAnD
+ oUAz5weBBvdqox6rh3E4Q6mH5+eguiDeLy5jIubyOAq6ai8SelCNAgMBAAGjYTBf
+ MB0GA1UdDgQWBBR/+c7vffPYnB1eNa6B2zavd7rzJDA+BgNVHREENzA1gg1pZHAu
+ ZWZjLmFjLnVrhiRodHRwczovL2lkcC5lZmMuYWMudWsvaWRwL3NoaWJib2xldGgw
+ DQYJKoZIhvcNAQELBQADggEBABepHt+qyj0kAJRbJOo/r85+JGibsxsz6bgezVHx
+ /maSj3XFDgVzC9LjuHG3y8Hd1se4hIWg92RjoC3fBI2x1GjwOdGga7oQHiREv4+V
+ 3wBimcmqztPK8G0U3rGDMeDVy+kyUYMgpdf5MxTFDjLx91FdACMaNTTMigAGWVbw
+ C3srGBGXk0RsEgZD4JkP9LUW91oXuqhxki6kZO+Isyw4PlgazdB4y4Uc+VlCh6y6
+ P9e8ihxbhKaN/zpepysWoPpTh8GjPnz6Z4OOVtvZNvFaPk5uQcotBVdW3B3IvGe3
+ k5Yp5NSOAwlFfg9z/Xil7SQY8qxGi3ubkN5uRIoo0aay6/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>
+ MIIDIDCCAgigAwIBAgIVAP6ohCGvdEG1dnh4PrjWIjzXKARGMA0GCSqGSIb3DQEB
+ CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
+ MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
+ hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg5NOOh728m29wPobTiOHr6UuEnHccxZR
+ rJ6cCVxWkJMdyb9FVJ53pMWbCmLrMpPl63uxs1LsJN+y+ksmoFEkBledGMhCsBlh
+ INwjraPHgtYdX5tvlOWtPBDvadI7yAjTohmzC18Y4HicGyf+N8wd7o2ZIf8Emkoy
+ xemehjPHPrydJMMYpFjKkh5SJovAiTIIfBXpg/5zUJ8hi8Mm5kSW+5AQVoGensvp
+ pG91nLp+jcaKGawlg0d/pvca0Qrw4eJTFukAKT6U2O7TrC1qpK0GcC/oMmHSC0C8
+ dGAvgwEYWyg5w5WIAQVntzqgWfGlm0RGR0rDStQ7oyhtlOz1lHmMcwIDAQABo2Ew
+ XzAdBgNVHQ4EFgQUEGCQsUv3Uai6wzZ7Hwq7hfU3bpMwPgYDVR0RBDcwNYINaWRw
+ LmVmYy5hYy51a4YkaHR0cHM6Ly9pZHAuZWZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+ MA0GCSqGSIb3DQEBCwUAA4IBAQBtbPSWiXrw62ZbVJHSaouA2rV6wtwlbPmuLAhc
+ Z5F6LEtTdyXGkzK/5arRzqXmOjZe/ym4Y25MNf2kgtcL5XDjH0CtryNxJRZEnnRQ
+ St9xyxZjBl41QGNE//h4hiNyFSBERQ8rMgPn/eZ6/C0fD2MYcUjQqY2K0eINHWFK
+ twO/Qhc+Ap85rvUlnxkHJuhOqjQrD0VkENe1Z47Rnx1pyr4RgRt/K8dWHXOpQGBt
+ HQSlmxxBb+6hFpDrrOq7cW+mG/niWbp0vh118CM21W8xUWeU+7Is2JuHhic5oImZ
+ fme2bStBabIJQ5C7qVD0H+E6Hoa3Qe80s5fsVerqwK0KaW7s
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Epping Forest College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Epping Forest College</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.efc.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Robert</GivenName>
+ <SurName>Laryea</SurName>
+ <EmailAddress>mailto:RLARYEA@efc.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Naeem</GivenName>
+ <SurName>Rehman</SurName>
+ <EmailAddress>mailto:nrehman@efc.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Robert</GivenName>
+ <SurName>Laryea</SurName>
+ <EmailAddress>mailto:RLARYEA@efc.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Naeem</GivenName>
+ <SurName>Rehman</SurName>
+ <EmailAddress>mailto:nrehman@efc.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
index 5a088b45..b69cb9f9 100644
--- a/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.epfl.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.epfl.ch/idp/shibboleth">
<md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-12-02T16:36:50Z">
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-11T12:36:00Z">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -81,6 +81,31 @@ EyP/QDjoD02nYu++815n4g==
</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>
+MIIDDDCCAfSgAwIBAgIJAM2y4eON2PnqMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+BAMTC2lkcC5lcGZsLmNoMB4XDTE2MDMyOTEzMzQzM1oXDTE5MDMyOTEzMzQzM1ow
+FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDD7LOez3zrlr+A6IpY1G9Qp5VIA++bAUEe+zZMu7HbkISrqPLAqFWb
+O5cF1vgqfQQKmGYfeITgI2HxeizfXWtF662vI1K18yDX73K+tl0zCy7jmvCKqmeF
+gi31OSbHk2bZR2F9HUwGGkcenidhMKn+kDrEypxelzUjhFUqfw6s7lmxUogOoDdf
+xEQaYKfsCiOIsecI6JJ7VUgm0M3dAqXMmMs3B5K3O4QIjLaFsIRb+joCANL9TUz9
+HFwUZmaR69s5zreWi/FVQF/mMEDeMXTfzyClu692FpWQ7fJns6quoaavSyOBGcOY
+ma8NtVkmkxgO8JjtlwIDqwAWkH8ML6aRAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRe/zKjyhGnk+X89C9ynWEPakNhJjANBgkqhkiG9w0BAQsFAAOCAQEA
+idtG/yOJo1kQVkWxFdD1mO6AY8JbTuJCwbxHUKsWFuyvk/rN74TI1SmYKmt01v7G
+ZnRnrxEiP8nm0+tMZC8GMoBe65XTpa1L6jVD2xK2gVc1R/8GviL5/wfYa652uUCB
+iduzNGuKgsRUqOIXCdRZpnSTazvnKvSE1pwWWbWqvK64IjdZPPc0JLpUx2z1z2YP
+CH9vvkQUa54Z82a+lRLl/JXSGApYETFxBD/mxuL6DyhhcZ/eMniejll/iBZMs2TQ
+q4Uf4QOFWwomWhTzbJ9RoW5PqxmujfI4twlL0SAifiRur90Wd2+wm2QT5LHgEaLL
+pTA8OOnOcAQgmsJXODtWzw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
@@ -120,6 +145,31 @@ EyP/QDjoD02nYu++815n4g==
</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>
+MIIDDDCCAfSgAwIBAgIJAM2y4eON2PnqMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
+BAMTC2lkcC5lcGZsLmNoMB4XDTE2MDMyOTEzMzQzM1oXDTE5MDMyOTEzMzQzM1ow
+FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDD7LOez3zrlr+A6IpY1G9Qp5VIA++bAUEe+zZMu7HbkISrqPLAqFWb
+O5cF1vgqfQQKmGYfeITgI2HxeizfXWtF662vI1K18yDX73K+tl0zCy7jmvCKqmeF
+gi31OSbHk2bZR2F9HUwGGkcenidhMKn+kDrEypxelzUjhFUqfw6s7lmxUogOoDdf
+xEQaYKfsCiOIsecI6JJ7VUgm0M3dAqXMmMs3B5K3O4QIjLaFsIRb+joCANL9TUz9
+HFwUZmaR69s5zreWi/FVQF/mMEDeMXTfzyClu692FpWQ7fJns6quoaavSyOBGcOY
+ma8NtVkmkxgO8JjtlwIDqwAWkH8ML6aRAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRe/zKjyhGnk+X89C9ynWEPakNhJjANBgkqhkiG9w0BAQsFAAOCAQEA
+idtG/yOJo1kQVkWxFdD1mO6AY8JbTuJCwbxHUKsWFuyvk/rN74TI1SmYKmt01v7G
+ZnRnrxEiP8nm0+tMZC8GMoBe65XTpa1L6jVD2xK2gVc1R/8GviL5/wfYa652uUCB
+iduzNGuKgsRUqOIXCdRZpnSTazvnKvSE1pwWWbWqvK64IjdZPPc0JLpUx2z1z2YP
+CH9vvkQUa54Z82a+lRLl/JXSGApYETFxBD/mxuL6DyhhcZ/eMniejll/iBZMs2TQ
+q4Uf4QOFWwomWhTzbJ9RoW5PqxmujfI4twlL0SAifiRur90Wd2+wm2QT5LHgEaLL
+pTA8OOnOcAQgmsJXODtWzw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index c0e51158..aff31c4b 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -204,8 +204,10 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hof.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holmestrand.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoyanger.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
index efbecfdc..8b61b7a3 100644
--- a/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
@@ -20,43 +20,6 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIFWzCCBEOgAwIBAgIQcxLz64WSGpB5dcmeJhykXTANBgkqhkiG9w0BAQUFADBR
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNv
-bW1vbjEbMBkGA1UEAxMSSW5Db21tb24gU2VydmVyIENBMB4XDTEzMDMyNjAwMDAw
-MFoXDTE2MDMyNTIzNTk1OVowgcUxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUyMDAw
-MjELMAkGA1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24xGzAZBgNVBAkTEjgw
-MCBGbG9yaWRhIEF2ZSBORTEdMBsGA1UEChMUR2FsbGF1ZGV0IFVuaXZlcnNpdHkx
-LDAqBgNVBAsTI0dUUyAtIEdhbGxhdWRldCBUZWNobm9sb2d5IFNlcnZpY2VzMRow
-GAYDVQQDExFpZHAuZ2FsbGF1ZGV0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANfcspLsGM55hXwOdOmwYne/M2rZ+7rqKtMoDjUNZARc+oTEK3Nf
-w0nPXN6d6vIlemEB/kvC3HAZy6zcUTrFpDYNPjqqI6eGfprOXO3VSXm0bLBeWNGX
-Ak9ccgpcGXBxNtJTQMuv6HEBOpiCbd7/eBDRG14yPb4ydUX1DbXez4uAP65b2nRz
-X4THs9bveQbUcBks+pl8PfPZCPv1ahxyodIR2eF2YsebJHphSkX6ivX0BVslk384
-/jUR3KM4efP2kG2p56BYlpp3D0KG5EG9LKFhHxq/3YUhVhqnVkeGl4XPIpOBzZlO
-ttep/75p1yjktaBfmhd5WMW7uIKyBySrqskCAwEAAaOCAbgwggG0MB8GA1UdIwQY
-MBaAFEhPWvovSppe4FDza3tVpd71vjRdMB0GA1UdDgQWBBRCk3Cnk79hmYIoCVhI
-V4MOg8l9dzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEw
-QjBABggrBgEFBQcCARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVw
-b3NpdG9yeS9jcHNfc3NsLnBkZjAIBgZngQwBAgIwPQYDVR0fBDYwNDAyoDCgLoYs
-aHR0cDovL2NybC5pbmNvbW1vbi5vcmcvSW5Db21tb25TZXJ2ZXJDQS5jcmwwbwYI
-KwYBBQUHAQEEYzBhMDkGCCsGAQUFBzAChi1odHRwOi8vY2VydC5pbmNvbW1vbi5v
-cmcvSW5Db21tb25TZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
-LmluY29tbW9uLm9yZzAcBgNVHREEFTATghFpZHAuZ2FsbGF1ZGV0LmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEABGCKCRVS1KcSMAgYOQPwruCoVdNxKEEaqbeKhWiC1k5y
-flJQw1fb2jzHFVg4YoI9A3KL3MrCxDMYq+ROhDS3f4aEEwMpSKSeNw/1riqBLtqn
-YSa9mY7Q+QHQxus8ZZceNn8zyI1xuK7TG83ZsOf75S4uPnlekaqHldC9QWPsGc8p
-nEEexraMIjgeDTEHxKOjGMLpIRdS20PTiXg5kDPdi60x39q/E0wY+oiwgmhKslwZ
-T3fg7+A8alM88HA16P2N/y7IKythkrPB87EkNQHfzXWJNhFLx/EnezW/aFj672YS
-+YG4S3bQoO1MSjlD3J5g6MTHmxlO9w8+rppgNEi6PQ==
- </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>
MIID9DCCAtwCCQCbiUruOaohoTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UEBhMC
VVMxCzAJBgNVBAgMAkRDMRMwEQYDVQQHDApXYXNoaW5ndG9uMR0wGwYDVQQKDBRH
YWxsYXVkZXQgVW5pdmVyc2l0eTEmMCQGA1UECwwdR2FsbGF1ZGV0IFRlY2hub2xv
@@ -98,43 +61,6 @@ mzisXEBrL04=
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIFWzCCBEOgAwIBAgIQcxLz64WSGpB5dcmeJhykXTANBgkqhkiG9w0BAQUFADBR
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNv
-bW1vbjEbMBkGA1UEAxMSSW5Db21tb24gU2VydmVyIENBMB4XDTEzMDMyNjAwMDAw
-MFoXDTE2MDMyNTIzNTk1OVowgcUxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUyMDAw
-MjELMAkGA1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24xGzAZBgNVBAkTEjgw
-MCBGbG9yaWRhIEF2ZSBORTEdMBsGA1UEChMUR2FsbGF1ZGV0IFVuaXZlcnNpdHkx
-LDAqBgNVBAsTI0dUUyAtIEdhbGxhdWRldCBUZWNobm9sb2d5IFNlcnZpY2VzMRow
-GAYDVQQDExFpZHAuZ2FsbGF1ZGV0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANfcspLsGM55hXwOdOmwYne/M2rZ+7rqKtMoDjUNZARc+oTEK3Nf
-w0nPXN6d6vIlemEB/kvC3HAZy6zcUTrFpDYNPjqqI6eGfprOXO3VSXm0bLBeWNGX
-Ak9ccgpcGXBxNtJTQMuv6HEBOpiCbd7/eBDRG14yPb4ydUX1DbXez4uAP65b2nRz
-X4THs9bveQbUcBks+pl8PfPZCPv1ahxyodIR2eF2YsebJHphSkX6ivX0BVslk384
-/jUR3KM4efP2kG2p56BYlpp3D0KG5EG9LKFhHxq/3YUhVhqnVkeGl4XPIpOBzZlO
-ttep/75p1yjktaBfmhd5WMW7uIKyBySrqskCAwEAAaOCAbgwggG0MB8GA1UdIwQY
-MBaAFEhPWvovSppe4FDza3tVpd71vjRdMB0GA1UdDgQWBBRCk3Cnk79hmYIoCVhI
-V4MOg8l9dzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEw
-QjBABggrBgEFBQcCARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVw
-b3NpdG9yeS9jcHNfc3NsLnBkZjAIBgZngQwBAgIwPQYDVR0fBDYwNDAyoDCgLoYs
-aHR0cDovL2NybC5pbmNvbW1vbi5vcmcvSW5Db21tb25TZXJ2ZXJDQS5jcmwwbwYI
-KwYBBQUHAQEEYzBhMDkGCCsGAQUFBzAChi1odHRwOi8vY2VydC5pbmNvbW1vbi5v
-cmcvSW5Db21tb25TZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
-LmluY29tbW9uLm9yZzAcBgNVHREEFTATghFpZHAuZ2FsbGF1ZGV0LmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEABGCKCRVS1KcSMAgYOQPwruCoVdNxKEEaqbeKhWiC1k5y
-flJQw1fb2jzHFVg4YoI9A3KL3MrCxDMYq+ROhDS3f4aEEwMpSKSeNw/1riqBLtqn
-YSa9mY7Q+QHQxus8ZZceNn8zyI1xuK7TG83ZsOf75S4uPnlekaqHldC9QWPsGc8p
-nEEexraMIjgeDTEHxKOjGMLpIRdS20PTiXg5kDPdi60x39q/E0wY+oiwgmhKslwZ
-T3fg7+A8alM88HA16P2N/y7IKythkrPB87EkNQHfzXWJNhFLx/EnezW/aFj672YS
-+YG4S3bQoO1MSjlD3J5g6MTHmxlO9w8+rppgNEi6PQ==
- </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>
MIID9DCCAtwCCQCbiUruOaohoTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UEBhMC
VVMxCzAJBgNVBAgMAkRDMRMwEQYDVQQHDApXYXNoaW5ndG9uMR0wGwYDVQQKDBRH
YWxsYXVkZXQgVW5pdmVyc2l0eTEmMCQGA1UECwwdR2FsbGF1ZGV0IFRlY2hub2xv
diff --git a/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..8498948c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ig.cas.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="2016-04-06T13:47: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/avcr</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">ig.cas.cz</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Institute of Geophysics of the CAS, v.v.i.</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Geofyzikální ústav AV ČR, v.v.i.</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider IG AV CR employees.</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance GFÚ AV ČR</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.ig.cas.cz/en</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://www.ig.cas.czu</mdui:InformationURL>
+ <mdui:Logo height="44" width="30">https://jiftach.cas.cz/loga/logo-gfu-44.png</mdui:Logo>
+ <mdui:Logo height="146" width="100">https://jiftach.cas.cz/loga/logo-gfu-146.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUW5TBaaB6SfKUuLQgLg+XaF0y3J4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmlnLmNhcy5jejAeFw0xNjA0MDUxMzI0MTlaFw0z
+NjA0MDUxMzI0MTlaMBgxFjAUBgNVBAMTDWlkcC5pZy5jYXMuY3owggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvMAk1nwttucujjFQOSyuiS4jPK4M7TVip
+5rRgjz3M7Jmp4X0ZwYCcokPvD1iC+hQFHUiQdEGyvxPcl/3q7lKcrxFhbJUhP4yl
+ZgrJysS91zx9LxEgFeNRIObSGCDLe5+EKRBoyScHhBkBrbIMVhqTjwvIBPuzqmi0
+8sew/BijdVsP9JkGfTr15qw/U6rzE3kh6HY65P5x50D2gLl8dwyAkgdbTdrwZ+Z9
+il1x9sVlVasM+//2OFdhEtjqPAg0M2+azek3NxjYhnsM+ca22yLD5js8cMCVkheZ
+9KA94ic+4hd7NHqgUrmMETQEeOVUbZ5PndJI9lV+whxm5uWtEph9AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5pZy5jYXMuY3qGJGh0dHBzOi8vaWRwLmlnLmNhcy5j
+ei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUDghEtRanFH4cZQ/+Lclh2VR5bJYw
+DQYJKoZIhvcNAQEFBQADggEBAHwmYx8J6PauVsJg0DZs8d2qXv0vMJObff+rrEEV
+fOCRFu7xGfMNGFq8vIGk8iWeFE4XOk/uUntjuHCRmPiqeBifukhBWPXwwflpmimn
+lYW0fYbfDG5bqOa/fGv2ztq6cpKkWN81KI9bzXAuyYIgzYPXhodUXICa8OFYH2a/
+j91+yHDcBb/Kpl6ReAK4qj9GO0Z2k7dnNsbDtVCdi1DJpDWjElJszPl6dc1+5F6i
+ZY9vTx0lCROCttAMuKYs5fcReLwk+/o2IlfIxdxdAVWXDa74bGoWicPV4IvMYax9
+iAMUVpLKlI8Ml/V8Qgk4piCGEo3pgoP8PlIY9phZL+b1IZo=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.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.ig.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ig.cas.cz/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ig.cas.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">ig.cas.cz</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUW5TBaaB6SfKUuLQgLg+XaF0y3J4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmlnLmNhcy5jejAeFw0xNjA0MDUxMzI0MTlaFw0z
+NjA0MDUxMzI0MTlaMBgxFjAUBgNVBAMTDWlkcC5pZy5jYXMuY3owggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvMAk1nwttucujjFQOSyuiS4jPK4M7TVip
+5rRgjz3M7Jmp4X0ZwYCcokPvD1iC+hQFHUiQdEGyvxPcl/3q7lKcrxFhbJUhP4yl
+ZgrJysS91zx9LxEgFeNRIObSGCDLe5+EKRBoyScHhBkBrbIMVhqTjwvIBPuzqmi0
+8sew/BijdVsP9JkGfTr15qw/U6rzE3kh6HY65P5x50D2gLl8dwyAkgdbTdrwZ+Z9
+il1x9sVlVasM+//2OFdhEtjqPAg0M2+azek3NxjYhnsM+ca22yLD5js8cMCVkheZ
+9KA94ic+4hd7NHqgUrmMETQEeOVUbZ5PndJI9lV+whxm5uWtEph9AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5pZy5jYXMuY3qGJGh0dHBzOi8vaWRwLmlnLmNhcy5j
+ei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUDghEtRanFH4cZQ/+Lclh2VR5bJYw
+DQYJKoZIhvcNAQEFBQADggEBAHwmYx8J6PauVsJg0DZs8d2qXv0vMJObff+rrEEV
+fOCRFu7xGfMNGFq8vIGk8iWeFE4XOk/uUntjuHCRmPiqeBifukhBWPXwwflpmimn
+lYW0fYbfDG5bqOa/fGv2ztq6cpKkWN81KI9bzXAuyYIgzYPXhodUXICa8OFYH2a/
+j91+yHDcBb/Kpl6ReAK4qj9GO0Z2k7dnNsbDtVCdi1DJpDWjElJszPl6dc1+5F6i
+ZY9vTx0lCROCttAMuKYs5fcReLwk+/o2IlfIxdxdAVWXDa74bGoWicPV4IvMYax9
+iAMUVpLKlI8Ml/V8Qgk4piCGEo3pgoP8PlIY9phZL+b1IZo=
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Institute of Geophysics of the CAS</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">Geofyzikální ústav AV ČR</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Institute of Geophysics of the CAS, v.v.i.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">Geofyzikální ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ig.cas.cz/en</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://www.ig.cas.cz/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Petr</md:GivenName>
+ <md:SurName>Vaníček</md:SurName>
+ <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml
deleted file mode 100644
index 7f2d11ef..00000000
--- a/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lu.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>
- <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:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute xmlns:saml="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">
- <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>
- <saml:Attribute xmlns:saml="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">
- <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>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu.se</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Lunds universitet (Gammal)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Lund University (Old)</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Gammal IDP - Använd inte!</mdui:Description>
- <mdui:Description xml:lang="en">Old IDP - do not use!</mdui:Description>
- <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
- <mdui:Logo xml:lang="sv" height="78" width="450">http://www2.ldc.lu.se/images/LU_swe_logo_450px.jpg</mdui:Logo>
- <mdui:Logo xml:lang="en" height="78" width="382">http://www2.ldc.lu.se/images/LU_eng_logo_382px.jpg</mdui:Logo>
- <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
- <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>lu.se</mdui:DomainHint>
- <mdui:DomainHint>lth.se</mdui:DomainHint>
- <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
- </mdui:DiscoHints>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAPx05QNy/rJ5REDxNwYau5tDh3VUMA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTAeFw0xNDA5MTEwNjAwNDhaFw0zNDA5
-MTEwNjAwNDhaMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKpuswtBZvLMD+yzqjQKm/qVOb43dhPlUorjNDA1Vg5N
-f6x+E0HBZfrhK5O2lXevCbK5yE1dAi8Se/3AH/hJYkz+OaQT1QfryvQsbqD6hgN3
-9oXCC8e66vI6PGa1lRrPKK+1xLkWFfnFJtDEGUyGsyZ/1upkyjiaxfegN7gYNOFj
-QBtIQUHwbkITLGbWJBEMGbgaYd77M8zOBDwHh1TNC/9elCVTaU2UMYOLqBmdR1Hl
-o+q3nHjpOlJ4Q85FMhdcOlrzTi43TWDuc1nxgIeGG94+o3ekDBUi7jMIaIgwwBpr
-ExtI/Im319D2l2L9xPrX6Qe+yyPYs+SB7zr0Qxm4YO8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLmx1LnNlhiBodHRwczovL2lkcC5sdS5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUQWUHLXRD0hRwmWtwxFuwf6Kfbd4wDQYJKoZIhvcNAQEFBQAD
-ggEBAB6WOo99LL70V31BADdWiag7Tnq8e+T/cLhb8z4vJk9tD3OJBuNMf1u0yUms
-JJ0gHTM7ctaF/i4XvvCQOgzfZ28yV5QtHpQe38DicVYxWuRRjQ/DYv4no0p4LMat
-CVDEnkB0AHo0XyPi2w/tqup96cbROdgsWo6I/2aatRwrgdG+7T9pL5V+AWeb4Htc
-g+KO8Z/ICMfvzv9w/cP7c9oErCABjLd1y/wUh/YbY4yCgJbZLftm0gjDwGhioj6x
-jofk6rzliDsjfc7aVImQ98eiwlA4GQW2MOnbbQM7PtW3BFax+SJlpJUDcqa379Ol
-u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lu.se/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lu.se/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.se: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.lu.se/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lu.se/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lu.se/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">lu.se</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAPx05QNy/rJ5REDxNwYau5tDh3VUMA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTAeFw0xNDA5MTEwNjAwNDhaFw0zNDA5
-MTEwNjAwNDhaMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKpuswtBZvLMD+yzqjQKm/qVOb43dhPlUorjNDA1Vg5N
-f6x+E0HBZfrhK5O2lXevCbK5yE1dAi8Se/3AH/hJYkz+OaQT1QfryvQsbqD6hgN3
-9oXCC8e66vI6PGa1lRrPKK+1xLkWFfnFJtDEGUyGsyZ/1upkyjiaxfegN7gYNOFj
-QBtIQUHwbkITLGbWJBEMGbgaYd77M8zOBDwHh1TNC/9elCVTaU2UMYOLqBmdR1Hl
-o+q3nHjpOlJ4Q85FMhdcOlrzTi43TWDuc1nxgIeGG94+o3ekDBUi7jMIaIgwwBpr
-ExtI/Im319D2l2L9xPrX6Qe+yyPYs+SB7zr0Qxm4YO8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLmx1LnNlhiBodHRwczovL2lkcC5sdS5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUQWUHLXRD0hRwmWtwxFuwf6Kfbd4wDQYJKoZIhvcNAQEFBQAD
-ggEBAB6WOo99LL70V31BADdWiag7Tnq8e+T/cLhb8z4vJk9tD3OJBuNMf1u0yUms
-JJ0gHTM7ctaF/i4XvvCQOgzfZ28yV5QtHpQe38DicVYxWuRRjQ/DYv4no0p4LMat
-CVDEnkB0AHo0XyPi2w/tqup96cbROdgsWo6I/2aatRwrgdG+7T9pL5V+AWeb4Htc
-g+KO8Z/ICMfvzv9w/cP7c9oErCABjLd1y/wUh/YbY4yCgJbZLftm0gjDwGhioj6x
-jofk6rzliDsjfc7aVImQ98eiwlA4GQW2MOnbbQM7PtW3BFax+SJlpJUDcqa379Ol
-u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.se: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">LU</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="sv">Lunds universitet (Gammal)</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Lund University (Old)</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.lu.se/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml
index 07474dd5..39cd1a8e 100644
--- a/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml
@@ -31,32 +31,6 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIULYVKeMBxRsucHrLPmp+zodQl8tkwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owHhcNMTAwMzI2MjAxNDA1WhcN
-MTMwMzI2MjAxNDA1WjAZMRcwFQYDVQQDEw5pZHAubWVuZGVsdS5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMn+h1Ko8RYR8t6wvUPDnV6KiDlU4UVb
-yY/oL58LnKDRNBq//7dNDtCX5dQh3iOQlH+FWXLUC4bdPXLNJAJw77u5VXl82yna
-OFPoENyUF8WJYETGumArObLC7AY45jT41oRba2V4aaJGYTQtFKbFAsSk0SEdG9gB
-vhEGcqIoC1S8b2lnlc4Vmpwq+2tE2IG4F+K3ddWMR1HsQ/x67G+exGEgk40vIu+e
-BHHAhxfo/hdp3e2fS7U01xk1+utNAJKe6g+mu1a8GRMfgNu6rsLuWP4EVmCbI3oD
-1c4/fZKKlxBvommYDnMQtLkV11aw2bLncMn/uCjnZcWyHdu8p65FmK0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLm1lbmRlbHUuY3qGJWh0dHBzOi8vaWRwLm1lbmRl
-bHUuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA5nyJD3Buj/4ij0SM4NErZG
-3GtGMA0GCSqGSIb3DQEBBQUAA4IBAQCyCILpxpUm1ZDUiR7QxchL4lA9S2x6XLQ0
-HWz41Op+1JtIgeqAFh6tAt1g7zdMa43VKgyIR25UGSiwHsr06z7FXJIZzoNjTjCM
-/zPKrBe0hO2RQc7AijF3+2QDrUJlHqZeJCtPLt3JWwtwlQTTIn90xMqXADFcUNFQ
-cRdzDuQSofQuHMEHcWgdtGRwQPacszBy91NpgX0T4y6xSfuQYNeTpmZXfnQL5smJ
-lBNL8eqOxByMpH+/YfQk98r7d7YmRqluNPP1GHwoqC2yg+UZ4HOwyi8S3qdnWiks
-cXNhujYx9zNwZVYZDpuixY0g3ar6KUpCoI47FH4JZyj1tEqbyKu4
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
MIIDlzCCAn+gAwIBAgIJAJDI3wy+XpHDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
BAMTDmlkcC5tZW5kZWx1LmN6MB4XDTE2MDMyOTEwNDE0MFoXDTM2MDMyNDEwNDE0
MFowGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owggEiMA0GCSqGSIb3DQEBAQUA
@@ -98,32 +72,6 @@ eBFJcQNHXyofYwsQlK2LyCnlOlpQUtbXe5/BcXKA9pp+RnjZAB9dVpY/KJ6hy6BQ
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIULYVKeMBxRsucHrLPmp+zodQl8tkwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owHhcNMTAwMzI2MjAxNDA1WhcN
-MTMwMzI2MjAxNDA1WjAZMRcwFQYDVQQDEw5pZHAubWVuZGVsdS5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMn+h1Ko8RYR8t6wvUPDnV6KiDlU4UVb
-yY/oL58LnKDRNBq//7dNDtCX5dQh3iOQlH+FWXLUC4bdPXLNJAJw77u5VXl82yna
-OFPoENyUF8WJYETGumArObLC7AY45jT41oRba2V4aaJGYTQtFKbFAsSk0SEdG9gB
-vhEGcqIoC1S8b2lnlc4Vmpwq+2tE2IG4F+K3ddWMR1HsQ/x67G+exGEgk40vIu+e
-BHHAhxfo/hdp3e2fS7U01xk1+utNAJKe6g+mu1a8GRMfgNu6rsLuWP4EVmCbI3oD
-1c4/fZKKlxBvommYDnMQtLkV11aw2bLncMn/uCjnZcWyHdu8p65FmK0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLm1lbmRlbHUuY3qGJWh0dHBzOi8vaWRwLm1lbmRl
-bHUuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA5nyJD3Buj/4ij0SM4NErZG
-3GtGMA0GCSqGSIb3DQEBBQUAA4IBAQCyCILpxpUm1ZDUiR7QxchL4lA9S2x6XLQ0
-HWz41Op+1JtIgeqAFh6tAt1g7zdMa43VKgyIR25UGSiwHsr06z7FXJIZzoNjTjCM
-/zPKrBe0hO2RQc7AijF3+2QDrUJlHqZeJCtPLt3JWwtwlQTTIn90xMqXADFcUNFQ
-cRdzDuQSofQuHMEHcWgdtGRwQPacszBy91NpgX0T4y6xSfuQYNeTpmZXfnQL5smJ
-lBNL8eqOxByMpH+/YfQk98r7d7YmRqluNPP1GHwoqC2yg+UZ4HOwyi8S3qdnWiks
-cXNhujYx9zNwZVYZDpuixY0g3ar6KUpCoI47FH4JZyj1tEqbyKu4
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
MIIDlzCCAn+gAwIBAgIJAJDI3wy+XpHDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
BAMTDmlkcC5tZW5kZWx1LmN6MB4XDTE2MDMyOTEwNDE0MFoXDTM2MDMyNDEwNDE0
MFowGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owggEiMA0GCSqGSIb3DQEBAQUA
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
deleted file mode 100644
index d012e423..00000000
--- a/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mijnhelicon.nl/nidp/saml2/metadata">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-05T17: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">Helicon Opleidingen</mdui:DisplayName>
- <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/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>
- </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/9ab8d5ff3391fff206e4c5c9b138c9d6"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Helicon Opleidingen</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Helicon</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.helicon.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/idp.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
index 3fce7dfb..26a8d67b 100644
--- a/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
@@ -45,38 +45,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEdTCCA12gAwIBAgIQe1M3iT3f/2KTNQrtPxJO9zANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxMTAwMDAwMFoXDTE2MDQxMDIzNTk1OVowQjEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRpZHAubm90dGlu
- Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCJKaG8
- 8WhWnpx1nIaiU+QJnQONYwqLyA8mpBThyXDGBZum2/u7rJeaqAicbtOSO+Wlwfz0
- nPPxgv7g103BOCELqo5vc2agVJZTTGBHAPbJsSpnqZTcxZVqCooemLFeh+7YS5C/
- vk1XZmk0O63JAqmTJSFOi4OpdcbI1uojACA5mhpYVb1PllMwbOMOBDPT79DZSUDi
- 8nu3xzEYOkSOw33Fk8wmXMU4/vjn3ZHBv9SbUyA0FyRiMIk3XujXRIUaVrJBKvkQ
- MFF6r84N6oRQH/UCsvzBYYBIh0f0Vl+irwpzj7e/p/8FV1QQmVMB9D4DG1zcqTiK
- nEC0YIAnf9ec1JUCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
- KzdXR+qQ47ntMB0GA1UdDgQWBBTQtQfjFYFrVoVdyhsPVSEgFgwwgTAOBgNVHQ8B
- Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
- BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
- BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
- cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
- L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLm5vdHRpbmdoYW0u
- YWMudWswDQYJKoZIhvcNAQEFBQADggEBAHpnljGSmsagTtG4QQXuYT9riYNyw4lX
- w3P96GIFPKPH4q1B5IUbIWqvXm5/YWG1t5GK3sdNl/H0I2Araej3h3Ep1VKyU1IS
- MtmyAMVFbEFK7qpLqGadOCJojIOKkgSNv9B601iJ9MLc3HETBK3/plotP1SBMiBH
- ErIC3PM2XB6gZ53u7GdsBt58gL0KamrLWRfBymXMB30EdBZyncAUse5EuCmP0+zy
- YrWrdQpwZFzid6O8ClK4matKCpg4i2XG0mw+5sH7aPN/j+whNj4xzvKbv1T9Yke+
- mA0w+oSnr4UMSWEb2bb985BmqcNfixmz0EtzfqnKkLL0h1oS9WLoFKs=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -123,38 +91,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEdTCCA12gAwIBAgIQe1M3iT3f/2KTNQrtPxJO9zANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxMTAwMDAwMFoXDTE2MDQxMDIzNTk1OVowQjEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRpZHAubm90dGlu
- Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCJKaG8
- 8WhWnpx1nIaiU+QJnQONYwqLyA8mpBThyXDGBZum2/u7rJeaqAicbtOSO+Wlwfz0
- nPPxgv7g103BOCELqo5vc2agVJZTTGBHAPbJsSpnqZTcxZVqCooemLFeh+7YS5C/
- vk1XZmk0O63JAqmTJSFOi4OpdcbI1uojACA5mhpYVb1PllMwbOMOBDPT79DZSUDi
- 8nu3xzEYOkSOw33Fk8wmXMU4/vjn3ZHBv9SbUyA0FyRiMIk3XujXRIUaVrJBKvkQ
- MFF6r84N6oRQH/UCsvzBYYBIh0f0Vl+irwpzj7e/p/8FV1QQmVMB9D4DG1zcqTiK
- nEC0YIAnf9ec1JUCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
- KzdXR+qQ47ntMB0GA1UdDgQWBBTQtQfjFYFrVoVdyhsPVSEgFgwwgTAOBgNVHQ8B
- Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
- BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
- BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
- cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
- L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLm5vdHRpbmdoYW0u
- YWMudWswDQYJKoZIhvcNAQEFBQADggEBAHpnljGSmsagTtG4QQXuYT9riYNyw4lX
- w3P96GIFPKPH4q1B5IUbIWqvXm5/YWG1t5GK3sdNl/H0I2Araej3h3Ep1VKyU1IS
- MtmyAMVFbEFK7qpLqGadOCJojIOKkgSNv9B601iJ9MLc3HETBK3/plotP1SBMiBH
- ErIC3PM2XB6gZ53u7GdsBt58gL0KamrLWRfBymXMB30EdBZyncAUse5EuCmP0+zy
- YrWrdQpwZFzid6O8ClK4matKCpg4i2XG0mw+5sH7aPN/j+whNj4xzvKbv1T9Yke+
- mA0w+oSnr4UMSWEb2bb985BmqcNfixmz0EtzfqnKkLL0h1oS9WLoFKs=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
index 19329003..5e9b1cf1 100644
--- a/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
@@ -62,7 +62,7 @@ mSq9+fohezZUYgCirIJuORsZiubp0lExD9/P9hYK6tNtxCeKpOrFKfqDonlcFwq4
<md:Organization>
<md:OrganizationName xml:lang="en">Maynooth University</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">Maynooth University</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://mu.ie</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.maynoothuniversity.ie</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
<md:GivenName>Jason</md:GivenName>
diff --git a/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..12c8aca3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.pasteur.fr/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-06T15:53:01Z">
+ <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">pasteur.fr</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Institut Pasteur</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAAxZJREFUOBFNU0toVEkUvbfqvf69MSZqT4vjh8nCvzCMoMysXEhAgpKFUSHJ+KENuFB36kobXQjD4IyCC02Q2Om40I0rQZAZRUEFFxpFiYtEEn8d2yZmjN39XtW93uo2YMGjbtU799xzP4Xw/eq8quHaDlu/6szFFgbLFkXWJJFpSmNyulhNVGHNc4ZcjmbdkHOgAHKAuRMMgJzp6fvZMhxAwDZEXsIMTQIuM+J5o/W5qYG9UwCMDQKcNRrH+V39uxXS3+inWoAiuURgG30SdCcRGUB1WCEOTBay1xseQjuRX7xx3tzXE0FhYMtPAfSHJOrI1r1ReR6B7Srls1cWdPc/0EHLRpopl0BhG0E0+TF/4A2+H/JtlaJy+39nm0fNPK+FK1HEqFD7WqK/+FCbuy6T+Dif2BuWqBlAUcXULSmuFsg/SnvRkeHS1sAwjKGtjbOX8AWo60DAEVdUy0rLHUsKsqEIgJIYm4yxf6j0zhv5bfc7Xo1MN29vD2+2RmF4Qn7+j7GUbI2FXkycMUI/ITQ0huS/FWOtlHCX+nXP+PrWlLcqkwwv/5toW14ayp6UQv1OX6YeOLGOgk3ozDSYEJTiXqvsZowF0h1eqd5ZnfpMFljHflEMD9NdFw8WB7PPPhT2/0bKHHQExLUZAR9DNq1kVIjMpzmquF8/KIOq4sKwDV2b5qAfP5fu6XskVc8mIFV1qPLQoemQTN4CdoDim6B0XBQ5eaEShhFp2ydx9oSF2NRIzPU6MacvpOiCI8j05ANf+3d1LDgjRUwI3kiXUBryVBWv7BuV+PekUAJFGQJUbE3ExgVnN4UQuUlmSFJdNjdGXRojCgquL64/f0lkZ3ryOYAMX31a62AVD1yW5tu1kWAeR9WXRMlLSh6GKhX235aMjmMsCZKf67mScgse42LPLs9pRhWLkwlDRu4tD3VPOwLHDkJyCqLqUcmvKMcKhxV5WvB41lv2LzKZlm3tiVbcXhrsvQM5dmFcKg29k4PZP2U811nWG1jxinSt6ZgjKC2dmEFNHWRp7Y+15g3FfO8tpxxySF8BHZ54NL0wTpgAAAAASUVORK5CYII=</mdui:Logo>
+ <mdui:InformationURL xml:lang="fr">http://www.pasteur.fr/</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Institut Pasteur's staff</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Institut Pasteur</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Personnel de l'Institut Pasteur</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>
+ MIIDJDCCAgygAwIBAgIVAM8NHj+g2+LDA3cgW3pLZnacQa9QMA0GCSqGSIb3DQEB BQUAMBkxFzAVBgNVBAMTDmlkcC5wYXN0ZXVyLmZyMB4XDTEzMTAxNTEwMzQzN1oX DTMzMTAxNTEwMzQzN1owGTEXMBUGA1UEAxMOaWRwLnBhc3RldXIuZnIwggEiMA0G CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvDkYEJsGc0q44FM+vk1gvd2olN2Oa QS5MEJrvSsgNaL6b8bzgPhqOCfAeSLc9mVmp+j7MuFWQEboy0OAmsFzSD3YVBipJ AMa8+bwk5jhvB3BJ/YbsjSYdx3nP/W3um9kjx0L44bfrsFltA8ShGx3TzgFkYk5D U8yynYz0azOBTrswm+OMKNbFf6kg3ApWsIX0EsYwtzKrbF/NKlCiUovdj9/ZEZU3 Ofk07Q0Ugi21HusAM9wWBhVmeuOnnIxR+4lWLwocfUBFDsSyyD9mjxqXMqU24N7R vs/mSIYGZe18H8zS26YS0IMVzlPVZSIF8j9XMFLTvprk28SYXnc0cxmlAgMBAAGj YzBhMEAGA1UdEQQ5MDeCDmlkcC5wYXN0ZXVyLmZyhiVodHRwczovL2lkcC5wYXN0 ZXVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRgZUBj6mFNK1rhpOxmhCa5 42xG9TANBgkqhkiG9w0BAQUFAAOCAQEAo3GFGV2Y3sb2QENh8ZJI+4hG2Pg4Adoj umDi7S6mXttNFcoC3LPVQuC/nsZsSz0ssmgHNFyvXOpLvITrUftdtS+zmCFwGlBV nWXF0sk2inc2xJRwYz6WolTj8I8J4Y2XvRMKu53Ysg4JPioE2nNtJs5PVsbkLpVU sF9M03mahyLDFNydv7ZTesTkN9r5+3WjZJVSQw5O8qAKllCo4t7+LS4JIl7Vg7a0 j3JcaueG6lbWSn82ib/oZcGGC8TpM4BrD+hrRuMrsHv0vuoFuzOlLjZVD89XuuLO GE+WCIfpIz0LEDbzBnZwm6z24itrreAnY1PWyGfl0Pj8fPDxoyaZNw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pasteur.fr/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pasteur.fr/idp/profile/SAML2/POST/SLO"/>
+ <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.pasteur.fr/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pasteur.fr/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Institut Pasteur</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Institut Pasteur</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.pasteur.fr/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>fed-admin@pasteur.fr</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml
new file mode 100644
index 00000000..642c69a5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.politecnica.edu.co/idp/shibboleth">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://colfire.co" registrationInstant="2016-04-04T00: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">politecnica.edu.co</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">POLITECNICA - Corporacion Politecnica Nacional de Colombia</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="es">POLITECNICA - Corporación Politécnica Nacional de Colombia</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Corporacion Politecnica Nacional de Colombia</mdui:Description>
+ <mdui:Description xml:lang="es">Corporación Politécnica Nacional de Colombia</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>
+MIIDRDCCAiygAwIBAgIVALLT+WTdNsEz6xx5u57WIcx8JElFMA0GCSqGSIb3DQEB
+CwUAMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmljYS5lZHUuY28wHhcNMTYwMjI1
+MTQ0NzI4WhcNMzYwMjI1MTQ0NzI4WjAhMR8wHQYDVQQDDBZpZHAucG9saXRlY25p
+Y2EuZWR1LmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjKyNQzEY
+IDz7LLU7JhEYAguZiscGEX3B79BN5iaaEEd7NhzyYL5e4H4sFnJZ0i3lvFxGlDZj
+XtT7xEv8eS6SSbjZJ9FOmmbOMHfpGMIaYjXHx6MzkLN/jfVv/Q18JXCnQzmaY8XS
+YzQXxl5bGtBcsnv6g0TmJZpxS5y/jNIQvcZRujekkbskjyMkqlLo7fA41BjwGjgr
+Ri44+/QUaGgAQzLsjyPJzC+MDfcCQWG1L9Jdw8853qboTkn5SHJqrZD1OeOTYirw
+WsQRj249Y33p7+kLBrMD+54KrPk63mLPF2lYjh2KzfBR1qbuiNjAEXXKfYAl47dz
+I/KNCNpiLVbYXwIDAQABo3MwcTAdBgNVHQ4EFgQUM43hzLJFdMk8Sxshi8WWy7ME
+JaIwUAYDVR0RBEkwR4IWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jb4YtaHR0cHM6Ly9p
+ZHAucG9saXRlY25pY2EuZWR1LmNvL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQBOazTBGiBWAlaDmIhRxZgTmYDQeqvia95RR59uW8bhg1HSxQruz45d
+ZF4XWEhJ6utKGo6QCJSXf/MsAaPUKCYT6OBvIbTArTeUeKzyOEAnH3IL3uO4F3d6
+GyQc7EOSaAWywtPe1fiCM02I//FNl1K+VIJdfO7lFGLNx8XZ4TAmxWmlCc3uaI23
+v/2bRIY12legoOZGMBD+U05hMvPozP3dawqRXKmMpIT94t7QoRUT9sLfCE1E/Obn
+s0fmhhFblLDWEWCf46oIfgd4zGZqcmLHAKeUmnCA2tMrSD7+fmXVDz6yt3ySpKCK
+TdJDiBfKuVh3IECFWZ6+L9/CVJv5Sqm7
+ </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>
+MIIDQzCCAiugAwIBAgIUNo4WuHVgmvnokxrB1OeB+1nrgn8wDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjRaFw0zNjAyMjUxNDQ3MjRaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCliUrMbHvs
+kl3COdt7P0UgoEQ5smBH9YetLsvzGo+tbLJ7SRqkITlRWQXaJFqePJ+APRo8tRIR
+mL99gl2OuOc6etN82KVB8idyE2rC/uEQnqfVZO0WPAibICEm2zjoaMMdSTgev4gI
+LqeZ2HCG50DjFhcWNglsTABhvHDk8XE/QPpqoFALepozKykcTVidHzyDQeH4+syJ
+IiwsW+mH83LnbQ1vIuqqGYwZ9+9BDy0pA3D9KWePfkcTpoVJLEMYHurgTEYSqivB
+476LFkaTd7DhlLi+ddb09OPeyqsumq/C0kGMY1GTJckk0C7hOayGwiWoZkyTUSHF
+ZllwhARpj8pHAgMBAAGjczBxMB0GA1UdDgQWBBRY/2odAVt3NTy+R/k2pou6SW/r
+2DBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAGbF/LoU7ZuCZoNjUyxKdfxjkJkgZ75PiQlqQ21+L5RbYbsTiMzuJtaV
+qyNJPJvT0MsXRwnKntiSChZ6nVtdLQXcXf2xWCiJHdcb0uzhGTFr3aIiPOTY9TiJ
+aw1foI6WxTVPtolIj+BmeKi+1Vy+ITyJZYXqC3ZnSNGv5jxGLyyjI9WnwJ5Zonl5
+MG63FxrmNlorkaHh8K6TOWcdIw2IeqBr15f7oExN6pgijgyJ/9oeVk01K9d55NLI
+lfQnX3dTZbzhAPoGnAlCIUcJjeH+ESDAR57hVC8u8+kMjdKorq4Ohvpqc+XjAYRl
+e29cUKcPujSEW+pJdMWH+2sPqW2M3wU=
+ </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>
+MIIDQzCCAiugAwIBAgIUMgiMuAX0pbhavZ4i1yl7uO2HpAEwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjZaFw0zNjAyMjUxNDQ3MjZaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjhzloyYYi
+oKmFqjuyzjiU0FdkR9kZx5t4kHbjnwbLfSr+umiRQOQuz1oVkJwXIkjKobMXUY5F
+SnPQlzUZyw2KxMmH4Pg+4KfEhYj0biRG/bmWkvoTqJdrYq9273j7uFT18i5SEWzX
+jmG8imWFkmvK2Y6VrOEYuIRiDil27TPxvEZJ6dSHv2Q/FOIzfYD582bBmeWGcOmY
+JpMuqzi5FW1vs96QIabJ9QKJ8VTvVv6TXaj75FvvWbDbtOUWghP9IKFVSa6mPB9V
+z9lHdCOPAfzsbm82hG67Q5ipEmbIfBt5bHIRrTViWwC3cYUuJudQ4Zb6Cz40hO9u
+lCIIAvDQeDCtAgMBAAGjczBxMB0GA1UdDgQWBBSZST+CVKY+u0y9KuR6jRFg1MKk
+hDBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAFJXD1U/w5DldguWWlpIgaGX33gpB8lmZ5DmwCAV9TCo5MtkzRd3psZf
+SW/FXvDqARzIPFiHgIr5uUagWQDTmTr9+AmRgMl12sHC6jL391TMw9k2B+ofA6pY
+iWCooMb2Ua8sHfETlb1i7/oHMoKfAI+vOHN30B/3zhGuevobaLmjKPBSvfCvYRJq
+nq5OpQh1pJdNwnfOFsxD5hFctOan+Q8PQCiMhm7z2epJAoIVwpxQVYzLhhQVq7NJ
+DKxk60nmPyjgvFYuXNh9JEv0Cwe8rVzuBxssCDuJYtIKNRynILzaYFP5a3lp0/tC
+hnIvrkPFl+JtdYNgaSsOrzFBzAGRH4I=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.politecnica.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.politecnica.edu.co:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.politecnica.edu.co: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.politecnica.edu.co/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.politecnica.edu.co/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.politecnica.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">politecnica.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>
+MIIDRDCCAiygAwIBAgIVALLT+WTdNsEz6xx5u57WIcx8JElFMA0GCSqGSIb3DQEB
+CwUAMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmljYS5lZHUuY28wHhcNMTYwMjI1
+MTQ0NzI4WhcNMzYwMjI1MTQ0NzI4WjAhMR8wHQYDVQQDDBZpZHAucG9saXRlY25p
+Y2EuZWR1LmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjKyNQzEY
+IDz7LLU7JhEYAguZiscGEX3B79BN5iaaEEd7NhzyYL5e4H4sFnJZ0i3lvFxGlDZj
+XtT7xEv8eS6SSbjZJ9FOmmbOMHfpGMIaYjXHx6MzkLN/jfVv/Q18JXCnQzmaY8XS
+YzQXxl5bGtBcsnv6g0TmJZpxS5y/jNIQvcZRujekkbskjyMkqlLo7fA41BjwGjgr
+Ri44+/QUaGgAQzLsjyPJzC+MDfcCQWG1L9Jdw8853qboTkn5SHJqrZD1OeOTYirw
+WsQRj249Y33p7+kLBrMD+54KrPk63mLPF2lYjh2KzfBR1qbuiNjAEXXKfYAl47dz
+I/KNCNpiLVbYXwIDAQABo3MwcTAdBgNVHQ4EFgQUM43hzLJFdMk8Sxshi8WWy7ME
+JaIwUAYDVR0RBEkwR4IWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jb4YtaHR0cHM6Ly9p
+ZHAucG9saXRlY25pY2EuZWR1LmNvL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQBOazTBGiBWAlaDmIhRxZgTmYDQeqvia95RR59uW8bhg1HSxQruz45d
+ZF4XWEhJ6utKGo6QCJSXf/MsAaPUKCYT6OBvIbTArTeUeKzyOEAnH3IL3uO4F3d6
+GyQc7EOSaAWywtPe1fiCM02I//FNl1K+VIJdfO7lFGLNx8XZ4TAmxWmlCc3uaI23
+v/2bRIY12legoOZGMBD+U05hMvPozP3dawqRXKmMpIT94t7QoRUT9sLfCE1E/Obn
+s0fmhhFblLDWEWCf46oIfgd4zGZqcmLHAKeUmnCA2tMrSD7+fmXVDz6yt3ySpKCK
+TdJDiBfKuVh3IECFWZ6+L9/CVJv5Sqm7
+ </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>
+MIIDQzCCAiugAwIBAgIUNo4WuHVgmvnokxrB1OeB+1nrgn8wDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjRaFw0zNjAyMjUxNDQ3MjRaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCliUrMbHvs
+kl3COdt7P0UgoEQ5smBH9YetLsvzGo+tbLJ7SRqkITlRWQXaJFqePJ+APRo8tRIR
+mL99gl2OuOc6etN82KVB8idyE2rC/uEQnqfVZO0WPAibICEm2zjoaMMdSTgev4gI
+LqeZ2HCG50DjFhcWNglsTABhvHDk8XE/QPpqoFALepozKykcTVidHzyDQeH4+syJ
+IiwsW+mH83LnbQ1vIuqqGYwZ9+9BDy0pA3D9KWePfkcTpoVJLEMYHurgTEYSqivB
+476LFkaTd7DhlLi+ddb09OPeyqsumq/C0kGMY1GTJckk0C7hOayGwiWoZkyTUSHF
+ZllwhARpj8pHAgMBAAGjczBxMB0GA1UdDgQWBBRY/2odAVt3NTy+R/k2pou6SW/r
+2DBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAGbF/LoU7ZuCZoNjUyxKdfxjkJkgZ75PiQlqQ21+L5RbYbsTiMzuJtaV
+qyNJPJvT0MsXRwnKntiSChZ6nVtdLQXcXf2xWCiJHdcb0uzhGTFr3aIiPOTY9TiJ
+aw1foI6WxTVPtolIj+BmeKi+1Vy+ITyJZYXqC3ZnSNGv5jxGLyyjI9WnwJ5Zonl5
+MG63FxrmNlorkaHh8K6TOWcdIw2IeqBr15f7oExN6pgijgyJ/9oeVk01K9d55NLI
+lfQnX3dTZbzhAPoGnAlCIUcJjeH+ESDAR57hVC8u8+kMjdKorq4Ohvpqc+XjAYRl
+e29cUKcPujSEW+pJdMWH+2sPqW2M3wU=
+ </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>
+MIIDQzCCAiugAwIBAgIUMgiMuAX0pbhavZ4i1yl7uO2HpAEwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWaWRwLnBvbGl0ZWNuaWNhLmVkdS5jbzAeFw0xNjAyMjUx
+NDQ3MjZaFw0zNjAyMjUxNDQ3MjZaMCExHzAdBgNVBAMMFmlkcC5wb2xpdGVjbmlj
+YS5lZHUuY28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjhzloyYYi
+oKmFqjuyzjiU0FdkR9kZx5t4kHbjnwbLfSr+umiRQOQuz1oVkJwXIkjKobMXUY5F
+SnPQlzUZyw2KxMmH4Pg+4KfEhYj0biRG/bmWkvoTqJdrYq9273j7uFT18i5SEWzX
+jmG8imWFkmvK2Y6VrOEYuIRiDil27TPxvEZJ6dSHv2Q/FOIzfYD582bBmeWGcOmY
+JpMuqzi5FW1vs96QIabJ9QKJ8VTvVv6TXaj75FvvWbDbtOUWghP9IKFVSa6mPB9V
+z9lHdCOPAfzsbm82hG67Q5ipEmbIfBt5bHIRrTViWwC3cYUuJudQ4Zb6Cz40hO9u
+lCIIAvDQeDCtAgMBAAGjczBxMB0GA1UdDgQWBBSZST+CVKY+u0y9KuR6jRFg1MKk
+hDBQBgNVHREESTBHghZpZHAucG9saXRlY25pY2EuZWR1LmNvhi1odHRwczovL2lk
+cC5wb2xpdGVjbmljYS5lZHUuY28vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
+BQADggEBAFJXD1U/w5DldguWWlpIgaGX33gpB8lmZ5DmwCAV9TCo5MtkzRd3psZf
+SW/FXvDqARzIPFiHgIr5uUagWQDTmTr9+AmRgMl12sHC6jL391TMw9k2B+ofA6pY
+iWCooMb2Ua8sHfETlb1i7/oHMoKfAI+vOHN30B/3zhGuevobaLmjKPBSvfCvYRJq
+nq5OpQh1pJdNwnfOFsxD5hFctOan+Q8PQCiMhm7z2epJAoIVwpxQVYzLhhQVq7NJ
+DKxk60nmPyjgvFYuXNh9JEv0Cwe8rVzuBxssCDuJYtIKNRynILzaYFP5a3lp0/tC
+hnIvrkPFl+JtdYNgaSsOrzFBzAGRH4I=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.politecnica.edu.co:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="es">POLITECNICA - Corporación Politécnica Nacional de Colombia</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">POLITECNICA - Corporación Politécnica Nacional de Colombia</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="es">POLITECNICA - Corporación Politécnica Nacional de Colombia</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">POLITECNICA - Corporacion Politecnica Nacional de Colombia</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="es">http://www.politecnica.edu.co</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.politecnica.edu.co</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:SurName>Hernan Hidalgo Vallejo</md:SurName>
+ <md:EmailAddress>hhidalgo@politecnica.edu.co</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Hernan Hidalgo Vallejo</md:SurName>
+ <md:EmailAddress>hhidalgo@politecnica.edu.co</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
index db02d03f..c5c594d1 100644
--- a/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
@@ -44,6 +44,32 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMzCCAhugAwIBAgIUbnfzbJZ/O+fV1NexL4aBnpXq2EwwDQYJKoZIhvcNAQEF
+ BQAwHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVrMB4XDTE2MDQwODEzMTA1
+ NloXDTM2MDQwODEzMTA1NlowHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs3FzkF00xjUKGi7Fdh32
+ ZB2ijup6n53CeVQF5fxDuuesM+LgSLKu29/mM3/cbtOVxWmcyK+MVWIEMubbqNfa
+ 6lhmHCSgpJe3H9LkpvKW1oH+4ABZ2dXw4ngzwaK2apTQaAaTyIF6nxDNqbwVhvut
+ ELaou4dHslzvHSmk/sEvqSjWBWnfZFYe1nC7ssNIJj3i5HBK9S5JWpHX5LW7916x
+ 4hPaqWZQp849Zav98Wd9z4fh37AuROjDSzxkJSyTd5ohAypFaAyzwzHd4pF1/yyA
+ IJkW60VRf2SM8+4+emTwuXRamJkn4sDDNo292u7rXQKfPXUdP0Okt979bnIuhjIx
+ mwIDAQABo2swaTAdBgNVHQ4EFgQUuthtEWH554XjUaTMZx8diEY+i/4wSAYDVR0R
+ BEEwP4ISaWRwLnJpY2h1aXNoLmFjLnVrhilodHRwczovL2lkcC5yaWNodWlzaC5h
+ Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAfO9POrniizxA
+ 3V4bb14SNEIuoKLkG4yzHXOlYP1rExHcdZXkzNXG83C50sNglLR7TadbZlk441b+
+ rKjys6rravpMIb4VnerHNHMcG8B7q/DY7BZQ1TzCI1/yqH9pJCo3ywj79/teJ+qt
+ mWBp0cRq9tkOSrAKNJG4m00JZTyk9lUssAPfsNqzPzWy4jDW+DbhoORAx7Xazsyb
+ R51QO8W37mcTYc3m9+CT9q9Dsmsi/gBdsn9UNzKGN+5++ly7Iu/rECW0htfAu3D3
+ Z1CAsGL1edbXdxYGrBIwg2Vx5utHfnLcjqWCgcK3dc/o+jUiNcEj7fXi51xY/50J
+ RHU9aHXUNA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -89,6 +115,32 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDMzCCAhugAwIBAgIUbnfzbJZ/O+fV1NexL4aBnpXq2EwwDQYJKoZIhvcNAQEF
+ BQAwHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVrMB4XDTE2MDQwODEzMTA1
+ NloXDTM2MDQwODEzMTA1NlowHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVr
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs3FzkF00xjUKGi7Fdh32
+ ZB2ijup6n53CeVQF5fxDuuesM+LgSLKu29/mM3/cbtOVxWmcyK+MVWIEMubbqNfa
+ 6lhmHCSgpJe3H9LkpvKW1oH+4ABZ2dXw4ngzwaK2apTQaAaTyIF6nxDNqbwVhvut
+ ELaou4dHslzvHSmk/sEvqSjWBWnfZFYe1nC7ssNIJj3i5HBK9S5JWpHX5LW7916x
+ 4hPaqWZQp849Zav98Wd9z4fh37AuROjDSzxkJSyTd5ohAypFaAyzwzHd4pF1/yyA
+ IJkW60VRf2SM8+4+emTwuXRamJkn4sDDNo292u7rXQKfPXUdP0Okt979bnIuhjIx
+ mwIDAQABo2swaTAdBgNVHQ4EFgQUuthtEWH554XjUaTMZx8diEY+i/4wSAYDVR0R
+ BEEwP4ISaWRwLnJpY2h1aXNoLmFjLnVrhilodHRwczovL2lkcC5yaWNodWlzaC5h
+ Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAfO9POrniizxA
+ 3V4bb14SNEIuoKLkG4yzHXOlYP1rExHcdZXkzNXG83C50sNglLR7TadbZlk441b+
+ rKjys6rravpMIb4VnerHNHMcG8B7q/DY7BZQ1TzCI1/yqH9pJCo3ywj79/teJ+qt
+ mWBp0cRq9tkOSrAKNJG4m00JZTyk9lUssAPfsNqzPzWy4jDW+DbhoORAx7Xazsyb
+ R51QO8W37mcTYc3m9+CT9q9Dsmsi/gBdsn9UNzKGN+5++ly7Iu/rECW0htfAu3D3
+ Z1CAsGL1edbXdxYGrBIwg2Vx5utHfnLcjqWCgcK3dc/o+jUiNcEj7fXi51xY/50J
+ RHU9aHXUNA==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml b/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml
deleted file mode 100644
index bb8d7115..00000000
--- a/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sfpkr.si/idp/20141210">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-12T10:12:07Z">
- <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">sfpkr.si</shibmd:Scope>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.sfpkr.si</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Elementary school France Preseren Kranj</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sl">Osnovna šola Franceta Prešerna Kranj</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity provider for elementary schoole France Preseren Kranj</mdui:Description>
- <mdui:Description xml:lang="sl">Ponudnik identitet osnovne sole Franceta Prešerna Kranj</mdui:Description>
- <mdui:Keywords xml:lang="en">identity provider elementary schoole France Preseren Kranj idp identity</mdui:Keywords>
- <mdui:Keywords xml:lang="sl">ponudnik identitet osnovna sola Franceta Preserna Kranj idp identiteta</mdui:Keywords>
- <mdui:Logo height="111" width="111">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAHpNJREFUeF7tXSt0FNsS5bkrr7z2SiQSi0QisUgkEotEIrEx963IyNjIyEgsMhI5r/auqtPnU+fTk0kmvPdYaxbJTKen+9SpXbu+/a9//vn34cX///2eK3C4uzz8lq8fct0/r/i6fffxcPHi9eH+6tvhgPftdX/57XD38dPh180F38PveP2W9xvI6YXeiNxc+vCZ/wzByLVCID++fD78/P71cPfp8+H7i5f8H8KEgK5evaNAL168ogCv33yQY14drl+/j+/Vzvs7rYcJ7zcRILRHtOvq5bvD5Ys3FAwEeH/1XYX04dNBfqFAb95+sGNeHy7/fHO4kheOuX3/UTUTm9W1FD/fyqbFK733zDexXPPz17yfBo+24Ndv3lMI0CoI5RcWXG7kUn6/hfAMSn98+0pNu5Hjf91eiubp3/28+LoJSP4WwrwWLaWA/3p7uHn3YRPiM0clEd4z3mGyuIBCwJ7DOhb6RiDw7tMnaiBtGTXvNbWQwpN7wmcQ1v3l98NPgVF8niBTjvklf3P191vCLd7/8fXL4cK08xrnFYGXtvH5rdPzhU0Ritqpl2mBIShoxt3nz0ljICzApBKW7yK8S9EuCEvsmwganwNCoYUQEARyf62Cc3uoUKsCxntJ+4aad35T8zxhU4REgfyhUOhaBKEdfqhmQVsUNlWgSatMwBTWty+E1cu/1N5BYNgQeFG4Rl5+CsReyndd/vFGBZzbwq4Az6+Jzww2bUEgANGWC7FB1CzTJCy+Ew0sPO0eNEgWni4A7KMsNmCWECqCBmRCKFd/vzvc8n2BR9pMecn5L+WFn7ER9BzYHLlWdYT0DIjN84HNardfvxabJYtOQiJCuIKmibD090tqJCA1QV9O9XkuE4IcTziFQOBGyM8gLzfiG95wAyj5uRXtpZ9Y+FOV4LLvAPGB3Tyni3V+2AREimYByn6JLXIar5pldurXNe0cFvlgDjeESA1zmGuc2Gzh06KbK4Bjxc5BC7EhoJnQQIXRXGCmgb4ZyGwvZA8oQcqh+hxCPL/m3YtghDlCi8gesXgZCdH3RNOEdSbYdEEB4kLnOoK6WijGJkUg1GZzOZIQXGDyPzYVNBMCxgsQnGxm8XdPawfPqnmIksDO3Iiv5XaIu9kg1IkK/C862PDjci0KIa63gE79/fOOMM1hxzXdfRCHXn7Hz9hcN2/NpSArlRdIzp/iGwoMl8J/GiGej7AYK6TQBLZAJhKlF7KBeCVsEhaGNgmREY+KNKG8AOqmx3SovlwXHPwLIIERJBcew2+4brkmXA82H1gxjm/h9vFdifPApkdLzK7B7sDuAb7U/3pNv+xW4JTsz+xcnwVG7DDSrJ7WZe/D6Zdr+Q6bJowX10TmC2de/vcIDmxm+rlBg5H2n04rz6N5ZmNA87EgEBYCyWCIgFF3lkEouECFXVvd0TOYHMAntE+IEGwbXAi6GojCiN/IQLigBCD8h5ColMkYEaZHCrM9keZt/huoOuwEFgfOMcmI2xRAowgLi4MFo99Fwc00pifQHpwuvO8bRrQe8HgnUI7r9o2lNk+cf3nB7VgLM65uvDXtfCLCsmlBipYAEsUFAPwAmhDKos/GtI5F+cNcYyTIFZhaEFijIeobqpui/iCQApvK/U2gg5IZgdRlhDiNEJ8WNmUHa+xQNQwQdCuMjqzT0jqEz4KYjNjhClHJA8wzDa4/V7cFSEABIeNgWQsGxK+x6dQf7eYJI79xFAjYkVd9XNj0qEn2PxYAcUQPb6l/J2EvOOsiTLzaHbxqv1bgcwWSyvMQGRDhEYj02KgihRIroAmjOMH9xq7NHvToX+/jwaY5t7BrFAhICsJTabeKAOWmyeRkUQiXYHCN0/0YmrcKW1uEBQKEnYazDsExNSU/027jmnHtcPjhPkjoDHCKl2Y65LNQo+pNuXpduiaPA5sW8sJOVQMvbFKYJdjZL8YY5WVEADcNGKUft3yTI7g8lfYFroZDJv4nY9a6GAgJ8K9BbnPgmcqSgDc3ptTR1BGckIStoMJ2zIlhU0/86waMUtMwjBtSiK8UYkSIjGEiz4YAMcoV5FjcoCdS210aLOSum8/tXvTzCuHZtAQEhqEygX+/L2Y4AKtiA+nEw5WAAy/ayoQvojBd7Vu13eV1nhg25QZThOI1NQo7DlCJKIVSbRMgShDkc9wY/D064l1D3nMXOoueZxVcyNB2vF/EMmc7vf0csIiwmKaR3hIxIExWqDnRwve4lporBKE28dMhmZld28lgM7NLYGdIoEIghQEXl0Bu8Paj0m4QAAiWkZUwgrLq35lQkAKyfJ5+j1SMyYLxJbse1wQtx3WlLAKIhpRJ+N+1lWORTdIIDKvTRNPU5qm7w/vwe8n90+Xg+T4beCLYzBYadZSC/4hOpJya+0+mEcgQaH1JnvwcGeuNOHBD5AlTLJpoNpxoQBXioZ5gdd+s/V8gzkoeIEwKEMJfXWRqsJRpGONU+NxeqLFpiUp9fzNBzcnLiWFTdh5gUxaSBUFfZVeaNuSpFpAWZAqSQ76UudaiIScHWCCwVQ9f5ZEP5uiqF21S9tLfzS6LzYXgt4jOxDUxQqbwKWRMNszt+0+027gnuBPYQJvbE0HgPjsb2csTsk27YTqvkqzEjQFWBGK2+ORmFwA7G8Mc2DtzOWgzE3u1MgYTRi4Y/3kTjgpJBafs138v/04jKFonE2lJ67KAjLBkUIQHu477xgbwgij6r8suwn6WfALYDPywPKQkQsRudIYJ1wA3CsEy8BxC1bYRWL/idSYGTS4Ihb5No2KBOUTWx/nvLlA7l3xXSev7pAhw7ZXZfi0bAshmEMH2idgezYsFewLY7GMznFi/GTIzgSbCCo29FA1lZQ/NDoUGi+CcocaCyrQILkkjSNX+QtjZ7zWUuh2ETe77nBt6wBl3Nwj/w0UAEQPLJkHyAt6jsgpzhn1C2Kygz5imp1bUH9IaTNameLonsncWKnOY7C1+LdAxLEaap4J1Afv/sMd5PU23f4GQrqEz2niPtlRV3vvqW1aIjR5zAs2bGGNjhp4Hw4704tceNUctJkv64EsFdq0vtBoiKxtXa2GgqX5u1s50oyKZo++bVGxlEt4wt7cKl4E5qjT4RJq3cEG545oYaPB3chyi+Il4dGEvJyCZVnVgMSI1PRKj0ZIa1uvFrJBmmjSeU/+95OYEhGXkr4zCWnmYqjxOc34tzK0KoNTMvvb13Qeh/0W/wmr4am6nuhAc5RInIcBHgs1IMAu+DkgKMu2oykpMsk84Wvh09rmRl/EmKG3eBtGSFKZNHt3H7H5G7sbEj2zCZvG5TqR5sxtZgFWLC8I25kIp/bY56Sj+toHQaiMUjvvmMsDBBhEZa8mxMNizZSt+XnnME2peBCnVjaDDR6IyHmrKnevIPm3sMrZ5NdmJN0Lp56UAcuF/PlRQkWnpQewuttnTir3v74WCwI5IfNFDa72Fj9lnpjUVO93j50G4qeg3tEGPIcQVVIqPOS1sDnfrgjFnXBRdPLHNiyIoJenIhdjavVbzApuHqIi4KuOc4sqCz2ze6jn6WnsaV0HSIAgSrwdiOzvYcoHrNq+OWZZ+3ibYknHGsc3tb5eaV5ZzcQ/V1j7TPYnmIRaIhUIqKAwr5Xm9UajIIysTprlBYRnbzKMlUfxzrnk2dKC4jxlxeagbMdPQoeat7oyBmltJH3vHUYhTCYhVYRI6upf/vd6xzJrbNVi4qdaMnn9XZAh6sc0si1ATnMjPY0OLpHfakoyRPzsTwMjfXYHPrs3bS0yC49E6jG4ZFJ6ywMgFqDcMEuAxzaJ1OCIFOJf1Kwxjmias2ObFLkEv61BrMn28ZL9nmpfbx1XSNtLWXWzzBJoH55rtw1olxmIiLwcQTUSODPk4JiktAfqzaYrcbkgLWfupnDYbULLN8G8rzWyyFGkz1K1kEXmR90bCzQpzW4TpnK9rToY271jNq3YkaH7y0aSoyPrWkAYiVEoTpSc5OSQANS4p8FteYCovyBOnYVC5dhFqYlLGP2PNq/J5+E70p6d0Va15+jtYsc9tQTIWZR8owfB6GZiQO2xQbOI8wO32vyA8M02MYfkBhCXQWDjZYte8BNwbJqmNPgMMM1Dk5rFAcXW0l5C3mtfP6QXEZSEb0dNgvM+S/Mb1Ma2xUg/WZf4px7LTSTPxdeqLSIMKcWHj6LNnX19TiDtzo4Z+3rHaF+yILAXE0gWDSZb4yc9e0whBlMLLYbMKTDukVf/X+buSbbalD7NMRU2M1PbBfgd2D5MmRLM4LkQ2ozeB3ljC2eedURut0szXAsJkIW5RNTeKuJxc83qqbu9Dw0hkpLhHhIid7INruGNFeG0LlxEca94YugRFXDLPmG9a2LLUONveC3BzGkWT7c8E6RVnKOMXQUADWbOD7id5wV9MJM56EvE5zAaurcwZTtYzqIU5QWyzw47gs9kMFNqPpJEy+YGD32wsR35RcBVkEVgRFtSmRJqVC3iWiehqXmhbbWJgKkjqaIaVa7CC7ONH2kIgivfbE4K9lN/tnQgWdaU6qRBuyYyldjXvhJBZ2whUS2MnJiMtFyHsE+3KPjesYGNZ4VIoqE7muxVarH0jm9ljn6zmLsJl1UIb03Z753Ye52OBr/UvFFn2rG0MAq9dq7X27TT1b6+70Aoc8EIblsrLxVZ4iQC7ZbzLVWo2ZZdyvGJePOu5PPY4RDWWbeleaPMqpzzfBKlWJXTc2zgnr6OAzph54j49+0+bh85eYduOHtoGlpcB+rxQ0VKfQtitXe2TmSNhsxI2IJJN+NpYAiONUBnxXz7jxCFvxrfftWZzY28cJlBk0Ps1lv0kbC+2mbPRcaK2yFqgPBGFwwWiRNESFQauP2/AZDm/DXO9h5Bqu1WUThxl8x4Cm5kQQZ/FPtBNEDYFQbKpRG4I/hB9J2gfiIxQ5dTXhhsSWNJ5mKXGtemfNsCcB5+X2eZI8wh3EmRf7aEw2MQwVq92Qy0nbBlDgqnp0qNOHe09XvP2wmZsQL0ymg34GKsIhpl61iRy4b5TbgMtk1CngWbpnz609rVv1ebhmuPW6g45s85ZH0CHa/NwoENvW0o/WvM1t+EI2BxEAyAUQAGC0zYsgENnbN4lmkHK5hM9Xu3FrMyvtklrv+d2sdwQccFua+dqJhgsLLRPbD4bKW1sMocCoZ/CmlEIp01IrSfAFQhl3eZe2IxuBtCHgd1fKAiQEYx+wu9st5KfsRO38VO5r4R5mTqdvYa9ImvQJTFrMdA6gN3azYwoCdlI/XYr68PQ4BdOiqA5wAaWzQubh5Y2ji1x1h32LkR2NAgMtHWbo50VqW+wK+TisePcznm3qP6uOxyZBfo0tTthmunhpajMIbdruUBbttlJutYRmmIjtEHtcrLDyAeztbBgBN0DhsH0XrEBYMtLt2gUx5wJrFS0HbA5w2gbcAqnFFXRsgO93WmbkCfnqKEDgi9gc63O8uE2L3ZJ6FSjBTmEuGCjWzBC/TxHAW3hzlu6p0013cx8XyuPgM3OzvHoiDim8OPShASwS0RN/sKkoHrQjJzL3AyfLhQXGGULM2gcWWOb40wEBNBqXqQR2zrAx8V34+/QAeUQWpAw1sbMbNmjaV5kG7P34KchouA7UOwGbsZ7tvksBFn49gaUtGi3bFk0WzeAtCGzuG2rZK7j7ESrwTLkp/fgjF7OzSJDcIdY/8IUmE7V9Rmd/f6M2G9cGdm1U/N65Ebh0AOuDhdYbLV76AzS+v+GCJjmxTHKWjg9Py9unkzlFKHNiyuxqXkFbM44gT6oAybCh6j6PDJApSag5b5H7WxN1mKmoWrCdubzJtRWBAEHFfRYp0B8501xXIeNuWgmPlgPu7sK/TrLqJEy1rycSca20dyMZKO8n1ztVMkMRwQDqCGhMbZxy9/ioRoQFjt41e75q9wQI3Y5IkjlZzsIy0DrnP5CYJJJuBbqj4yC+3yERPhAgJSgQ0iTmf3GktZl6GtazUb7sc2yNlSjIvJsoobSDxxmj91KCC09p8gmIWlYTOOceGnc1xe/d86jbN4xEZb2AhwidA6z2DwMlEEyEpPajUa3s5wxPUKd9EKAg166h8U2M6HRqVZfNBVONSwzco3ERNhkXhZYWSYdGoeMCac8QYjNQNWZcGbCLeV0pOYFYSLLCnDAqEXjnYAkSPTcVr5AFp1Qe1E76nV5w8NsXqGF8l1poMHQLQhsnvl1zMdJGBCOuV87B+GhfgdzyfJ0mEefGid9QgQHkzJ2Epa5zctzdxyihmfYCRwx2yA3FEYuzM2I4bPXhtVLG61kFnRTpDHIIYvsaYmugQ4SkAdLieAwrotERzQQwXlsRA9QAH18eB76MEhcjuqcbYW8g7DMbJ5+jroOLAoj6pIGQTIWL+/bbouO7LwQYIIgzWLnjm+ecC1s4MTva/rUs3pP2uCFdE9D28GQTduYZLXyRjriNrlQC7FUwJeSy9PMubghfAScQOqQYY7WettUO2BzHkT1mpV84T2zrIJQgfSH1ajPh4cyId6JXcuUks16jkjNKJzWO943RdxbMSMTFiWS6+TYRhnX305PwjEiIDMlnE3GijlMxMjymMv9DjEKnAg2zS7A1/NQlzisOlgUU/A+pDH7ZUNKZ0PkKSODGIyY2tJLDplzGxgHuxU2sUnGldExbeeYYqCMPawqbUbaNd2AhfkQGwnmye/0iREh8wy4xCBstgM2Fxmp5eeYHkHxjlVNFRPxllMj2Xc6IbIUyzGxzZrNzqc3BP4YIkmIHlllAIanAhno10pEBZsXroE/q8gJHB81gF6OIUyvwOW2Jouw2Ttp/D4uMs3btJFRXl2stYrA/FnkIlg4u3HYUE8jRe7FSkMlCUv2sMT5xD9ct1XEWeSIhbReAQBbahUE+bwZXp/NE20HpkYQPQoKlOu9CJvrWqdzt9S2QWCcCMTCUy2PAO7/lELV/g5ciD4YrKoQdczxLJ65CVmPZTdQowmT6AYKba1n3p/f5zWo7h4xlmtP24QPmTqjquabfh51fVOfFjYN2rhQKCUAZDpMgE2iXMAc2lQSOE12DqDEfCfaw3r8R2eYwCZkfYpzUcEWdS3l70HzIDwPsN+KjUci2cJhODdNhTvo4czsGfHraV77/iJsLmqeQaHPHEsT//C+p37kRotHzUzhc2En2gbxwPiIZSo79SZK2KCcts80T10ElgNa5oDPhRBbp1Pr9bweZis7oRYQZdh80kLsAmzusXeqaZq/0xAZ4cFhDs9qNerPZothKCqixyN74G6GLK4VPW2CyupVsmB0+SCLmI7X/hjdITSOoOTBHyWADYiSdzxEWAgVH19jAfr98czdmjfSrH1at1VdaRQCbMvtnsY5dXh2flx8g64F++gzRwaz/GDr3CljoZvNK/N20ffFpAnNJZvfmsGvbVJ/pFxcTjFDktnn2zUdCZsT3LYIhMOI36gbddZ6iGC1pjGKNkQsbCbEbKEdRqU9uSYquVPPmSvDWGMHRhlI+MqKATztaxuwquYh9ejnhcWExBGazDS/XfMF2NyjlXYscnRSgw/bBlLAgdogFFZ4yyGjKJfwMf1d32cFsgfXJ+f1MvTQDjqp6sYaB3bKtKyh//Bz8cx1ESpG87c9fvt8uZFLNWGbe7/IjjdWRl/Khgz4c+jg8/ijXWjci/jibPet+0B5UEAD40Ey14nH3mrlhvZXwQSJwLQjH3dee0jkSkSawOYOqKrDOKjrkEXj88p9MKq8x+GpRigAW/G02x5srtuDwo/i9/pU2rJvIZWjTxOl9t0MdYk74EQsci+glZ2W7bU62Zk7odeyCJsjIUbauWmgxjoFQjyaYXE/xDsZpPUbzX3C5TK4maZm1212ivU1GeNsg9NjqPRHkCYHP/Njvec+HiLwaJq3h1HO/JXqc0Ql8MRHD8iKkPShFVolzaoytkNpFrrPPEcQvkJw5O9NA/NUkz/UYkrpM1PgBIyPB0e4D26C2LcyW7KysY5ddz33ADYnPtVSPkrO4cxPBAOY9K5XX0AnEhAiIx4N3KzY3dVdrWxQswHmUBdzNUdaBzOgKIKwl1eK+WAEoAiD1QX56rDVMJKzIuxyLQawGdmXvcxTzwFKndeowObxQUmwQ+hZZ5hKjs2bLbspk9XdOhAEINQe6kufs35wR0Tp3f1B8ay5A+m+GLNVIjZ3PQZmZilNtP19wDZXdsDKAm7n8dEecA0YMssKdLS2MS8v900zI0sr1xDBacmIMd9z2r2TYqjyjAcRFCIzGGLOJ5FZkwx7EXe5Hj20WH8/gM292rUCa+Jv4bmrqN2koCQKIqEyME/vZ2AtCCBzNDx8Sp9n116hiflqMzuLolqyUpQ7kEHjGerSgIln51msE+khQP82W62nBHs3XbSZC5s3o+AzLZhAge1cCIyZddmtW2GqVlN7Cqkcl7hqd1dsywxR+puQfmn2rAUgiTZPahctC3VRpzrdXL3vWFGAdi0ez88LHF/uUg4M0MpkLAJ716UcATCkRUpakbU/47xH0DNB2mYw8oFaFWpbJkBWgae6HMsNFs77ynesCK2vqZnNm0HOKqPrXLQshAdsNRFqD1yyaLw/785bg8OGlGHBzgrB2umvmlvDDAnjmBhX5YN1rpSkAEVgy4tQ2IrdWhHuGGKfyOZtN4ObdCPP6jAU22YDCLxJZW0xVuByRaiBBljXk89SgT/n7dmwb3zoPeASttDylW0pxQpMrviosRCfTvNca6CB6QFRW+EsHF7YOxADhMzSXC6zl/oYT/XT+rZlZpsXyYK5AvlDnpRMSblfMSROqsH4iLn8mvYg2MCdWbCfj2TzRlguzFOcXbd9bEiEsXchOQOkkKzPXeziHWpDkKHwY5MQHw4/aTPYObG5OCtNGkI9sYsUlld7u20GYpQV0A+xYStmqTzmBJq3csHVAiOHJzsZ7c+srELdR27sZRGhfVqXss1zAXFgURPCUpjp0qRyHqB50DaBRro0XkCFZ8paXzl6DPmcW4NIsGaOJplew4pQjvFtw6d47VH7kYsxuWjXsLyu06CV04T8KV6cy2ntYtaB6osLYa5n5KvrqVuM5Xpco1jh5i1ZEKptJJar5yGwEML32rmz2rwebA2iG+Fu3ej55lJoHJFjMaAVlqFw/wr/p5GIMxuRRf/hdBfVbdZXmALOyLDnDrwgBZHANpT6ooIes2qzYQwzQokZcpQb44Q2b3UHDbQ138mZRiLbkJdUMJ9ms09YiRYGhLMblfPCzoIMsflftJnDDWRx6a/J7xyxBeHYuEg63XmJhpEYaGd/PvaKCekh2yq8bsed0OaNmFOtnTE1T3WeTl5scXO7R4Jg9ZA+HljHKnYWDgFlG2pHAbEQWOBWZl7DvnkrFrQOZAhalbpca1JUwGTPBdljdvawzVa4J/DzjtlJ1Y2jGBe93E5ekK2WhfXnnSsz1VEZsH+IwGh1mIbVNFAMKm+uRAaRToTy8zH9ZOdnbBU5RWGWbj+1hB2PYcuJ1IpmrByzyhPmyvAMNE8XnDWPxi7djeDwHREStAraA4KSD6ZJSVWE2kyw0Bxqp/wNGh0xRgvkA6wRMy/5N8gMWJGsnxeZfXdXOEcM2XY8vdJdk6OKg/fYsFkwYUnzRrtnFRLGfl5p6O1Y97EyJzhNWM99P4SsqJmSSsJI/GyqoMMrIjfezOnhNv7O6jWZUIFZYNZzwJycCB+1mMyII0Agx8AZZ/UbxxSDnKzYs5VjjkGq+Lxn1rxqo5iQWO1FDemN75cFsIX2mhQ0eODlj+aGUMBaVdPM2aaQNOjtD6JX7RZ2abU10G6ch/OxTdhxVGeFZZ9S81qhn9nmdRiqOelgiNCirY+9vAEsOtkmiltt8oLbQmiXJ4E5+zOfOIFydKudgXA1jiqhLzkfUz8WCuuSoCGE/tf7eb1dW9J7akNUQifERJ+zh6SoLTa0Fn0EPhnetI2aZtEbQKHXb3rmW31GjB3RaI4+4H4l4nEOzSs3+/Py82aOdubcJ4fZc3/m9zlMsi7Gyy3yoMAtfD4NgbFoyHKI1GDUszQx0xE7rD97bJtXmpkz27wRAer4hghjES5f6iNjPCaK0BlL7GUoK2AUk3YtsE2IRHk9YpVoPRahwTVAApgjtjBLJSxNH9msZ6l5q4yyBy0LkDil3ZGPY98n0MjKs/oxaazQ1nEZjKC81bpQltwjAE5WqkFuEiEfiZ9nM6aav+LH/c/YvCM0Dwvsub06RgrBil2jq4D+OPHdmG8TMsO5KPaULQpuWrIw24Tn0LxyYzxDmzcLGUU7uyI6LtQiuGyam7+3K3C8Ys9Wjvmv8fP2aN7KTQ/gtslkrEDgSiir/U7AN0Z88Nl5+F4ggthnJJT3DRLouFK26c7s5z3EPqza3A7xmdq3mYPd30zsP0RxEhpIMcISZf4IfBdzxyYI0hRbtYL8/dhmUFK4llfbQ8RGWjk7j36uj2HVp5xAcOW8zVV7Oda8/wB8dLEsMaPX+QAAAABJRU5ErkJggg==</mdui:Logo>
- <mdui:InformationURL xml:lang="en">http://www.sfpkr.si</mdui:InformationURL>
- <mdui:InformationURL xml:lang="sl">http://www.sfpkr.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>MIIFlDCCA3ygAwIBAgIGElF9nn59MA0GCSqGSIb3DQEBBQUAMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEyMTAyMjQ1MTRaFw0zNDA4MjcyMjQ1MTRaMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANQTok7kg+1o8RWpRTx91zPwoDoPWPcH9FxeVD1QiMcgB18Ox6exSL11AASI1pAj5evBwX7Wp74M5heQToC++u106HmKPERpIEfPwzY4GKoNwRGXcVzZt+jrCPIH39UYY3XgClM1bq1YUbeM9fheVNIBo0tp08nQEVll127PlKngXDSlAZ5A7qp8amrB8xnZRV9WYZIA6irULJY+DkJvQVuQWvABWVUAkZLVLJQS8aWtY0viHL7Ro4YSYii9yN2+w9TOmvQhto4tYj6eC6AeC7uZhKJGyy3GEaanWIFtqzpVCDEzv7oN9ckErHuwKtnyI68Fb+eHY3jjoKIt/egV3VSqKqkliZ4C6uszKpZPqSJCFoXDd8xZnlOTL2M+OlQExW3r7WBchAb2In/wgM/iUj+79sr1JPN+fRER38MQiUGI4QTP8aR0ifdJKodrTyyLNdmJAxQLhnTBYMLeunXat/SR0SfS5+aTDzMnAIuYcXXS0x3n/uz0d3QHvi13T1BCoBMPt6cFMGSiRQAzfgIZoCXe9O20T7gmJ16kqyq7WtDx5IfzpU7BMGHnQH64sa8dmKN6MXNu3WEu6d50urzojq56d74KZwi/JiZnxW3v3ufc8ajpHB65XN9fswyfLPSnRbZn1VG+8AHgvJexSxxfbeCh+fTFnNFBH9LWay1r1+6LAgMBAAGjUDBOMB0GA1UdDgQWBBRBteojY53LcdnWq8z0FAY/yvVWFjAfBgNVHSMEGDAWgBRBteojY53LcdnWq8z0FAY/yvVWFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAKRqU5Et1ynwkVPqxA4MqLlf4/5BR5iy3r3DvSDwWKgpq4uE8yzwndBo+P9pedTHR86OQo0jo+N1fKgq2e2JNjwIg9551LxLvHdX7M2abpP7cpjwNK0Vj/BD6CKmkfYK32voIPtVbL/1hNuTukceuCFhrRPGP97kXnOm/gF3DH8bV3igiEfIrXbGP5Qb4dwMG3MsvGpm2ruCHN4b/tWbCD8rR58IAG1fg0tq2jy0xK/3kFfcObYYihaPPxw4G2rzPpEo8KwFOyGGnJM2g2WlQOyCSwPvOsl58s/pHOKMb3ca+Mfz6fo7fFvv/J5XWvLwvffnNZ+691js473CQTiiFONIqcmvA2FdLSrtN5c2KBrNtMwNbHInQJUOKCQDhSpFIbx/xyzSNj3HbZf9r3hvTLCEgOpIGkBJILSVx2H+7XUkljLcHv/wU6HBP7BkhpfNVml+d/slUGJjpmkj52ZRTgNv1swJ3QE3quguH29EbgK3y2wPNek4VsIMG+xlA46upsnrOEqVej9apysA4XYMtwqDQ7Ei8OdoHJUIpU/OrXVApb3cGbHxofnf8BfsvEm+QGAZDxtH3kCqmfbQVUULltef11ma0ntXM4rDgR+LPnB0gme2sdug/2KK0iRf0CtbzsHq+JVw0Gz4HCRgWY7m6+9Q3qyiMspCLT+FdmLd7Smg==</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>MIIFlDCCA3ygAwIBAgIGElF9nn59MA0GCSqGSIb3DQEBBQUAMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEyMTAyMjQ1MTRaFw0zNDA4MjcyMjQ1MTRaMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANQTok7kg+1o8RWpRTx91zPwoDoPWPcH9FxeVD1QiMcgB18Ox6exSL11AASI1pAj5evBwX7Wp74M5heQToC++u106HmKPERpIEfPwzY4GKoNwRGXcVzZt+jrCPIH39UYY3XgClM1bq1YUbeM9fheVNIBo0tp08nQEVll127PlKngXDSlAZ5A7qp8amrB8xnZRV9WYZIA6irULJY+DkJvQVuQWvABWVUAkZLVLJQS8aWtY0viHL7Ro4YSYii9yN2+w9TOmvQhto4tYj6eC6AeC7uZhKJGyy3GEaanWIFtqzpVCDEzv7oN9ckErHuwKtnyI68Fb+eHY3jjoKIt/egV3VSqKqkliZ4C6uszKpZPqSJCFoXDd8xZnlOTL2M+OlQExW3r7WBchAb2In/wgM/iUj+79sr1JPN+fRER38MQiUGI4QTP8aR0ifdJKodrTyyLNdmJAxQLhnTBYMLeunXat/SR0SfS5+aTDzMnAIuYcXXS0x3n/uz0d3QHvi13T1BCoBMPt6cFMGSiRQAzfgIZoCXe9O20T7gmJ16kqyq7WtDx5IfzpU7BMGHnQH64sa8dmKN6MXNu3WEu6d50urzojq56d74KZwi/JiZnxW3v3ufc8ajpHB65XN9fswyfLPSnRbZn1VG+8AHgvJexSxxfbeCh+fTFnNFBH9LWay1r1+6LAgMBAAGjUDBOMB0GA1UdDgQWBBRBteojY53LcdnWq8z0FAY/yvVWFjAfBgNVHSMEGDAWgBRBteojY53LcdnWq8z0FAY/yvVWFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAKRqU5Et1ynwkVPqxA4MqLlf4/5BR5iy3r3DvSDwWKgpq4uE8yzwndBo+P9pedTHR86OQo0jo+N1fKgq2e2JNjwIg9551LxLvHdX7M2abpP7cpjwNK0Vj/BD6CKmkfYK32voIPtVbL/1hNuTukceuCFhrRPGP97kXnOm/gF3DH8bV3igiEfIrXbGP5Qb4dwMG3MsvGpm2ruCHN4b/tWbCD8rR58IAG1fg0tq2jy0xK/3kFfcObYYihaPPxw4G2rzPpEo8KwFOyGGnJM2g2WlQOyCSwPvOsl58s/pHOKMb3ca+Mfz6fo7fFvv/J5XWvLwvffnNZ+691js473CQTiiFONIqcmvA2FdLSrtN5c2KBrNtMwNbHInQJUOKCQDhSpFIbx/xyzSNj3HbZf9r3hvTLCEgOpIGkBJILSVx2H+7XUkljLcHv/wU6HBP7BkhpfNVml+d/slUGJjpmkj52ZRTgNv1swJ3QE3quguH29EbgK3y2wPNek4VsIMG+xlA46upsnrOEqVej9apysA4XYMtwqDQ7Ei8OdoHJUIpU/OrXVApb3cGbHxofnf8BfsvEm+QGAZDxtH3kCqmfbQVUULltef11ma0ntXM4rDgR+LPnB0gme2sdug/2KK0iRf0CtbzsHq+JVw0Gz4HCRgWY7m6+9Q3qyiMspCLT+FdmLd7Smg==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sfpkr.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.sfpkr.si/simplesaml/saml2/idp/SSOService.php"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationName>
- <md:OrganizationName xml:lang="sl">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="sl">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.sfpkr.si</md:OrganizationURL>
- <md:OrganizationURL xml:lang="sl">http://www.sfpkr.si</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Aleš</md:GivenName>
- <md:SurName>Žitnik</md:SurName>
- <md:EmailAddress>mailto:ales.zitnik@sfpkr.si</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Helpdesk</md:GivenName>
- <md:SurName>Helpdesk</md:SurName>
- <md:EmailAddress>mailto:info@sfpkr.si</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Tomaž</md:GivenName>
- <md:SurName>Ferbežar</md:SurName>
- <md:EmailAddress>mailto:tomaz.ferbezar@sc-nm.si</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
index abb9a8b1..0a6ab487 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
@@ -36,44 +36,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFdzCCBF+gAwIBAgIQQvec2MkxvhhLg7rQH2/vRTANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxNjAwMDAwMFoXDTE2MDQxNTIzNTk1OVowQzEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliYm9sZXRo
- LnN0aXIuYWMudWswggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGn6g9
- 4n1tC+fn1Hd3a/88lcMS4WDp7DJFjT5U6EFBqMXf1PGnVs4CvOButyXIIU/TXnkG
- nRAEFhoWqDxf2c1bJRbg2rykmfqTvXIFECU8irz8aNigh8mB/YCmm3LBc+8NNbXC
- NCfsEfZAtBqAhdhuDVzJzIrQItuCWTsBj/L/RSNF5FQGYwQoMlpzVK43X58aGkdS
- iSdwMCzEkzwI0ungdTu4mKk+JAyEcJ/QYAaF+sBVAPe/6uTQjbfg/Vmu2nqYBgiS
- gmrZezi38Z8phcQSzGcVFIFlnUvYo+dQd3WsKG66D1HfWsXJjB5b/aOzC//SS3VA
- sz5XjTVQFXPzUubmg6Zr6uOI4VxEsTPT8+THD3XRfiKFx8wT//HavMu6Q+V4qu1T
- OelMe+iQtD4I6qOiG5u4Q/mJKBXL2jaPRubgwmCLvBcUPy9qcMhj3cNhq3L2MdbV
- pxNC7n6U+1H1VuJwkEgrHo0LMN2TJ1bWw7Ka+Gx5opAIbzxU1781HSOQomEyjZ7l
- A+5QZakT5oCK/T7s6tOiyyeHFfynzjLt12vX5QAjcg4+DfV8tIBMPzhcsXdNhYXO
- 0NrwwaPobyc3n8GK6kWo6/JFIbNug3QsHh2B2UFaSKTFB+BAyFp/X3CHqvqkBomR
- klrTWhvJO20Ua+1FihxLRnaRM9hw1Ytm5eKwowIDAQABo4IBcjCCAW4wHwYDVR0j
- BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFF8S3EXPgDW49jHO
- kJ7QbDlNY5gHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
- MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgId
- MAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
- bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
- MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
- CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
- ghVzaGliYm9sZXRoLnN0aXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKoUdUXu
- KipklEzb71oC7zQLTxrAT73eYsG841zn/uCBKAjDDnBgtpXXAKphRZD+CMyBlbAB
- ZtY6orxoLMObKr3Lwhd6+dxOjyQplF70/dOQalkoErVp3iuz2ahgs4PKAgWm/8lW
- mvIYFXIEVznxDSF9WTuZjiXB+tRYv9K7MftLKgHkD9jtdrzTwL7ZeTilJalN5KZR
- OvGyZ76NXtrh/uMBaCIg45uxWQsXFSPwNz8H8emPeH1nT0wguRZh+S/ofr53xUlJ
- U+wjeuZgmnQ2RAp9+zNrV0h7wagFs+L7XIcOuYu2HWi8Rl24BXT3j3WIdBe1IP79
- 4jGYQXK/vvWeCfE=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -113,44 +75,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIFdzCCBF+gAwIBAgIQQvec2MkxvhhLg7rQH2/vRTANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxNjAwMDAwMFoXDTE2MDQxNTIzNTk1OVowQzEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliYm9sZXRo
- LnN0aXIuYWMudWswggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGn6g9
- 4n1tC+fn1Hd3a/88lcMS4WDp7DJFjT5U6EFBqMXf1PGnVs4CvOButyXIIU/TXnkG
- nRAEFhoWqDxf2c1bJRbg2rykmfqTvXIFECU8irz8aNigh8mB/YCmm3LBc+8NNbXC
- NCfsEfZAtBqAhdhuDVzJzIrQItuCWTsBj/L/RSNF5FQGYwQoMlpzVK43X58aGkdS
- iSdwMCzEkzwI0ungdTu4mKk+JAyEcJ/QYAaF+sBVAPe/6uTQjbfg/Vmu2nqYBgiS
- gmrZezi38Z8phcQSzGcVFIFlnUvYo+dQd3WsKG66D1HfWsXJjB5b/aOzC//SS3VA
- sz5XjTVQFXPzUubmg6Zr6uOI4VxEsTPT8+THD3XRfiKFx8wT//HavMu6Q+V4qu1T
- OelMe+iQtD4I6qOiG5u4Q/mJKBXL2jaPRubgwmCLvBcUPy9qcMhj3cNhq3L2MdbV
- pxNC7n6U+1H1VuJwkEgrHo0LMN2TJ1bWw7Ka+Gx5opAIbzxU1781HSOQomEyjZ7l
- A+5QZakT5oCK/T7s6tOiyyeHFfynzjLt12vX5QAjcg4+DfV8tIBMPzhcsXdNhYXO
- 0NrwwaPobyc3n8GK6kWo6/JFIbNug3QsHh2B2UFaSKTFB+BAyFp/X3CHqvqkBomR
- klrTWhvJO20Ua+1FihxLRnaRM9hw1Ytm5eKwowIDAQABo4IBcjCCAW4wHwYDVR0j
- BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFF8S3EXPgDW49jHO
- kJ7QbDlNY5gHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
- MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgId
- MAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
- bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
- MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
- CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
- ghVzaGliYm9sZXRoLnN0aXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKoUdUXu
- KipklEzb71oC7zQLTxrAT73eYsG841zn/uCBKAjDDnBgtpXXAKphRZD+CMyBlbAB
- ZtY6orxoLMObKr3Lwhd6+dxOjyQplF70/dOQalkoErVp3iuz2ahgs4PKAgWm/8lW
- mvIYFXIEVznxDSF9WTuZjiXB+tRYv9K7MftLKgHkD9jtdrzTwL7ZeTilJalN5KZR
- OvGyZ76NXtrh/uMBaCIg45uxWQsXFSPwNz8H8emPeH1nT0wguRZh+S/ofr53xUlJ
- U+wjeuZgmnQ2RAp9+zNrV0h7wagFs+L7XIcOuYu2HWi8Rl24BXT3j3WIdBe1IP79
- 4jGYQXK/vvWeCfE=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml
deleted file mode 100644
index eb1290e2..00000000
--- a/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?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.smith.edu/idp/shibboleth">
- <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor errorURL="https://idp.smith.edu/idp/error.jsp" 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">smith.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Smith College</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for Smith College Shibboleth users</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.smith.edu/its/about_its/cis_program.html</mdui:PrivacyStatementURL>
- <mdui:Logo height="88" width="504" xml:lang="en">https://idp.smith.edu/idp/images/logolargest.gif</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>
-MIIDIDCCAgigAwIBAgIVAOXTUWYc/vuvnb2nW8QaBdLG+Y+1MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5zbWl0aC5lZHUwHhcNMTEwMzE3MjA1NzE5WhcN
-MzEwMzE3MjA1NzE5WjAYMRYwFAYDVQQDEw1pZHAuc21pdGguZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAibMyR65Zf/rn5rDxxIzv1Gt5CayKblSG
-a0n/ti8IFG8kwByWr+iXnf5YRUFaSNPsY78PxtfFSvy9Nz58nx4CPC8tGiuDxwKC
-lUo792rKnEB/XxZU3YdpZotGGYi02S5V2eJ1js3lzPFCKZojtJqzU2BhXD55ptE2
-1eAnpqDOpsetLOTYRRKIPF/GMx2W23VyVLM8OjTLQOtK///3o6xjemUa1a7tsjFb
-SaMXo1CaAhO1SMOwFEODamdUMsZYwkbuRTMZw7lB0z+jcxeOlJ+geGYc1RG06VNT
-wW0Yu5k7FqbDvWaRZHpaNfGh42BDJGbAk5/OllWMzHhSTDatai92nwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuc21pdGguZWR1hiRodHRwczovL2lkcC5zbWl0aC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNc1trjeTE3ROprI6Gu7Pw8cjSaX
-MA0GCSqGSIb3DQEBBQUAA4IBAQA65xzv6pbVuyNB7DknRnLDC62C9RSde+suUO2H
-C3CNlxV81yyM7/RNl/Liq7MwiOHYQN34kTm4O9+tR6tgjM+v6FabJDofEQtx6SeX
-08RSFBAQrx8JZwUP2nBAaanGR+JfXG7L9fn79IjvgCmOQzSowaaYhNQs0yzav4dX
-QPjTTIMWFDJstNfSebNGuqEwep3n0edtntxVmEsmpBL91CvldRpur+98khDuVOFR
-vQtYab9MmbvB63JGIVkxNVE8yIk9QGCSCSPVQ7fMWld8BF4u80GlkQhKRkcJG8wE
-W/ZThBpy7D55O139vCdRdOYStyJZaLKjPue6nhVkPePVOuQg
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.smith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.smith.edu/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.smith.edu/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.smith.edu/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">smith.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAOXTUWYc/vuvnb2nW8QaBdLG+Y+1MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5zbWl0aC5lZHUwHhcNMTEwMzE3MjA1NzE5WhcN
-MzEwMzE3MjA1NzE5WjAYMRYwFAYDVQQDEw1pZHAuc21pdGguZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAibMyR65Zf/rn5rDxxIzv1Gt5CayKblSG
-a0n/ti8IFG8kwByWr+iXnf5YRUFaSNPsY78PxtfFSvy9Nz58nx4CPC8tGiuDxwKC
-lUo792rKnEB/XxZU3YdpZotGGYi02S5V2eJ1js3lzPFCKZojtJqzU2BhXD55ptE2
-1eAnpqDOpsetLOTYRRKIPF/GMx2W23VyVLM8OjTLQOtK///3o6xjemUa1a7tsjFb
-SaMXo1CaAhO1SMOwFEODamdUMsZYwkbuRTMZw7lB0z+jcxeOlJ+geGYc1RG06VNT
-wW0Yu5k7FqbDvWaRZHpaNfGh42BDJGbAk5/OllWMzHhSTDatai92nwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuc21pdGguZWR1hiRodHRwczovL2lkcC5zbWl0aC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNc1trjeTE3ROprI6Gu7Pw8cjSaX
-MA0GCSqGSIb3DQEBBQUAA4IBAQA65xzv6pbVuyNB7DknRnLDC62C9RSde+suUO2H
-C3CNlxV81yyM7/RNl/Liq7MwiOHYQN34kTm4O9+tR6tgjM+v6FabJDofEQtx6SeX
-08RSFBAQrx8JZwUP2nBAaanGR+JfXG7L9fn79IjvgCmOQzSowaaYhNQs0yzav4dX
-QPjTTIMWFDJstNfSebNGuqEwep3n0edtntxVmEsmpBL91CvldRpur+98khDuVOFR
-vQtYab9MmbvB63JGIVkxNVE8yIk9QGCSCSPVQ7fMWld8BF4u80GlkQhKRkcJG8wE
-W/ZThBpy7D55O139vCdRdOYStyJZaLKjPue6nhVkPePVOuQg
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Smith College</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Smith College</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.smith.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Karla Borecky</md:GivenName>
- <md:EmailAddress>kborecky@smith.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>John Crowley</md:GivenName>
- <md:EmailAddress>jcrowley@smith.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Eric Brewer</md:GivenName>
- <md:EmailAddress>ebrewer@smith.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
index 99bcf5eb..57e7650f 100644
--- a/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
@@ -14,6 +14,38 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIEXDCCA0SgAwIBAgIJAKyPn9Ts3+81MA0GCSqGSIb3DQEBCwUAMIGzMQswCQYD
+ VQQGEwJHQjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBhaWdudG9uMRwwGgYD
+ VQQKDBNTb3V0aCBEZXZvbiBDb2xsZWdlMRowGAYDVQQLDBFDb21wdXRlciBTZXJ2
+ aWNlczEdMBsGA1UEAwwUaWRwLnNvdXRoZGV2b24uYWMudWsxKDAmBgkqhkiG9w0B
+ CQEWGWhlbHBkZXNrQHNvdXRoZGV2b24uYWMudWswHhcNMTYwNDEyMTI1MjExWhcN
+ MjYwNDEwMTI1MjExWjCBszELMAkGA1UEBhMCR0IxDjAMBgNVBAgMBURldm9uMREw
+ DwYDVQQHDAhQYWlnbnRvbjEcMBoGA1UECgwTU291dGggRGV2b24gQ29sbGVnZTEa
+ MBgGA1UECwwRQ29tcHV0ZXIgU2VydmljZXMxHTAbBgNVBAMMFGlkcC5zb3V0aGRl
+ dm9uLmFjLnVrMSgwJgYJKoZIhvcNAQkBFhloZWxwZGVza0Bzb3V0aGRldm9uLmFj
+ LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw780rAsk+mJLxAxM
+ 4AJfvZBzfb4l9Vpu/6BO8Or54rmp/uThhC0mgdoJqQlmaEb4ZIK4/CbfstV8Qo3s
+ INiy6Z1+xMVcrBalH9gG6cXB7i1E1vDuUE5gg/qd1KGCwXrVBDKGKF1enpMlOBgQ
+ cTHZ2dpTf9Hgjmxcixa030ETpvmDyja86dYnQnkxGpXbIyxJR9h7XlkGXzd/fdP0
+ dk45mXkzna05QThcg6SqMlZasi4iyd8UGulWAg7sYBIfxI3Xm88PaTm+KscBCVPu
+ Ma1WatglA9JIBlQwWantChP7AI9v4YZGG+af6uhp1l8UzXA8EdQL6lCwqvmgGD0F
+ 1RFX0wIDAQABo3EwbzAfBgNVHREEGDAWghRpZHAuc291dGhkZXZvbi5hYy51azAd
+ BgNVHQ4EFgQUivSrY0v+NvStP9sX9z4xYKNpba0wHwYDVR0jBBgwFoAUivSrY0v+
+ NvStP9sX9z4xYKNpba0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA
+ RO80zk8JjZ7UpVODbHxiyAzs1WX4wIoUc8VR6Cpf55/tTUEBhfU1sHggV5J285Xk
+ ngRf3d+5xcnqO+RjMPn7AXU35ycRofFWsDNtabcWoXK4X6pYrYUAQEsZu/4Q05qJ
+ jzxP0lDW16HRN+JJs97Lel95y8tvhyGhc6VTLzwvOMBCTHeWhuPmlzAZmh3w3hLz
+ f5rIu2knlPysAdyln9PGl1tRSchcjJhN2K/Bq2xVSCFWmGjZiENHc2yfpwc+z7Xq
+ As5id/Pz62Gwe5qtzQSiWo9G1zkAw2PODKY0rA4JNAvwT9whv2A/Ef8ggRmiJGu6
+ 9Ia6HkphVIymnefQl1ZO/Q==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
@@ -62,6 +94,38 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIEXDCCA0SgAwIBAgIJAKyPn9Ts3+81MA0GCSqGSIb3DQEBCwUAMIGzMQswCQYD
+ VQQGEwJHQjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBhaWdudG9uMRwwGgYD
+ VQQKDBNTb3V0aCBEZXZvbiBDb2xsZWdlMRowGAYDVQQLDBFDb21wdXRlciBTZXJ2
+ aWNlczEdMBsGA1UEAwwUaWRwLnNvdXRoZGV2b24uYWMudWsxKDAmBgkqhkiG9w0B
+ CQEWGWhlbHBkZXNrQHNvdXRoZGV2b24uYWMudWswHhcNMTYwNDEyMTI1MjExWhcN
+ MjYwNDEwMTI1MjExWjCBszELMAkGA1UEBhMCR0IxDjAMBgNVBAgMBURldm9uMREw
+ DwYDVQQHDAhQYWlnbnRvbjEcMBoGA1UECgwTU291dGggRGV2b24gQ29sbGVnZTEa
+ MBgGA1UECwwRQ29tcHV0ZXIgU2VydmljZXMxHTAbBgNVBAMMFGlkcC5zb3V0aGRl
+ dm9uLmFjLnVrMSgwJgYJKoZIhvcNAQkBFhloZWxwZGVza0Bzb3V0aGRldm9uLmFj
+ LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw780rAsk+mJLxAxM
+ 4AJfvZBzfb4l9Vpu/6BO8Or54rmp/uThhC0mgdoJqQlmaEb4ZIK4/CbfstV8Qo3s
+ INiy6Z1+xMVcrBalH9gG6cXB7i1E1vDuUE5gg/qd1KGCwXrVBDKGKF1enpMlOBgQ
+ cTHZ2dpTf9Hgjmxcixa030ETpvmDyja86dYnQnkxGpXbIyxJR9h7XlkGXzd/fdP0
+ dk45mXkzna05QThcg6SqMlZasi4iyd8UGulWAg7sYBIfxI3Xm88PaTm+KscBCVPu
+ Ma1WatglA9JIBlQwWantChP7AI9v4YZGG+af6uhp1l8UzXA8EdQL6lCwqvmgGD0F
+ 1RFX0wIDAQABo3EwbzAfBgNVHREEGDAWghRpZHAuc291dGhkZXZvbi5hYy51azAd
+ BgNVHQ4EFgQUivSrY0v+NvStP9sX9z4xYKNpba0wHwYDVR0jBBgwFoAUivSrY0v+
+ NvStP9sX9z4xYKNpba0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA
+ RO80zk8JjZ7UpVODbHxiyAzs1WX4wIoUc8VR6Cpf55/tTUEBhfU1sHggV5J285Xk
+ ngRf3d+5xcnqO+RjMPn7AXU35ycRofFWsDNtabcWoXK4X6pYrYUAQEsZu/4Q05qJ
+ jzxP0lDW16HRN+JJs97Lel95y8tvhyGhc6VTLzwvOMBCTHeWhuPmlzAZmh3w3hLz
+ f5rIu2knlPysAdyln9PGl1tRSchcjJhN2K/Bq2xVSCFWmGjZiENHc2yfpwc+z7Xq
+ As5id/Pz62Gwe5qtzQSiWo9G1zkAw2PODKY0rA4JNAvwT9whv2A/Ef8ggRmiJGu6
+ 9Ia6HkphVIymnefQl1ZO/Q==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
diff --git a/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..698cf182
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.udu.cas.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="2016-04-08T11:34: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/avcr</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">udu.cas.cz</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="cs">Ústav dějin umění Akademie věd ČR, v.v.i</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Identity Provider IAH AV CR employees.</mdui:Description>
+ <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚDU AV ČR</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.udu.cas.cz/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="cs">http://www.udu.cas.cz/</mdui:InformationURL>
+ <mdui:Logo height="44" width="121">https://jiftach.cas.cz/loga/logo-udu-44.png</mdui:Logo>
+ <mdui:Logo height="476" width="1309">https://jiftach.cas.cz/loga/logo-udu-476.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUDdgXhHF/fFmY4C/uE1WS2GHgpZYwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVkdS5jYXMuY3owHhcNMTYwMzE4MDg0OTMzWhcN
+MzYwMzE4MDg0OTMzWjAZMRcwFQYDVQQDEw5pZHAudWR1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjgDKLkK7EFE1F7ykATltO3yuw23qm6
+sgNMSENfnP2qImMzDf4nmKLScVkyyzWPsmoTVMcB+WYiYG6gT+bxEMmyQfOruFrq
+mejArIup36YBrC14etLe7UemOe7IIWprPQilDNlzp0Gaehj23PNQvBwfHV9jMbLe
+iRn5YYHNd3fmn9G9qRFfnBpxjbaIH0TC67CO+qX+1Pq71LmTkA7TCH1MYRflCIv0
+E/oXVjTGvt0LFiqtRrOaYVEX/N75z6/8T3CPZdJRF1mHZoxe2x3F4fUCs6fjhrDy
+DF/VGiK3P1+oq/YKSO9xWfFfBfUe6qIjA4hX70cpyWHXVjku/03M69ECAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVkdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVkdS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJBCKe7lHF0NXla0FKN6rEVR
+42qDMA0GCSqGSIb3DQEBBQUAA4IBAQB0gFLUDJN/iJXYI5r9cV4/ptJUosnsB283
+JChXltB/yGffjAHQW5dUqu6JqT6xZWkqP5ECzGE3Php68Ww6xf9uZg3LpHCfV/NP
+TI9m+1u6JzuE8FxY+7pipTnqJUfdbYMVRGxWA7okyEsgxBNdQTu76AR8IA7sQ/2C
+1xMyevj8KiNC/mvPnfKAknGXZbeYWRSIR9t2olH4tfvckXuHDwZsBE2BgATxNLG1
+nsbm68pJthBe50fr26BsG6OhTK7cYFxKOdwreEMVhW/Xj6c1rvJdWIIEys9O5N4t
+yinEEzkppNVBsFK3FdtArwxyImljL9bBpKLxq5XkR7lC0e3Dz5q6
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.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.udu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.udu.cas.cz/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udu.cas.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">udu.cas.cz</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUDdgXhHF/fFmY4C/uE1WS2GHgpZYwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVkdS5jYXMuY3owHhcNMTYwMzE4MDg0OTMzWhcN
+MzYwMzE4MDg0OTMzWjAZMRcwFQYDVQQDEw5pZHAudWR1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjgDKLkK7EFE1F7ykATltO3yuw23qm6
+sgNMSENfnP2qImMzDf4nmKLScVkyyzWPsmoTVMcB+WYiYG6gT+bxEMmyQfOruFrq
+mejArIup36YBrC14etLe7UemOe7IIWprPQilDNlzp0Gaehj23PNQvBwfHV9jMbLe
+iRn5YYHNd3fmn9G9qRFfnBpxjbaIH0TC67CO+qX+1Pq71LmTkA7TCH1MYRflCIv0
+E/oXVjTGvt0LFiqtRrOaYVEX/N75z6/8T3CPZdJRF1mHZoxe2x3F4fUCs6fjhrDy
+DF/VGiK3P1+oq/YKSO9xWfFfBfUe6qIjA4hX70cpyWHXVjku/03M69ECAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVkdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVkdS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJBCKe7lHF0NXla0FKN6rEVR
+42qDMA0GCSqGSIb3DQEBBQUAA4IBAQB0gFLUDJN/iJXYI5r9cV4/ptJUosnsB283
+JChXltB/yGffjAHQW5dUqu6JqT6xZWkqP5ECzGE3Php68Ww6xf9uZg3LpHCfV/NP
+TI9m+1u6JzuE8FxY+7pipTnqJUfdbYMVRGxWA7okyEsgxBNdQTu76AR8IA7sQ/2C
+1xMyevj8KiNC/mvPnfKAknGXZbeYWRSIR9t2olH4tfvckXuHDwZsBE2BgATxNLG1
+nsbm68pJthBe50fr26BsG6OhTK7cYFxKOdwreEMVhW/Xj6c1rvJdWIIEys9O5N4t
+yinEEzkppNVBsFK3FdtArwxyImljL9bBpKLxq5XkR7lC0e3Dz5q6
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ </md:AttributeAuthorityDescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</md:OrganizationName>
+ <md:OrganizationName xml:lang="cs">Ústav dějin umění Akademie věd ČR</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="cs">Ústav dějin umění Akademie věd ČR, v.v.i.</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.udu.cas.cz/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="cs">http://www.udu.cas.cz/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Petr</md:GivenName>
+ <md:SurName>Vaníček</md:SurName>
+ <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
index 37b1ae3c..e31111cb 100644
--- a/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
@@ -16,6 +16,42 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIFFDCCA/ygAwIBAgIUfvk+kIvgObeH9FlTOzyxUUtzNfEwDQYJKoZIhvcNAQEL
+ BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+ BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDMzMDEwMjEz
+ OFoXDTE5MDMzMDEwMjEzNFowgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+ c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+ Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+ HgYDVQQDExdzaGliYm9sZXRoMDEuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBAIfVik5J16T3kGyLocrYaK+15zqqqQN/h4RYYRVYSsPk
+ MX7srSQJq1nt/svUTKWBllfwySXccVX2YhgM/nuTbJtf6yKGNq1ZogsjRZv1m2rr
+ yOHVwQEpFpGfdt0MmXVR1bvEi5O3+U+Ian6A8oTQMgmhVCXCTTdt3fAeYqN6DlwQ
+ 38JPFhIlbyEhrUgCnZeE19ftAdfAiwXD2bJy0hnuMh7j8PKIwsWkAx0a8BdQ1LKR
+ /TgJhluGVZiMXgS4cljX0SJS9+eXIvNC1V+EMM03dOrP1mPJIfxY2mrEfwDbhC9H
+ 1OKRqdDYnHUTYNCSvhDiApRK7ApeobEqolHOr3cWfG0CAwEAAaOCAZswggGXMHMG
+ CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+ bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+ YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMS5zdGZj
+ LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+ KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+ AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+ GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+ Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+ Tw22e+slTxSJFHTxYGz0C7Mw4gowDQYJKoZIhvcNAQELBQADggEBAHh9RRtAH0lX
+ RcmNtw4jrDkcdnJcwjaddVpfQfVvIFGqB4NkKOmccYugppso5+UEHcpHivsMcKAa
+ Qok/yANO6fNzdKCjZIApV9Q9rpwIQSbJlXbg/DvUYc9mqeUKOMlIzw3Q+G1XK4o8
+ B5HfGyldcM8X+NyiC8tocRG4iFdMT2J4M1cIfeDn9xHPDzWex9bZLktLkssdzjtw
+ iKTQHPv55BOqJ12e0rTNTilpErtzr5AhYXDKKNYAHTYxHcyI75aqE+/11dsHdOKb
+ oUdCBAJx12/CTfHNdDOdr7FHk4fwcUsCvAUTL8hSwSv+fu00lpRe/UoMk26E4Xkv
+ ayT9vCad35E=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfDCCA2SgAwIBAgIRAMB2hFT3mLr5ROiokXWKNqowDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA0MjYwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMEUxITAfBgNV
@@ -61,6 +97,42 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIFFDCCA/ygAwIBAgIUfvk+kIvgObeH9FlTOzyxUUtzNfEwDQYJKoZIhvcNAQEL
+ BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+ BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDMzMDEwMjEz
+ OFoXDTE5MDMzMDEwMjEzNFowgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+ c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+ Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+ HgYDVQQDExdzaGliYm9sZXRoMDEuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBAIfVik5J16T3kGyLocrYaK+15zqqqQN/h4RYYRVYSsPk
+ MX7srSQJq1nt/svUTKWBllfwySXccVX2YhgM/nuTbJtf6yKGNq1ZogsjRZv1m2rr
+ yOHVwQEpFpGfdt0MmXVR1bvEi5O3+U+Ian6A8oTQMgmhVCXCTTdt3fAeYqN6DlwQ
+ 38JPFhIlbyEhrUgCnZeE19ftAdfAiwXD2bJy0hnuMh7j8PKIwsWkAx0a8BdQ1LKR
+ /TgJhluGVZiMXgS4cljX0SJS9+eXIvNC1V+EMM03dOrP1mPJIfxY2mrEfwDbhC9H
+ 1OKRqdDYnHUTYNCSvhDiApRK7ApeobEqolHOr3cWfG0CAwEAAaOCAZswggGXMHMG
+ CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+ bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+ YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMS5zdGZj
+ LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+ KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+ AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+ GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+ Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+ Tw22e+slTxSJFHTxYGz0C7Mw4gowDQYJKoZIhvcNAQELBQADggEBAHh9RRtAH0lX
+ RcmNtw4jrDkcdnJcwjaddVpfQfVvIFGqB4NkKOmccYugppso5+UEHcpHivsMcKAa
+ Qok/yANO6fNzdKCjZIApV9Q9rpwIQSbJlXbg/DvUYc9mqeUKOMlIzw3Q+G1XK4o8
+ B5HfGyldcM8X+NyiC8tocRG4iFdMT2J4M1cIfeDn9xHPDzWex9bZLktLkssdzjtw
+ iKTQHPv55BOqJ12e0rTNTilpErtzr5AhYXDKKNYAHTYxHcyI75aqE+/11dsHdOKb
+ oUdCBAJx12/CTfHNdDOdr7FHk4fwcUsCvAUTL8hSwSv+fu00lpRe/UoMk26E4Xkv
+ ayT9vCad35E=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfDCCA2SgAwIBAgIRAMB2hFT3mLr5ROiokXWKNqowDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA0MjYwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMEUxITAfBgNV
diff --git a/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
index 7aea853a..ef9cce30 100644
--- a/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
@@ -16,6 +16,42 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIFFDCCA/ygAwIBAgIUOysRoBktqggd9zGS+JJEfPcJmKwwDQYJKoZIhvcNAQEL
+ BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+ BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQwNTEyNDUz
+ NVoXDTE5MDQwNTEyNDUzM1owgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+ c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+ Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+ HgYDVQQDExdzaGliYm9sZXRoMDIuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBAMvR27pSvNdN412CLQs9mwht4/x7X7GFyo95R7M2ebA8
+ NiWWpeO1a39mQAy0aA3jgI3dLM7FkvTAAe3PwjGG1ONoNzXkdF2ys+C4jf9Tgsl7
+ grv50GeFEckUUrvzgaMyZHZZmOwX9oc6AQCPw57f2UHv58LWYivz1Mmvp2JmnUiu
+ UX574cgLN/KnRMTWl4sWvU3nwY+ZurTI8pj2B6Zj28hlPFbl6lNqd8jlT1j3+O1o
+ +7ubSVvRV5rYy2CWxjGYDxEnm+dAoR7si3XxubiWXe4KIBwvbE9ZQMMjQ3d3cw5T
+ lQwv9S9UQGEfNmDLZnRhzOit8KPqDk/p3Lc29mp/9nMCAwEAAaOCAZswggGXMHMG
+ CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+ bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+ YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMi5zdGZj
+ LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+ KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+ AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+ GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+ Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+ bJMoUGiBSfBEYv7zyHqX1fXLSkcwDQYJKoZIhvcNAQELBQADggEBAL1K6/RF+FdG
+ 0xpK1XVOvFsihV5P4OLXk9qhHh+CnKfDfqbJZTvppj1or7bi0D4GyIZQRqF19z4n
+ dPB9ckfJF9YvyfR7uobHUJBm644hsxa5DTAMug0nHnDnHN/ueE0fBc8Vr2N0adZV
+ rlVcGRjXiBVPxfTk637ZIXShW+8923IIU/eECYc7Vvpe7giXfRF9SbFtAZ9/Rdjm
+ YWMVdt0nBLwXSCdh4IIKHHnu4qq6Z0/RpWmA6iL/Y/hJzQAohoU/K7jGqPOMm9wF
+ ggRFV+FROzADdEtB2psKL+LrWhSGhRewqazW7eYB8Y9JGN1UnsE6NWyVru1LMYte
+ IklcmjJ+40A=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfDCCA2SgAwIBAgIRAN6xh7bD0R7q1gDhMLxcIlYwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA0MjUwMDAwMDBaFw0xNjA0MjQyMzU5NTlaMEUxITAfBgNV
@@ -61,6 +97,42 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIFFDCCA/ygAwIBAgIUOysRoBktqggd9zGS+JJEfPcJmKwwDQYJKoZIhvcNAQEL
+ BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+ BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQwNTEyNDUz
+ NVoXDTE5MDQwNTEyNDUzM1owgZsxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlXaWx0
+ c2hpcmUxEDAOBgNVBAcTB1NXSU5ET04xMjAwBgNVBAoTKVNjaWVuY2UgYW5kIFRl
+ Y2hub2xvZ3kgRmFjaWxpdGllcyBDb3VuY2lsMRAwDgYDVQQLEwdSQUwtQ1NEMSAw
+ HgYDVQQDExdzaGliYm9sZXRoMDIuc3RmYy5hYy51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBAMvR27pSvNdN412CLQs9mwht4/x7X7GFyo95R7M2ebA8
+ NiWWpeO1a39mQAy0aA3jgI3dLM7FkvTAAe3PwjGG1ONoNzXkdF2ys+C4jf9Tgsl7
+ grv50GeFEckUUrvzgaMyZHZZmOwX9oc6AQCPw57f2UHv58LWYivz1Mmvp2JmnUiu
+ UX574cgLN/KnRMTWl4sWvU3nwY+ZurTI8pj2B6Zj28hlPFbl6lNqd8jlT1j3+O1o
+ +7ubSVvRV5rYy2CWxjGYDxEnm+dAoR7si3XxubiWXe4KIBwvbE9ZQMMjQ3d3cw5T
+ lQwv9S9UQGEfNmDLZnRhzOit8KPqDk/p3Lc29mp/9nMCAwEAAaOCAZswggGXMHMG
+ CCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+ bG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+ YWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF3NoaWJib2xldGgwMi5zdGZj
+ LmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEW
+ KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0P
+ AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSME
+ GDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRw
+ Oi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQU
+ bJMoUGiBSfBEYv7zyHqX1fXLSkcwDQYJKoZIhvcNAQELBQADggEBAL1K6/RF+FdG
+ 0xpK1XVOvFsihV5P4OLXk9qhHh+CnKfDfqbJZTvppj1or7bi0D4GyIZQRqF19z4n
+ dPB9ckfJF9YvyfR7uobHUJBm644hsxa5DTAMug0nHnDnHN/ueE0fBc8Vr2N0adZV
+ rlVcGRjXiBVPxfTk637ZIXShW+8923IIU/eECYc7Vvpe7giXfRF9SbFtAZ9/Rdjm
+ YWMVdt0nBLwXSCdh4IIKHHnu4qq6Z0/RpWmA6iL/Y/hJzQAohoU/K7jGqPOMm9wF
+ ggRFV+FROzADdEtB2psKL+LrWhSGhRewqazW7eYB8Y9JGN1UnsE6NWyVru1LMYte
+ IklcmjJ+40A=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfDCCA2SgAwIBAgIRAN6xh7bD0R7q1gDhMLxcIlYwDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA0MjUwMDAwMDBaFw0xNjA0MjQyMzU5NTlaMEUxITAfBgNV
diff --git a/swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 0c5542e8..00000000
--- a/swamid-interfederations-2.0/idp3.kirkleescollege.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.kirkleescollege.ac.uk/idp/shibboleth">
- <!--
- This is a Shibboleth IdP for Kirklees 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="2016-03-09T10:23:23Z">
- <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">kirkleescollege.ac.uk</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Kirklees College - Testing - Do Not Use</mdui:DisplayName>
- <mdui:Logo height="67" width="137">https://www.kirkleescollege.ac.uk/wp-content/uploads/2015/06/kcLogo.png</mdui:Logo>
- </mdui:UIInfo>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUzCCAjugAwIBAgIUPzSZlLFegyJ/xf53eryEDjcKM9EwDQYJKoZIhvcNAQEL
- BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
- MzAzMTAxODQ3WhcNMzYwMzAzMTAxODQ3WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
- ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
- AKFBdTJWYZwbKzqpd8kbX4j1SX+EN2WBSYWvgYJLQFFkwMcxKjPzEJUPoR3aMu5T
- oTEm+oTERSALbbddvE7pnXSqYOWK446LwsyeFLKF8h7xYreM85yPmorsFAaaTUuI
- wvx59BHDuSkiVZwwsm3+WB14Ahcg429whwNY9apF1udu5xE6BMF7I+QtUNJCDhz1
- vgVS41JfkQiwbNPZlvfe8S14s3bWOIwp9l+G2f8cRNH5Uf5y9ZuX2tB8eDAZ6cDT
- ID6udXsErJSCbosX4uykvlnD6Djr+7TQNwJqVZFRNbWki/sl41GYuqvlM/A/u04H
- n2MCvHwjUQTtBrTpIZZXxpUCAwEAAaN7MHkwHQYDVR0OBBYEFLpm52vzFVDyJS4o
- hPpCfXJG6n0jMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
- hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
- ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBREprxYckkBIaZYmAYDei1C2pe23kl9exH
- 4aWKmPNARm7o4Cy7dd3j3uwC8St+4qEKCpFQXy2Dat/WcXoXNYUqARRvF5yPNyo7
- zyIajiKzdHTKfb6fUAfStmRQ2f7iWVCB25A/e1vo3AnoJ3S0X7YBo8k6uR7Vh4Tv
- ezlyLCERRgKTuhxVI2eZ6/pO7Nxfk+m6VznnRQY/uyOUdq5hYT8kR7IC8QEJN0uM
- JBwwLSL7JuEb/lyeuxXMQ0Uadl2f68HdgycsUKbGCRdskzL49x1MNcyqrT9e+FFM
- dgIVva94fIIj02YnTFHvjX1CIoHAh/0Tg/xMHLUeJyrCLp9i8iJG
- </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>
- MIIDUzCCAjugAwIBAgIUd97fOFDggCwIB+n7K8vwH2yP6mUwDQYJKoZIhvcNAQEL
- BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
- MzAzMTAxODQ2WhcNMzYwMzAzMTAxODQ2WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
- ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
- AOD7ENmi+diQEZsfujuo48nhfyIImo63I1dxn8DcDkMAwQu5Bp01bOIoB6fvJd6+
- yxUI5Ny7cH6BIkfoGC/4kc+9YaTmjdQ2Lqz5FFB6sZNx/zTK6ovTS0M855KFbTjx
- iaomSW/ZA4khQWLDpNf7kSbqRNYprwvB84ySF5IDhhy1j6uMsTTBzfWVswbq7ioo
- AxWHH/F1URF8Ke2zyJPZcVmESj6hb0kaJ65neFkdKdk1tePySVT1iiqTZXW+nbR1
- q+2JbC8CG0uzKn6uqcnBwsjMw/tHqnzL4yoXyHsg1bzNpN+Fhjvqxiqre+0VN01D
- qCZVnIGvcPPI1JQXtGBUgRECAwEAAaN7MHkwHQYDVR0OBBYEFHR4kkaJLgI7EJAa
- m+vQbnIupiAyMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
- hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
- ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQC6blnSTG9YG9r1kyqXwX46qtU/R3GDzZNQ
- pHSMzTZ5u5B6t3/UM9bIPlHtPS6hilFY5Hmr+VsPA0y0xAX6C35UiNAEk8U6LD4O
- AWvkqBQEMsoANTZa2g2hbpyEBdF2eTJZcxrSbDfrQ6zFRavwb1yeuFpp61CJEKNB
- 002kcyWHo6I4ywgwvKjy0XeUjHakskUSkHz1/Vk/jCjOP7+BX5kptY0gbh/NLzri
- uLubDQXxFYEriQdqBU7xzKtZO8Uvh4bHSgbh2PlsHwNrn3Pz1j7HJUUinQjx11F1
- uXzeRs4SkLVanB/ZfQiRhdtDaRsNRrXMBWDLn/zeJiTcyusUtHtf
- </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>
- MIIDVDCCAjygAwIBAgIVAKB3QrzbWC6UDhYtgWKIpucJuo+aMA0GCSqGSIb3DQEB
- CwUAMCUxIzAhBgNVBAMMGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrMB4XDTE2
- MDMwMzEwMTg0N1oXDTM2MDMwMzEwMTg0N1owJTEjMCEGA1UEAwwaaWRwMy5raXJr
- bGVlc2NvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQCBPFW/kyCkFVmfkrRrJYeZbtZZ+idr82BMiORf3wNIFRVe0Dzcgm3G9zdiI/tv
- Y32ipWUS2msYQXXJ8CGU2GcgNjSCUUffGc/Mi5UbKXZsOZWshBavumBHELDahOKc
- F1V8msTgiKTdckuvkwjyLAokVDGWeZ1HBlDF1EBeKxPxDTnIeknlE4suuFPLHKkQ
- kCup+ncBh8ZODGInHHb57xonZKxubqZPRk6K3za6K6eW4uu7R6cigZDUmoNMi/QN
- SrFvyXG+5e+8OA6MbttCNreVto2AAm0cb7OWtLmYYCz95G4UtFRRzScFJWePbnGu
- KzYL080NVr+ugb/+ttkfbNG1AgMBAAGjezB5MB0GA1UdDgQWBBSJF8N8bCvvPNCu
- fB3kL4jFg8jIrDBYBgNVHREEUTBPghppZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51
- a4YxaHR0cHM6Ly9pZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51ay9pZHAvc2hpYmJv
- bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAqmGm2DuWPXogXtQzwMy/eymOtwG1mKG
- FUBGI6RKzFBhv0IC0qnwzsJ931x/Y79e9usKreMxaWJinOm8IcKDUzyHBrtosmbi
- T+b3BxArTXDAWnKuel4OVuVUJnndfBcWvxJrGmj3ueb/S2EsbkmnwXMXawXFATV8
- IAdC/EErq8wNXbbRlkbeX+ibMsgHDMofY/WL0QmC+1kJO8KGoNPOje4aDYzvkCcs
- f/H76DoF7VcK7V5hujvHlb0P51EAA15gDfywo8GT3S8M5OrSYmFoL8p0/NrQ16lB
- hRIYrS+7nU8Dmaso2COWvd0q91Gb0tAQx+Qamj5LcT+mdcQ636jf0g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.kirkleescollege.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://idp3.kirkleescollege.ac.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.kirkleescollege.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">kirkleescollege.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDUzCCAjugAwIBAgIUPzSZlLFegyJ/xf53eryEDjcKM9EwDQYJKoZIhvcNAQEL
- BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
- MzAzMTAxODQ3WhcNMzYwMzAzMTAxODQ3WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
- ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
- AKFBdTJWYZwbKzqpd8kbX4j1SX+EN2WBSYWvgYJLQFFkwMcxKjPzEJUPoR3aMu5T
- oTEm+oTERSALbbddvE7pnXSqYOWK446LwsyeFLKF8h7xYreM85yPmorsFAaaTUuI
- wvx59BHDuSkiVZwwsm3+WB14Ahcg429whwNY9apF1udu5xE6BMF7I+QtUNJCDhz1
- vgVS41JfkQiwbNPZlvfe8S14s3bWOIwp9l+G2f8cRNH5Uf5y9ZuX2tB8eDAZ6cDT
- ID6udXsErJSCbosX4uykvlnD6Djr+7TQNwJqVZFRNbWki/sl41GYuqvlM/A/u04H
- n2MCvHwjUQTtBrTpIZZXxpUCAwEAAaN7MHkwHQYDVR0OBBYEFLpm52vzFVDyJS4o
- hPpCfXJG6n0jMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
- hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
- ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBREprxYckkBIaZYmAYDei1C2pe23kl9exH
- 4aWKmPNARm7o4Cy7dd3j3uwC8St+4qEKCpFQXy2Dat/WcXoXNYUqARRvF5yPNyo7
- zyIajiKzdHTKfb6fUAfStmRQ2f7iWVCB25A/e1vo3AnoJ3S0X7YBo8k6uR7Vh4Tv
- ezlyLCERRgKTuhxVI2eZ6/pO7Nxfk+m6VznnRQY/uyOUdq5hYT8kR7IC8QEJN0uM
- JBwwLSL7JuEb/lyeuxXMQ0Uadl2f68HdgycsUKbGCRdskzL49x1MNcyqrT9e+FFM
- dgIVva94fIIj02YnTFHvjX1CIoHAh/0Tg/xMHLUeJyrCLp9i8iJG
- </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>
- MIIDUzCCAjugAwIBAgIUd97fOFDggCwIB+n7K8vwH2yP6mUwDQYJKoZIhvcNAQEL
- BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
- MzAzMTAxODQ2WhcNMzYwMzAzMTAxODQ2WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
- ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
- AOD7ENmi+diQEZsfujuo48nhfyIImo63I1dxn8DcDkMAwQu5Bp01bOIoB6fvJd6+
- yxUI5Ny7cH6BIkfoGC/4kc+9YaTmjdQ2Lqz5FFB6sZNx/zTK6ovTS0M855KFbTjx
- iaomSW/ZA4khQWLDpNf7kSbqRNYprwvB84ySF5IDhhy1j6uMsTTBzfWVswbq7ioo
- AxWHH/F1URF8Ke2zyJPZcVmESj6hb0kaJ65neFkdKdk1tePySVT1iiqTZXW+nbR1
- q+2JbC8CG0uzKn6uqcnBwsjMw/tHqnzL4yoXyHsg1bzNpN+Fhjvqxiqre+0VN01D
- qCZVnIGvcPPI1JQXtGBUgRECAwEAAaN7MHkwHQYDVR0OBBYEFHR4kkaJLgI7EJAa
- m+vQbnIupiAyMFgGA1UdEQRRME+CGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVr
- hjFodHRwczovL2lkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9s
- ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQC6blnSTG9YG9r1kyqXwX46qtU/R3GDzZNQ
- pHSMzTZ5u5B6t3/UM9bIPlHtPS6hilFY5Hmr+VsPA0y0xAX6C35UiNAEk8U6LD4O
- AWvkqBQEMsoANTZa2g2hbpyEBdF2eTJZcxrSbDfrQ6zFRavwb1yeuFpp61CJEKNB
- 002kcyWHo6I4ywgwvKjy0XeUjHakskUSkHz1/Vk/jCjOP7+BX5kptY0gbh/NLzri
- uLubDQXxFYEriQdqBU7xzKtZO8Uvh4bHSgbh2PlsHwNrn3Pz1j7HJUUinQjx11F1
- uXzeRs4SkLVanB/ZfQiRhdtDaRsNRrXMBWDLn/zeJiTcyusUtHtf
- </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>
- MIIDVDCCAjygAwIBAgIVAKB3QrzbWC6UDhYtgWKIpucJuo+aMA0GCSqGSIb3DQEB
- CwUAMCUxIzAhBgNVBAMMGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrMB4XDTE2
- MDMwMzEwMTg0N1oXDTM2MDMwMzEwMTg0N1owJTEjMCEGA1UEAwwaaWRwMy5raXJr
- bGVlc2NvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
- AQCBPFW/kyCkFVmfkrRrJYeZbtZZ+idr82BMiORf3wNIFRVe0Dzcgm3G9zdiI/tv
- Y32ipWUS2msYQXXJ8CGU2GcgNjSCUUffGc/Mi5UbKXZsOZWshBavumBHELDahOKc
- F1V8msTgiKTdckuvkwjyLAokVDGWeZ1HBlDF1EBeKxPxDTnIeknlE4suuFPLHKkQ
- kCup+ncBh8ZODGInHHb57xonZKxubqZPRk6K3za6K6eW4uu7R6cigZDUmoNMi/QN
- SrFvyXG+5e+8OA6MbttCNreVto2AAm0cb7OWtLmYYCz95G4UtFRRzScFJWePbnGu
- KzYL080NVr+ugb/+ttkfbNG1AgMBAAGjezB5MB0GA1UdDgQWBBSJF8N8bCvvPNCu
- fB3kL4jFg8jIrDBYBgNVHREEUTBPghppZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51
- a4YxaHR0cHM6Ly9pZHAzLmtpcmtsZWVzY29sbGVnZS5hYy51ay9pZHAvc2hpYmJv
- bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAqmGm2DuWPXogXtQzwMy/eymOtwG1mKG
- FUBGI6RKzFBhv0IC0qnwzsJ931x/Y79e9usKreMxaWJinOm8IcKDUzyHBrtosmbi
- T+b3BxArTXDAWnKuel4OVuVUJnndfBcWvxJrGmj3ueb/S2EsbkmnwXMXawXFATV8
- IAdC/EErq8wNXbbRlkbeX+ibMsgHDMofY/WL0QmC+1kJO8KGoNPOje4aDYzvkCcs
- f/H76DoF7VcK7V5hujvHlb0P51EAA15gDfywo8GT3S8M5OrSYmFoL8p0/NrQ16lB
- hRIYrS+7nU8Dmaso2COWvd0q91Gb0tAQx+Qamj5LcT+mdcQ636jf0g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Kirklees College</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Kirklees College - Testing - Do Not Use</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.kirkleescollege.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Sam</GivenName>
- <SurName>Lim</SurName>
- <EmailAddress>mailto:slim@kirkleescollege.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Sam</GivenName>
- <SurName>Lim</SurName>
- <EmailAddress>mailto:slim@kirkleescollege.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..d0dcfe24
--- /dev/null
+++ b/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpv3.lu.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>
+ <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:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute xmlns:saml="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">
+ <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: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">lu.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Lund University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identitetstjänst för anställda och studenter vid Lunds universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for employees and students at Lund University</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
+ <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
+ <mdui:Logo height="78" width="450" xml:lang="sv">http://www2.ldc.lu.se/images/LU_swe_logo_450px.jpg</mdui:Logo>
+ <mdui:Logo height="78" width="382" xml:lang="en">http://www2.ldc.lu.se/images/LU_eng_logo_382px.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>lu.se</mdui:DomainHint>
+ <mdui:DomainHint>lth.se</mdui:DomainHint>
+ <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
+ </mdui:DiscoHints>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUD4RyhLFIuNZ5O77xXaRFLYeZgJAwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwHhcNMTYwMjIyMDc1NDA2WhcNMzYw
+MjIyMDc1NDA2WjAWMRQwEgYDVQQDDAtpZHB2My5sdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJlUtfZBGTW2+XOD2UgwN/KFkrfoyaDrc/CJ9DnG
+rDjHJjlN2Fey7rB3sexvyM6RfLpxkOX7LKcwKBDq3Rjh0IyGUyEjolPls8vlPORz
+WyLGJ/JkXSRYFnOniQxeqfL2Xjo53Hk0yOFUh6gLiRSxla+EueOHwIeXkXhpTYz5
+K8O7lXwmGhS1+kd4HJZFOB8YOYDqaxMHOvcAJH01Khwe6HB0x/0MQ3LTMF0YusHv
+Ob+WjFNGZs5qX7KJcQLEhrzgBhyFVLdKX024+JREzMB7AhNrysuh+h9tLC0oUVPF
+0y0Xf+L18dCH92UamqR3IOC7k+hytZ6QqMnKIq8whXzrpeECAwEAAaNdMFswHQYD
+VR0OBBYEFFADTOECG3DC6WFR7tlcnx9pcn0oMDoGA1UdEQQzMDGCC2lkcHYzLmx1
+LnNlhiJodHRwczovL2lkcHYzLmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQAKSwpkEGkZmQPyB22U3bSWcI/QpZlOzNvWMaGaFvwmI+Vn4GS7
+gaPW03B7Pnk71MaPnWXzbDOWvKVMhtkNJiZNSldPqwqt2RnR7SS+af2XbQDqJS0n
+Wb4jgXaO25MLslWrOIeuUn4nfeO5JrUDialovqlN4Om8rn6JPao4wGEiqts3HeAB
+xCsMdAMr8CrJMoK+1sBIgfIr8nBuIo3SvXAsHd6ts0xYVqgeYM6qPg97qiHytJvU
+RkaCJ5ca0ZutSetcL3mkXdHIl+5S9zhgcs3hOLA6v7Yqsd+lWA8Jqh4wbBXixpGu
+cGOFP9UH1ptYCE+azH3kJ0N00MmrXdZgH323
+ </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>
+MIIDGDCCAgCgAwIBAgIVAOAJRp4FcZsN0Apk6n6NJRREV+6VMA0GCSqGSIb3DQEB
+CwUAMBYxFDASBgNVBAMMC2lkcHYzLmx1LnNlMB4XDTE2MDIyMjA3NTQwNVoXDTM2
+MDIyMjA3NTQwNVowFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCrPl5u1sQ/6/O9SZFlQHOIxewNK1HpNe9ZSXp+
+91pIlOLiJb16R5rH4KFLzFr6XEghwyNreduL4NSHwnS208rU0UHGnPFK58e4WSUY
+4P5RJSipDAGY1oIIrL4kBrpM50Gwhyxj42xXTq9evG2RsyyeLaPSJePlLtotPt2o
+41RBvW1vzYNcXb7JgSx8s5px6jdtjm+BtWgZtscFomSqSGWFm3/TLo+gntvG4/xT
+o1K9zlDuqfbHIMjD0t8wI4BYX3Wd7pXYNf6i0oXtOpS/9Khae4/orA9d1+8xadHM
+XID2Jk0OdvfEeuTbs5AlUyDlvQgc5nUZUVRvKwqtSSv8pbZdAgMBAAGjXTBbMB0G
+A1UdDgQWBBSxffHocHR0RA65Wd8uRplMXh4VFzA6BgNVHREEMzAxggtpZHB2My5s
+dS5zZYYiaHR0cHM6Ly9pZHB2My5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQsFAAOCAQEARk9ha/w5IQs1qKygFTFsCAWkrpAhnOVMeXWCPG+7yzYliCQv
+XX2shOz7RlQpZT+3uyDSWgJ+Z2xdISsThXbDfnMJnU5bbUXSgUy+CYkXjx8lI5b+
+RoLi7bzycPuGIFcOjUzfZxjM5mDxpVUmGP9e3cnosNUAI0iqt34nQwusx+jRZqOi
+HEa8UnjwOtglHEiRxQwyildnenAuXn37ZEe1n9jLiMAzPRFVxIrnuSyalUSyvGc2
+6c9Aozb+3ozGufmWcuVc6wZeZtGdHYRT3N1uVBN2agzRNrlhcuP/gDDjhFHlFMDs
+4YT1j/q6c6UU7MANv5mTzc3hL5MSrvj4CCpVgA==
+ </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+gAwIBAgIUauI49n1u/B9z1f0b/KUMu1vDD3EwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwHhcNMTYwMjIyMDc1NDA1WhcNMzYw
+MjIyMDc1NDA1WjAWMRQwEgYDVQQDDAtpZHB2My5sdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALNlmrTcOU72uwaA3T0pe1avdrzmjEH+Yq9fhbvz
+Jbm8jorNVJot4nLTwXrE8zubuVyndPNYda69SKFW/H2sdsPl6nXiMQv0p3Izw1Ee
+bz4zwWbvSVu7D9ohvwWR5MtV0a5sGkQW8oylyHMS8mwtp+HPEO66D8NDracxZ7/p
+kRobp16SXnsq/jekkFpph5AHsJjRTsX93vB2eFZ5+g2Yx1JloGHuSxQvkgFUktek
+Xf2i6NZYj1Vgr21woVvO6YoErrqrfjtD5ul/MlWD7V8BNZA1I89huTLBMqbFtT/R
+q3vjkHiFDgzyiOSrH6KwcYWdJuNHVISHOOYJil8Gl2eYj5UCAwEAAaNdMFswHQYD
+VR0OBBYEFAOF0q/Lew4bO5kzUKLTi4sKfi6PMDoGA1UdEQQzMDGCC2lkcHYzLmx1
+LnNlhiJodHRwczovL2lkcHYzLmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQCwGnCjGcIYhmoKwhcyHmEI2npMZ0zUMUjLxcpY8OjJFXGDUi9j
+fJlhja02L7O/kiRdVadhlIqpi5g3aNwoNyVxLbriiToDNIIm0ixrBMGWoUj9WYe6
+rA86XwGeATly1iQu9EVWH+nCBYs+MLogsB9qtA/2vd4nCM9jNGe9+PhC+p84l3nK
+2E3SR1RhRynJzC+hpoO5KARTw9ymeeMt4FM8lFXhL3rbUJq/Dl3deU0U6xCzyPDh
+KE7aiSxYsHeCrgDI13bWgb/5xaYBMwJLDYj/KTIrtThku/WU8kDgEZtjcfCWCMiJ
+9rjFqJ/gXzCEj4IVOIWKvE1TswY/c0hymlJ3
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.lu.se/idp/profile/SAML2/Redirect/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.lu.se/idp/profile/SAML2/POST/SLO"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.lu.se: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://idpv3.lu.se/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.lu.se/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.lu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.lu.se/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml
index d1b33da9..b05181d3 100644
--- a/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml
@@ -11,10 +11,10 @@
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">IDP v3 Roteiros - RNP Campinas</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">IDP v3 Roteiros - RNP Campinas</mdui:DisplayName>
- <mdui:Description xml:lang="en">IDP v3 Roteiros - RNP Campinas</mdui:Description>
- <mdui:Description xml:lang="pt-br">IDP v3 Roteiros - RNP Campinas</mdui:Description>
+ <mdui:DisplayName xml:lang="en">IDP V3 - Laerte RNP Campinas</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="pt-br">IDP V3 - Laerte RNP Campinas</mdui:DisplayName>
+ <mdui:Description xml:lang="en">IDP V3 - Laerte RNP Campinas</mdui:Description>
+ <mdui:Description xml:lang="pt-br">IDP V3 - Laerte RNP Campinas</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.rnp.br</mdui:InformationURL>
<mdui:InformationURL xml:lang="pt-br">http://www.rnp.br</mdui:InformationURL>
</mdui:UIInfo>
@@ -23,28 +23,28 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIECjCCAvICAQAwDQYJKoZIhvcNAQEFBQAwgcoxQDA+BgNVBAoTN0lEUCBWMyBj
-b20gQUQgU1NMIC0gUmVkZSBOYWNpb25hbCBkZSBFbnNpbm8gZSBQZXNxdWlzYXMx
-DDAKBgNVBAsTA0dUSTEtMCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVy
-Y2Vpcm8ucm5wLmJyMREwDwYDVQQHEwhDYW1waW5hczESMBAGA1UECBMJU2FvIFBh
-dWxvMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMaWRwdjMucm5wLmJyMB4XDTE2MDMz
-MTIwNDcyNFoXDTE5MDMzMTIwNDcyNFowgcoxQDA+BgNVBAoTN0lEUCBWMyBjb20g
-QUQgU1NMIC0gUmVkZSBOYWNpb25hbCBkZSBFbnNpbm8gZSBQZXNxdWlzYXMxDDAK
-BgNVBAsTA0dUSTEtMCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVyY2Vp
-cm8ucm5wLmJyMREwDwYDVQQHEwhDYW1waW5hczESMBAGA1UECBMJU2FvIFBhdWxv
-MQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMaWRwdjMucm5wLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo73F8fTol/pz5d0J7htmOwzhG0ZtuQ4wflnk
-zz4ljxpNlmPBGZWWTRIt3GQu0hcTKgPvdn2c+gad8d0GMXDf95xedZTWpVly7yeM
-UN06XEFLT3gGKRua9vUPf3BQebui6SbyR0fYSghpe6X8D/B58vC2/opVUYJGRlGH
-M4b3d/izqwnr1YzMY3cvnNpUsY/wzhhAW+2+Pj/0Zi3y6LsBXllUEPOyTWQBsj3o
-zvZSMlLVq7BFhwrXjuULAsViojuz7jHFtz2OgVu/yioZZ7oLbdJhP2usDPC04uSX
-merPyzwtc/4cnx74h1klYPsSCN4meMto7puWfzUYiyTolRax6QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQCC+hshKCqe/q81mgYoTyr9f3FF8QXmKwsvAYBPlPyi+POK
-Ke6LL9Ouh8RIfIj0lBs/RlKiljY34gHXtUEDbEhOAFpFMAXbYC5VG1IG2YyOcDj6
-fYKvW9wqAYwJmxWlDszRL+jySQ2V0mnou0DjtQ3Y7S2/j2HzDdMoGImHxCR8s8W/
-aVit7DAZrZOqQeeIuHb+XJHzK5K5DkeUf1D2LKw1xpVBXc2T25YfA8xU9h9nc/jS
-JAYMHRo55POqq2ikd9e0oDINDN532YSVyUBTTbHL4KmNY62040+TgfRzTOEB16Tm
-PnhD0o1ZTirB0xsdNYS1p+oNWjGIdZ1Yan1MI7D7
+ MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMTAvBgNVBAoTKFJOUCAtIFJl
+ZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVzcXVpc2ExDDAKBgNVBAsTA0dUSTEt
+MCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVyY2Vpcm8ucm5wLmJyMREw
+DwYDVQQHEwhDYW1waW5hczETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMC
+QlIxFTATBgNVBAMTDGlkcHYzLnJucC5icjAeFw0xNjA0MDQxNTAxMzRaFw0xOTA0
+MDQxNTAxMzRaMIG8MTEwLwYDVQQKEyhSTlAgLSBSZWRlIE5hY2lvbmFsIGRlIEVu
+c2lubyBlIFBlc3F1aXNhMQwwCgYDVQQLEwNHVEkxLTArBgkqhkiG9w0BCQEWHmxh
+ZXJ0ZS5iZWxvdHRvQHRlcmNlaXJvLnJucC5icjERMA8GA1UEBxMIQ2FtcGluYXMx
+EzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxpZHB2
+My5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSw9chEqxg
+jyWEbzMawJRqOCSxW6L747AD4Cd2PBDP0kAdUTpLvUds10stn7LJVoe9BGqRbo3i
+FXuD8WgmMS03ADjsdXtQuQcOLPdfdjUpswRMbmrzhwygTqBrwmESpbABz6FsxcLI
+LJYkJIWj03ay0nPSCphwqd/FBbensTqeKyy6f7BMudReOPj93oL6ZOEvadrRx/Ln
+AIa446yMgo4b/BZpxKEwE2taJ+F122ytNW5s5UQVdXcg6t/PU8yqpvt6PUN/IeVy
+ZoQE+1/4a6KglA5HMlL+0RW1pVnF7AnEjuS6DXHlPyqO8FqGRB+Dl0P3yAF2XwTP
+3sXegg/OgoxhAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGwYS5Kaft8IZE1p2sPT
+d1MDRJtkBhonCNoc1HgD4bESl6EaSLLcwH40Ued7eXaoXeurhTFNHqY0dpZcZ1qX
+8z9z1ecqN1J2g5jz3z/g+/Pvc/TGxnHANf5ZyTArGcvCDM6mMFlDa440k/UucwFV
+uH84HDKhKM7WB2d2Lsx+Ok9ae3AtE+Jfs7POvQ8OCCg2K/a+MgD0vIPkrjt0Rvqq
+Cu0TgwLPpqMwaxEqdFhISrmKiQDCUrgSFYa5LdeHeNqYzB6cQAN7LWF1eutgaxyv
+rwzjZkFiGeBWPDwP+z0ujfn5lrTAghRDc3f51qSgar/SybqN6bZxjOZF8EzcMqOI
+BLw=
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -67,28 +67,28 @@ PnhD0o1ZTirB0xsdNYS1p+oNWjGIdZ1Yan1MI7D7
<ds:X509Data>
<ds:X509Certificate>
-MIIECjCCAvICAQAwDQYJKoZIhvcNAQEFBQAwgcoxQDA+BgNVBAoTN0lEUCBWMyBj
-b20gQUQgU1NMIC0gUmVkZSBOYWNpb25hbCBkZSBFbnNpbm8gZSBQZXNxdWlzYXMx
-DDAKBgNVBAsTA0dUSTEtMCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVy
-Y2Vpcm8ucm5wLmJyMREwDwYDVQQHEwhDYW1waW5hczESMBAGA1UECBMJU2FvIFBh
-dWxvMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMaWRwdjMucm5wLmJyMB4XDTE2MDMz
-MTIwNDcyNFoXDTE5MDMzMTIwNDcyNFowgcoxQDA+BgNVBAoTN0lEUCBWMyBjb20g
-QUQgU1NMIC0gUmVkZSBOYWNpb25hbCBkZSBFbnNpbm8gZSBQZXNxdWlzYXMxDDAK
-BgNVBAsTA0dUSTEtMCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVyY2Vp
-cm8ucm5wLmJyMREwDwYDVQQHEwhDYW1waW5hczESMBAGA1UECBMJU2FvIFBhdWxv
-MQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMaWRwdjMucm5wLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo73F8fTol/pz5d0J7htmOwzhG0ZtuQ4wflnk
-zz4ljxpNlmPBGZWWTRIt3GQu0hcTKgPvdn2c+gad8d0GMXDf95xedZTWpVly7yeM
-UN06XEFLT3gGKRua9vUPf3BQebui6SbyR0fYSghpe6X8D/B58vC2/opVUYJGRlGH
-M4b3d/izqwnr1YzMY3cvnNpUsY/wzhhAW+2+Pj/0Zi3y6LsBXllUEPOyTWQBsj3o
-zvZSMlLVq7BFhwrXjuULAsViojuz7jHFtz2OgVu/yioZZ7oLbdJhP2usDPC04uSX
-merPyzwtc/4cnx74h1klYPsSCN4meMto7puWfzUYiyTolRax6QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQCC+hshKCqe/q81mgYoTyr9f3FF8QXmKwsvAYBPlPyi+POK
-Ke6LL9Ouh8RIfIj0lBs/RlKiljY34gHXtUEDbEhOAFpFMAXbYC5VG1IG2YyOcDj6
-fYKvW9wqAYwJmxWlDszRL+jySQ2V0mnou0DjtQ3Y7S2/j2HzDdMoGImHxCR8s8W/
-aVit7DAZrZOqQeeIuHb+XJHzK5K5DkeUf1D2LKw1xpVBXc2T25YfA8xU9h9nc/jS
-JAYMHRo55POqq2ikd9e0oDINDN532YSVyUBTTbHL4KmNY62040+TgfRzTOEB16Tm
-PnhD0o1ZTirB0xsdNYS1p+oNWjGIdZ1Yan1MI7D7
+MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMTAvBgNVBAoTKFJOUCAtIFJl
+ZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVzcXVpc2ExDDAKBgNVBAsTA0dUSTEt
+MCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVyY2Vpcm8ucm5wLmJyMREw
+DwYDVQQHEwhDYW1waW5hczETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMC
+QlIxFTATBgNVBAMTDGlkcHYzLnJucC5icjAeFw0xNjA0MDQxNTAxMzRaFw0xOTA0
+MDQxNTAxMzRaMIG8MTEwLwYDVQQKEyhSTlAgLSBSZWRlIE5hY2lvbmFsIGRlIEVu
+c2lubyBlIFBlc3F1aXNhMQwwCgYDVQQLEwNHVEkxLTArBgkqhkiG9w0BCQEWHmxh
+ZXJ0ZS5iZWxvdHRvQHRlcmNlaXJvLnJucC5icjERMA8GA1UEBxMIQ2FtcGluYXMx
+EzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxpZHB2
+My5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSw9chEqxg
+jyWEbzMawJRqOCSxW6L747AD4Cd2PBDP0kAdUTpLvUds10stn7LJVoe9BGqRbo3i
+FXuD8WgmMS03ADjsdXtQuQcOLPdfdjUpswRMbmrzhwygTqBrwmESpbABz6FsxcLI
+LJYkJIWj03ay0nPSCphwqd/FBbensTqeKyy6f7BMudReOPj93oL6ZOEvadrRx/Ln
+AIa446yMgo4b/BZpxKEwE2taJ+F122ytNW5s5UQVdXcg6t/PU8yqpvt6PUN/IeVy
+ZoQE+1/4a6KglA5HMlL+0RW1pVnF7AnEjuS6DXHlPyqO8FqGRB+Dl0P3yAF2XwTP
+3sXegg/OgoxhAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGwYS5Kaft8IZE1p2sPT
+d1MDRJtkBhonCNoc1HgD4bESl6EaSLLcwH40Ued7eXaoXeurhTFNHqY0dpZcZ1qX
+8z9z1ecqN1J2g5jz3z/g+/Pvc/TGxnHANf5ZyTArGcvCDM6mMFlDa440k/UucwFV
+uH84HDKhKM7WB2d2Lsx+Ok9ae3AtE+Jfs7POvQ8OCCg2K/a+MgD0vIPkrjt0Rvqq
+Cu0TgwLPpqMwaxEqdFhISrmKiQDCUrgSFYa5LdeHeNqYzB6cQAN7LWF1eutgaxyv
+rwzjZkFiGeBWPDwP+z0ujfn5lrTAghRDc3f51qSgar/SybqN6bZxjOZF8EzcMqOI
+BLw=
</ds:X509Certificate>
</ds:X509Data>
@@ -100,10 +100,10 @@ PnhD0o1ZTirB0xsdNYS1p+oNWjGIdZ1Yan1MI7D7
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
</md:AttributeAuthorityDescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="en">IDP v3 Roteiros - RNP Campinas</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">IDP v3 Roteiros - RNP Campinas</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">IDP v3 Roteiros - RNP Campinas</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">IDP v3 Roteiros - RNP Campinas</md:OrganizationDisplayName>
+ <md:OrganizationName xml:lang="en">IDP V3 - Laerte RNP Campinas</md:OrganizationName>
+ <md:OrganizationName xml:lang="pt-br">IDP V3 - Laerte RNP Campinas</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">IDP V3 - Laerte RNP Campinas</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="pt-br">IDP V3 - Laerte RNP Campinas</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">http://www.rnp.br</md:OrganizationURL>
<md:OrganizationURL xml:lang="pt-br">http://www.rnp.br</md:OrganizationURL>
</md:Organization>
diff --git a/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml b/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml
deleted file mode 100644
index 668c0d8d..00000000
--- a/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://javasp.test.openathens.net/hello/oa/metadata">
- <!--
- This is an OpenAthens test SP for Eduserv.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:54:26Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDDDCCAfSgAwIBAgIETzp1STANBgkqhkiG9w0BAQUFADBIMSEwHwYDVQQKExhK
- QVZBIFNQIHRlc3QgYXBwbGljYXRpb24xIzAhBgNVBAMTGmphdmFzcC50ZXN0Lm9w
- ZW5hdGhlbnMubmV0MB4XDTEyMDIxNDE0NTI1N1oXDTIyMDIxMTE0NTI1N1owSDEh
- MB8GA1UEChMYSkFWQSBTUCB0ZXN0IGFwcGxpY2F0aW9uMSMwIQYDVQQDExpqYXZh
- c3AudGVzdC5vcGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
- AQoCggEBALUqBTnXevAE/4OvIH7iS72gHaJqRZulPN0BFVnkDvy5HdX1ShlnMlgt
- h6lvRe7AmRgiMCrIGbGeDzV6DeeXXQKbruXrtamp3rKOkgZCFKsGbc/mTsOQsP1R
- INm86m1lyZAh/+qxT3ipL1ln+KeVT9h3Ws65ZLRn2tiZJb0cuKdkOmH8NWZ6Ou7r
- 2GEWNyIVxjGyZLttO4ZIwghGLpUJCLgnghd4NnsqaDUV1xO4GYPg+NJxezJqy2Zf
- ejLPGqhz8/Woj8yeWWPBExl7qyZty1shUknPARparzQK1JcuEHRHu9lyB9kZtPYz
- Mi39XcXfVVEC4/Jo0/wIzMPC3m57qJcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
- q95Lu8qgTLA2xmLlraZnUmR7PmKnIQbERbwHIstyz7tYfUat3n0q2EBULuwSK9Pa
- uWq2x8zfanPNX4Uvn9GDsM7Nn35oblasq2xuonbwlB2FYxEOlrlmcRbT6hCZBx6P
- SPOGSH8MH6li5/PEifq4nLgmm6PXjueGexndqv7q+ocLtHOPpBusbY2ISXZnow4T
- 4SiAK8aOQpY8PxOjKov3l9P94mzeagx9eIoVc6aDdGv+nGYGGG4zg8VI/yKR1tZR
- jSU46LhuFHdIEYRnIpm/KtYCZBA6synnD/Ba0JF8JVqJ0O2UaWc25MSMbAo7II40
- r4IsboH0bf7jMEFfq6CCew==
- </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>
- MIIDDDCCAfSgAwIBAgIETzp1STANBgkqhkiG9w0BAQUFADBIMSEwHwYDVQQKExhK
- QVZBIFNQIHRlc3QgYXBwbGljYXRpb24xIzAhBgNVBAMTGmphdmFzcC50ZXN0Lm9w
- ZW5hdGhlbnMubmV0MB4XDTEyMDIxNDE0NTI1N1oXDTIyMDIxMTE0NTI1N1owSDEh
- MB8GA1UEChMYSkFWQSBTUCB0ZXN0IGFwcGxpY2F0aW9uMSMwIQYDVQQDExpqYXZh
- c3AudGVzdC5vcGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
- AQoCggEBALUqBTnXevAE/4OvIH7iS72gHaJqRZulPN0BFVnkDvy5HdX1ShlnMlgt
- h6lvRe7AmRgiMCrIGbGeDzV6DeeXXQKbruXrtamp3rKOkgZCFKsGbc/mTsOQsP1R
- INm86m1lyZAh/+qxT3ipL1ln+KeVT9h3Ws65ZLRn2tiZJb0cuKdkOmH8NWZ6Ou7r
- 2GEWNyIVxjGyZLttO4ZIwghGLpUJCLgnghd4NnsqaDUV1xO4GYPg+NJxezJqy2Zf
- ejLPGqhz8/Woj8yeWWPBExl7qyZty1shUknPARparzQK1JcuEHRHu9lyB9kZtPYz
- Mi39XcXfVVEC4/Jo0/wIzMPC3m57qJcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
- q95Lu8qgTLA2xmLlraZnUmR7PmKnIQbERbwHIstyz7tYfUat3n0q2EBULuwSK9Pa
- uWq2x8zfanPNX4Uvn9GDsM7Nn35oblasq2xuonbwlB2FYxEOlrlmcRbT6hCZBx6P
- SPOGSH8MH6li5/PEifq4nLgmm6PXjueGexndqv7q+ocLtHOPpBusbY2ISXZnow4T
- 4SiAK8aOQpY8PxOjKov3l9P94mzeagx9eIoVc6aDdGv+nGYGGG4zg8VI/yKR1tZR
- jSU46LhuFHdIEYRnIpm/KtYCZBA6synnD/Ba0JF8JVqJ0O2UaWc25MSMbAo7II40
- r4IsboH0bf7jMEFfq6CCew==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv: Test Java SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml
deleted file mode 100644
index 47195d85..00000000
--- a/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journals.heacademy.ac.uk/shibboleth">
- <!--
- This is a 'Higher Education Academy' OpenSAML SP for Atypon Systems, Inc.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-19T12:00:00Z"/>
- </Extensions>
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDPDCCAiSgAwIBAgIJAJOTTFp5kRupMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
- BAMTGGpvdXJuYWxzLmhlYWNhZGVteS5hYy51azAeFw0xMzAzMjgwMDI0MDlaFw0x
- NjAzMjcwMDI0MDlaMCMxITAfBgNVBAMTGGpvdXJuYWxzLmhlYWNhZGVteS5hYy51
- azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOQ1INQ2UjzPpKIERLZ
- T4ImAal+OGN8XMHm54PSKVdl6oMmXOQW/oshCsm+Wd768BHhfSgajkKJQ9cGLdKG
- rQcPg0NeGlebSQxEAU5EymIbgJdyA03NSAK9C1iPdGkJ5+PNE88eKtQP/cVwa/QC
- RymCnLroxKfquAVvf/iLiTJtx0oIuLS3PaVoqSrBrRU6vJOtim7xaWBaJVmvd0I1
- FT+wgIkHtRRCi6O7ku31n1CfXuBenov/NLxOW1HpLHYqX9H+Mxt5XPjzs7vf3cIy
- hE6c5NVtN9S2qNsXhHvZMB5JQcOk6JFv/K5yxElR0/W53KQN8pstmmXQrSjAliPa
- 8UUCAwEAAaNzMHEwUAYDVR0RBEkwR4IYam91cm5hbHMuaGVhY2FkZW15LmFjLnVr
- hitodHRwczovL2pvdXJuYWxzLmhlYWNhZGVteS5hYy51ay9zaGliYm9sZXRoMB0G
- A1UdDgQWBBRZYwKjd2FZxBTfe1YCf4Uciwsz9jANBgkqhkiG9w0BAQUFAAOCAQEA
- bhkLgMPYt9MdLliyOC7frDpRExeYqYeGQ+LS5vnY9FwT3rAkIlutdaCbqZijh8Jl
- 9p8vRWcKJuGmYSHMxIrciHTmjSkNa/zYLsP3+QGLzre9MQfJZ5YiwMA9ym05xbon
- hgCKylNLWd8lQIIf3joPFBOI5dgfey8dUxoIVk2e1x8YRv2OcNfpkGQkp1HyXs3T
- lLhRoL+MLFM0aKaW18hNnV3Uuhj5OoBKJQCWbtJix2yrO2MUqUNORWsdExS69Hev
- q88umX3v6Cwt6Ri/vzVQOj/4u5vQ6NY1evS6uEYxlnfneEICxZ1WRKqXdA1MWfO4
- aaX1Y4N8Fbb80yxu7/QWIQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journals.heacademy.ac.uk/action/samlACS" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journals.heacademy.ac.uk/action/saml2post" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journals.heacademy.ac.uk/action/saml2artifact" index="3"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
- <OrganizationDisplayName xml:lang="en">The Higher Education Academy</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://journals.heacademy.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>sso-support</GivenName>
- <EmailAddress>mailto:sso-support@atypon.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>sso-tech</GivenName>
- <EmailAddress>mailto:sso-tech@atypon.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
deleted file mode 100644
index 5d550df8..00000000
--- a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://leedstrinity.ac.uk/oala/metadata">
- <!--
- This is an OpenAthens LA IdP for Leeds Trinity 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 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">leedstrinity.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIID0DCCArigAwIBAgIJAIjk4Kwl/h8pMA0GCSqGSIb3DQEBBQUAME4xKTAnBgNV
- BAoTIExlZWRzIFRyaW5pdHkgVW5pdmVyc2l0eSBDb2xsZWdlMSEwHwYDVQQDExhs
- YWlkcC5sZWVkc3RyaW5pdHkuYWMudWswHhcNMTEwNzExMTUyMzUzWhcNMjEwNzA4
- MTUyMzUzWjBOMSkwJwYDVQQKEyBMZWVkcyBUcmluaXR5IFVuaXZlcnNpdHkgQ29s
- bGVnZTEhMB8GA1UEAxMYbGFpZHAubGVlZHN0cmluaXR5LmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw/9bLwTP7SZutO6X+sUMG7pv4yPNmLGO
- thWm0PORm0ENtopolxC13bfCnMWLEzD01MkWLHLp3H1Mf9N+nMj7kJPbR+92180p
- fQlXz7PSviGwjNChbVDJvRzC+z/qDf3skRo5qNSqmXpQzfHC3OG5jXb6pa/lDQzm
- 4iY6a13yCiSd1QlcT/4EzLpmgoyCnP0N0jw0EDmKtfQWtkyFsbAsJ8Gx65ykG7gY
- kaYV/oyGNOhdYaxe02zcgGUZxxHCiSo3w9TV83wWFTufSdwMMoub3XHvC9kDfE/F
- u9fz01ClQomVzuHY0m6KdCZA1iKY4/GT1d7mHgJOSLmLIzriFtFTPwIDAQABo4Gw
- MIGtMB0GA1UdDgQWBBTGNjTJ1OSofwGC0/s7BsBo6eOOIDB+BgNVHSMEdzB1gBTG
- NjTJ1OSofwGC0/s7BsBo6eOOIKFSpFAwTjEpMCcGA1UEChMgTGVlZHMgVHJpbml0
- eSBVbml2ZXJzaXR5IENvbGxlZ2UxITAfBgNVBAMTGGxhaWRwLmxlZWRzdHJpbml0
- eS5hYy51a4IJAIjk4Kwl/h8pMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
- ggEBAJtt39tCDzI46L55zb4hzRqWPio8/gmoW5oOhParyPu/VWrIHOeIbNxyKoBk
- agUiOIYx5KoPgZxpMXDD0WiKaSYbes6EA0YoCX4U9WuZsBD+sexlbeIlLQM9axip
- TomO9q/cQI97n3J7Bk/iR87guOU2fYEKwgg95PODcOguCAjqzRr+JtmGRU5JJ9RT
- +wIvRjQcfi7iHgTfaRIWrdIUqGI565IW+zaL4dJjduR2tOkHmmMQM7XLiKy+1RV6
- hiTw6O9ZgAbb1k6UlXJ58qZgeqwBEzDd9AvQRKIIsk7MD/7u7AiaLkpSD/FIKa3n
- BDeKbG3KsdzVqHjcQxeUmsCbRe0=
- </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>
- MIID0DCCArigAwIBAgIJAIjk4Kwl/h8pMA0GCSqGSIb3DQEBBQUAME4xKTAnBgNV
- BAoTIExlZWRzIFRyaW5pdHkgVW5pdmVyc2l0eSBDb2xsZWdlMSEwHwYDVQQDExhs
- YWlkcC5sZWVkc3RyaW5pdHkuYWMudWswHhcNMTEwNzExMTUyMzUzWhcNMjEwNzA4
- MTUyMzUzWjBOMSkwJwYDVQQKEyBMZWVkcyBUcmluaXR5IFVuaXZlcnNpdHkgQ29s
- bGVnZTEhMB8GA1UEAxMYbGFpZHAubGVlZHN0cmluaXR5LmFjLnVrMIIBIjANBgkq
- hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw/9bLwTP7SZutO6X+sUMG7pv4yPNmLGO
- thWm0PORm0ENtopolxC13bfCnMWLEzD01MkWLHLp3H1Mf9N+nMj7kJPbR+92180p
- fQlXz7PSviGwjNChbVDJvRzC+z/qDf3skRo5qNSqmXpQzfHC3OG5jXb6pa/lDQzm
- 4iY6a13yCiSd1QlcT/4EzLpmgoyCnP0N0jw0EDmKtfQWtkyFsbAsJ8Gx65ykG7gY
- kaYV/oyGNOhdYaxe02zcgGUZxxHCiSo3w9TV83wWFTufSdwMMoub3XHvC9kDfE/F
- u9fz01ClQomVzuHY0m6KdCZA1iKY4/GT1d7mHgJOSLmLIzriFtFTPwIDAQABo4Gw
- MIGtMB0GA1UdDgQWBBTGNjTJ1OSofwGC0/s7BsBo6eOOIDB+BgNVHSMEdzB1gBTG
- NjTJ1OSofwGC0/s7BsBo6eOOIKFSpFAwTjEpMCcGA1UEChMgTGVlZHMgVHJpbml0
- eSBVbml2ZXJzaXR5IENvbGxlZ2UxITAfBgNVBAMTGGxhaWRwLmxlZWRzdHJpbml0
- eS5hYy51a4IJAIjk4Kwl/h8pMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
- ggEBAJtt39tCDzI46L55zb4hzRqWPio8/gmoW5oOhParyPu/VWrIHOeIbNxyKoBk
- agUiOIYx5KoPgZxpMXDD0WiKaSYbes6EA0YoCX4U9WuZsBD+sexlbeIlLQM9axip
- TomO9q/cQI97n3J7Bk/iR87guOU2fYEKwgg95PODcOguCAjqzRr+JtmGRU5JJ9RT
- +wIvRjQcfi7iHgTfaRIWrdIUqGI565IW+zaL4dJjduR2tOkHmmMQM7XLiKy+1RV6
- hiTw6O9ZgAbb1k6UlXJ58qZgeqwBEzDd9AvQRKIIsk7MD/7u7AiaLkpSD/FIKa3n
- BDeKbG3KsdzVqHjcQxeUmsCbRe0=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Leeds Trinity University</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Leeds Trinity University OALA</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.leedstrinity.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Helpdesk</GivenName>
- <EmailAddress>mailto:Helpdesk@leedstrinity.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Ryan</GivenName>
- <SurName>Dolan</SurName>
- <EmailAddress>mailto:R.Dolan@leedstrinity.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>David</GivenName>
- <SurName>Baron</SurName>
- <EmailAddress>mailto:D.Baron@leedstrinity.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.emerson.edu-idp.xml b/swamid-interfederations-2.0/login.emerson.edu-idp.xml
deleted file mode 100644
index 57d03338..00000000
--- a/swamid-interfederations-2.0/login.emerson.edu-idp.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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://login.emerson.edu/idp">
- <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://id.incommon.org/category/registered-by-incommon</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">emerson.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Emerson College</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>
-MIIEMTCCAxmgAwIBAgIJAKN0/KN2I4U9MA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVzZXR0czEPMA0GA1UEBwwGQm9zdG9u
-MRgwFgYDVQQKDA9FbWVyc29uIENvbGxlZ2UxHzAdBgNVBAsMFkluZm9ybWF0aW9u
-IFRlY2hub2xvZ3kxGjAYBgNVBAMMEWxvZ2luLmVtZXJzb24uZWR1MR8wHQYJKoZI
-hvcNAQkBFhByb290QGVtZXJzb24uZWR1MB4XDTE0MDQwMjE5NDgwOVoXDTI0MDQw
-MTE5NDgwOVowga4xCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRz
-MQ8wDQYDVQQHDAZCb3N0b24xGDAWBgNVBAoMD0VtZXJzb24gQ29sbGVnZTEfMB0G
-A1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEaMBgGA1UEAwwRbG9naW4uZW1l
-cnNvbi5lZHUxHzAdBgkqhkiG9w0BCQEWEHJvb3RAZW1lcnNvbi5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3qJbjTbnDdz4MlwuTXhmzog3R5p47
-5BL7eUX9Q6pj/tM807iaKpXlSgakVnDa38o1+Du/1DGEfZ9MhTE9E4yeztuNbFJV
-O9ScKdk6a6hZDIW1YUnWIZrW9v52usKS5Cqs8bmHUCCcFx8jZWnmaS6c6rWkGxSN
-9Kq6AmzClGXID2jubZcEmGPcFjR4Tg4W6Dche3CTZfLHDYRDXxUZ3qpcNVVhcFSx
-vCkDNr0U9ZGsw1V/kHd9dnGvonhezaJDTiDhUI1xyw/qnQdWsqnrFfMDMmdaRq/O
-nHXJ7X+H6eZ0wvluz4IBt4r07LcXBn7yvZTRlVBdDThol++6XFjWJVuxAgMBAAGj
-UDBOMB0GA1UdDgQWBBT6TymEH+rN7J/JGdpM7JeW+38OhDAfBgNVHSMEGDAWgBT6
-TymEH+rN7J/JGdpM7JeW+38OhDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQCMgG0EPvRcyDfcGnUYJmIgiYV8WVg3gILPUQ5T6tPcHJxgvfIcqFigAgWI
-6A/5rD3m5bVGcj+GfOZ4icDvj5Lftd6uAsu+JTXxGfxMJwoqIozx2hLL73usS21V
-rZRxatE0IT3F2oWz0eytE82OMCfvwBCBk71IkWN0orTTyrbYGZhvxJWVRtxUvfZ+
-LEa73Iu/Zg51/frqYYHoBjsX5rVT3H3rBhJqrlHjLS9Fw2Pay/TxAwp5FPC6zmCK
-XYfrkS9wsWKpmuK5J1Xlup8MqqwguX3zRaIFfYUW1c8bLkP7HCA1YTb7pImqBE8Y
-fRerJbNBdbk8AnS/5GdSLL1oSuHK
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.emerson.edu/saml2/idp/SingleLogoutService.php"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.emerson.edu/saml2/idp/SSOService.php"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Emerson College</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Emerson College</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.emerson.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Francis Frain</md:GivenName>
- <md:EmailAddress>Francis_Frain@emerson.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Bryce Riner</md:GivenName>
- <md:EmailAddress>bryce_riner@emerson.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml
deleted file mode 100644
index 03ef9f34..00000000
--- a/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.feld.cvut.cz/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T12:33:26Z">
- <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">
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fel.cvut.cz</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:Description xml:lang="en">Identity Provider for CTU FEE in Prague</mdui:Description>
- <mdui:Description xml:lang="cs">Identity Provider pro ČVUT FEL v Praze</mdui:Description>
- <mdui:DisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</mdui:DisplayName>
- <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</mdui:DisplayName>
- <mdui:InformationURL xml:lang="en">http://www.fel.cvut.cz/en/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</mdui:InformationURL>
- <mdui:Logo height="40" width="53">https://login.fel.cvut.cz/img/logo_cvut_40pix.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>
-MIIEgzCCA2ugAwIBAgIQANoVlz6PcuJYsEUfHOK6tjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNjAwMDAwMFoXDTE3MDQxNTIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFsb2dpbi5mZWwu
-Y3Z1dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnY8VAP8P7X
-ecu4o79lrMkoZuocDhGM9f5zFHIKPU9f4fNhuPkStgyMmEnqpoMvI6obtmLNXyGE
-/BfUrfn8xb27lURWgixhGl8/h9FFGb+xV7/fq4q8j3IJ1jaA+CF292ZL8ua8d1uG
-wqi++ra/Rp6Od/IecwC7z69cBRidqRnBOWEKfgzWtQu7O409Rv4xTjrvLx+8GDKB
-tvJdDykSWDTWkIHY/UuJsFIZKuVHT4ursigm4kFQu9URqLyhKKNIY5JvdDqBHcCn
-7XKPrqugTJZKpwEmmFV2PciClXnLIIdPCaNzsSKvh2nLxFes1m0q4gY6WN8PCYrp
-HUpBqISdJssCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBSx5rIOvDo/4kkNb0wMf/gQTgj5BjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9naW4uZmVsLmN2dXQuY3qC
-EmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAiA8p8TJej3G9
-P7D51SRAL3uVNwfa0441UL41kRPZ46iz+N6aUudHEDCFWtYtn16htmR/KuUEje6p
-4GgmxFw6TXZhni+TdEjP9NIdXR6XpEZoIqfCY4qB5dBJPJYvEhlOv10jJftckG3u
-r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
-qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
-UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
-yrp1Je1EyA==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.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: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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fel.cvut.cz/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fel.cvut.cz/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
- <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">fel.cvut.cz</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEgzCCA2ugAwIBAgIQANoVlz6PcuJYsEUfHOK6tjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNjAwMDAwMFoXDTE3MDQxNTIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFsb2dpbi5mZWwu
-Y3Z1dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnY8VAP8P7X
-ecu4o79lrMkoZuocDhGM9f5zFHIKPU9f4fNhuPkStgyMmEnqpoMvI6obtmLNXyGE
-/BfUrfn8xb27lURWgixhGl8/h9FFGb+xV7/fq4q8j3IJ1jaA+CF292ZL8ua8d1uG
-wqi++ra/Rp6Od/IecwC7z69cBRidqRnBOWEKfgzWtQu7O409Rv4xTjrvLx+8GDKB
-tvJdDykSWDTWkIHY/UuJsFIZKuVHT4ursigm4kFQu9URqLyhKKNIY5JvdDqBHcCn
-7XKPrqugTJZKpwEmmFV2PciClXnLIIdPCaNzsSKvh2nLxFes1m0q4gY6WN8PCYrp
-HUpBqISdJssCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBSx5rIOvDo/4kkNb0wMf/gQTgj5BjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9naW4uZmVsLmN2dXQuY3qC
-EmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAiA8p8TJej3G9
-P7D51SRAL3uVNwfa0441UL41kRPZ46iz+N6aUudHEDCFWtYtn16htmR/KuUEje6p
-4GgmxFw6TXZhni+TdEjP9NIdXR6XpEZoIqfCY4qB5dBJPJYvEhlOv10jJftckG3u
-r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
-qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
-UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
-yrp1Je1EyA==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.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="cs">ČVUT FEL</md:OrganizationName>
- <md:OrganizationName xml:lang="en">CTU FEE</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.fel.cvut.cz/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Ivan</md:GivenName>
- <md:SurName>Novakov</md:SurName>
- <md:EmailAddress>novakoi@fel.cvut.cz</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Jíří</md:GivenName>
- <md:SurName>Cejp</md:SurName>
- <md:EmailAddress>cejp@fel.cvut.cz</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..deefd7b9
--- /dev/null
+++ b/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.jyu.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">jyu.fi</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Jyväskylä universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Jyväskyla</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Jyväskylän yliopisto</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDyjCCArICCQC/3Ou0lsl3wzANBgkqhkiG9w0BAQUFADCBpjEgMB4GA1UEChMX
+VW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2EgZmVkZXJhdGlv
+biBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2VyYWRtaW5Aanl1
+LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUwEwYDVQQDEwxs
+b2dpbi5qeXUuZmkwHhcNMTMwNDA1MTEyOTQxWhcNMzMwMzMxMTEyOTQxWjCBpjEg
+MB4GA1UEChMXVW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2Eg
+ZmVkZXJhdGlvbiBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2Vy
+YWRtaW5Aanl1LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUw
+EwYDVQQDEwxsb2dpbi5qeXUuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQD8Y4Twul9N7kGDhz5oRwEYR4maD7hhDsipJvdQMYM5BTDTh3FGX4KvPFKx
+ytz1YVmtHwMmO/GVp0T1O+p9DDNE7AdyPGJieZlaOaYb6INKg1qNStJ3abmtTa1o
+ZtNFnCSsTl+POeCw4tLBU+EIqK6qHMtWaMJk3Kh66oFYwxhVLkvFQuLAFPp13NS3
+NQp6t6zNZOBEJoJ6WIRtz7YT0RPC0Q0jWK8dJErbcqoyWQXhKhelyOWVl4P+JsqA
+U0UkVh/suKfmm/0VhoqWybfbtXyW983eRbmF7im+5LedpL28vNYRjdYk/Y0jGGC0
+8hqR0kjed9s/V+HFHjpnajmnEfD9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIEO
+JdYZBrjvzJ4ytg8BqN4rggSSrKinsVdtQ1y9nEx/qpBP3W7PS40WkNdnKA+I2V/6
+zWTagYRZitwFvlinyxmetweYuSSSMlhlaJpGWz/fzJ6o+tDW5CVobSy2ijQen/SM
+QwNNrLA+WptOoM78cnMqm5EcPNAVr3JnxUQ7qUxU0pptTVc+R2Jqq26ASoMfoxDC
+lW022c90W26TOCwiKF0zlCi4pj3K9g1GR17bXoQYEsWw1TT34m5O9J8kQglBoqmP
+ZT98QsABBlU/uI3L0YRvitCKE7hgN4v5OMmlyGOiktQteV93hU+gWyP0gwjSsaT+
+OH7h/C8smWC5jlD+a/0=</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://login.jyu.fi/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.jyu.fi/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.jyu.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jyu.fi</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDyjCCArICCQC/3Ou0lsl3wzANBgkqhkiG9w0BAQUFADCBpjEgMB4GA1UEChMX
+VW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2EgZmVkZXJhdGlv
+biBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2VyYWRtaW5Aanl1
+LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUwEwYDVQQDEwxs
+b2dpbi5qeXUuZmkwHhcNMTMwNDA1MTEyOTQxWhcNMzMwMzMxMTEyOTQxWjCBpjEg
+MB4GA1UEChMXVW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2Eg
+ZmVkZXJhdGlvbiBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2Vy
+YWRtaW5Aanl1LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUw
+EwYDVQQDEwxsb2dpbi5qeXUuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQD8Y4Twul9N7kGDhz5oRwEYR4maD7hhDsipJvdQMYM5BTDTh3FGX4KvPFKx
+ytz1YVmtHwMmO/GVp0T1O+p9DDNE7AdyPGJieZlaOaYb6INKg1qNStJ3abmtTa1o
+ZtNFnCSsTl+POeCw4tLBU+EIqK6qHMtWaMJk3Kh66oFYwxhVLkvFQuLAFPp13NS3
+NQp6t6zNZOBEJoJ6WIRtz7YT0RPC0Q0jWK8dJErbcqoyWQXhKhelyOWVl4P+JsqA
+U0UkVh/suKfmm/0VhoqWybfbtXyW983eRbmF7im+5LedpL28vNYRjdYk/Y0jGGC0
+8hqR0kjed9s/V+HFHjpnajmnEfD9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIEO
+JdYZBrjvzJ4ytg8BqN4rggSSrKinsVdtQ1y9nEx/qpBP3W7PS40WkNdnKA+I2V/6
+zWTagYRZitwFvlinyxmetweYuSSSMlhlaJpGWz/fzJ6o+tDW5CVobSy2ijQen/SM
+QwNNrLA+WptOoM78cnMqm5EcPNAVr3JnxUQ7qUxU0pptTVc+R2Jqq26ASoMfoxDC
+lW022c90W26TOCwiKF0zlCi4pj3K9g1GR17bXoQYEsWw1TT34m5O9J8kQglBoqmP
+ZT98QsABBlU/uI3L0YRvitCKE7hgN4v5OMmlyGOiktQteV93hU+gWyP0gwjSsaT+
+OH7h/C8smWC5jlD+a/0=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.jyu.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.jyu.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">Jyväskylän yliopisto</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">University of Jyväskyla</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Jyväskylä universitet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">Jyväskylän yliopisto</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">University of Jyväskyla</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Jyväskylä universitet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.jyu.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.jyu.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.jyu.fi</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Pasi</md:GivenName>
+ <md:SurName>Haapalo</md:SurName>
+ <md:EmailAddress>mailto:useradmin@jyu.fi</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
index 54ec3b2f..a9036085 100644
--- a/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
@@ -4,13 +4,18 @@
<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:2.0:protocol">
<md:Extensions>
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oulu.fi</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="fi">Oulun yliopisto</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Uleåborgs universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Oulun yliopisto</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">University of Oulu</mdui:DisplayName>
</mdui:UIInfo>
</md:Extensions>
diff --git a/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
index 3b76145c..f968e90a 100644
--- a/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
@@ -27,39 +27,26 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIEdDCCA1ygAwIBAgIRAM7NnU7tUSvZo89k8bNlDzkwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MTcwMDAwMDBaFw0xNjA0MTYyMzU5NTlaMEExITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbWVnc3ZsZS5s
- Ym9yby5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKoGHlVk
- O6QB+0tuyJzq0vsd7NExlR42u6aWFPCfvujwV3om3gMN9ZjGqev6sY3xIVlg+ZOs
- I+1xKcIverLKiCbYtVnTxLBQI6zWybM8uK5AdTUC/BHpIA/fZqVkOajYzn002WFf
- u4rrUr0NZZszGm+RPSjdalhSf+BuUjm6Edn3TYB2PsEdtsyPEgETasdlZFgcdet+
- gYCkg6bTm7Hz7fUyj4q4iguswHzxj/p0N4STbtIJWPlFYJvgCLCHlcv+wrUXdl3u
- /W1uo6IK4xFHA88KA5iC0/WRcP0AZBoIIYt0m0WAfS5ESFVA9knCz3exQ2QW56rM
- w2JuyMdeIHaikQECAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
- KzdXR+qQ47ntMB0GA1UdDgQWBBT7biuxyf6+GROU/N8IfMZmq4AQzDAOBgNVHQ8B
- Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
- BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
- BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
- QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
- cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
- L29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbWVnc3ZsZS5sYm9yby5h
- Yy51azANBgkqhkiG9w0BAQUFAAOCAQEAeDFbLufu17MX88aTRPH2cLy2WRcPsvmS
- 1PGKkwJHRZXTg+MnviRJo9EhwPkjrolqCF6vmW//ksXqi/YO/3ot0zHW6EqrrAck
- 7RwNMtgBa/SP92iEYAzsEi76YeZupzlA5kRHwIVC9OJG/S/zSwSuxjHjDxPw4eGi
- +R7xcUcH1tUFYvS1VOVDyc3avo/QMa4TQhlK4g6ovUUFhINq1iX6P3ecBj7Z2GUg
- 69s/LbNH0HnpjKJnuLt3L94iQIWcehXxzOZ8OhZ7SExniAb3cB+9v5q6/Bt7Powx
- uIgZedCEHUiDOuVv71eq6ny67K+S91yR6wRAgV+vQo/hlnqZBHmccw==
+ MIIDADCCAeigAwIBAgIJAKmQG07LbtaqMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV
+ BAMTE21lZ3N2bGUubGJvcm8uYWMudWswHhcNMTYwNDA0MTExNTUyWhcNMzYwMzMw
+ MTExNTUyWjAeMRwwGgYDVQQDExNtZWdzdmxlLmxib3JvLmFjLnVrMIIBIjANBgkq
+ hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAptjXGVg/C5ZS9ERqejcesxpxi4uQhbUj
+ 1c4FUEAiENR7zsQkDYK8Vo8yDPpXgSNLMToJs8pKoeQz80LrwNzWm9XP4AX/nykM
+ 2I3M2PWvwyKwjyaIaygDbP9BTKgwTtkEdiwRaRN0uFJ+ltTuTwplgQOGOJoaA/HB
+ PuUHWKmPL3LWDe0aJQaF7H8YxixTfpxawCaUkAXAEuqWWWByCAertQDUln4vs9S4
+ +VXOAKOzpWL5hrMRdJjdy5y6YHVWg/Ma1RbLkSthu9hx6lvXCSQDJOzUXoZDy5Ji
+ sE4DrVPG4zOnuzl7weNExxrv13lSKSH9h1eMcVFoDUcKFSNaNEVqVQIDAQABo0Ew
+ PzAeBgNVHREEFzAVghNtZWdzdmxlLmxib3JvLmFjLnVrMB0GA1UdDgQWBBTCPyOF
+ UDxTQSUtw8+J6tsOJb49HDANBgkqhkiG9w0BAQsFAAOCAQEAEFYXAjJdWbzSf7cv
+ 8gNRMwSGPLy2azfxjzsBf+QybIi21BdEbknxkL6JijWn/gFADqmBFUxjZGn5j72O
+ L8NAY3VYPrHsS6xGMMxfZ/A5xzx71y1t22SxtaZW88u2tg3gXGP9s0NssgvXLMdG
+ 5MCMW8oZpJzoIcAQbTlTh8zsLov2bPFizopLrRN857Oj7C38XLwPa3LbLu6ZXz2K
+ ly7fE4j2AcivJSHoupjyFVRqWmdtkcMmCGuIlW6BL+CxFgPNCKAFWZxRRMXiuzIz
+ e6RNURI8NnCwzWQ39rJfK3ylKKvFkCKgdFqu1PgQ+Y6XaWM9lqM2EYfi3HYUVMbf
+ iqd+jw==
</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://megsvle.lboro.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/SOAP"/>
diff --git a/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml
deleted file mode 100644
index ead6de6c..00000000
--- a/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oasp.test.openathens.net/oa/metadata">
- <!--
- This is an OpenAthens test SP for Eduserv.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:55:47Z"/>
- </Extensions>
- <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDqTCCApGgAwIBAgIJAIF6hHuafvj6MA0GCSqGSIb3DQEBBQUAMEExHDAaBgNV
- BAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5vcGVu
- YXRoZW5zLm5ldDAeFw0xMTExMjUxMzI5MjZaFw0yMTExMjIxMzI5MjZaMEExHDAa
- BgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5v
- cGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0g
- 7T/RWjQt10WSM05mXnFuOdcMCOIaLb2CaJrcafZXDsEPyZwuliy9dbtQj+NtKaJk
- yHi4eXwZMCcHlIp1w9WK8qqkIMqZcQ1JS55e5f2JsvzD9IRkFXey8gHzMybeL/3E
- jvqlsNSYRPP+WVAJAgWFuZcKkx3PdmaP0j1qrj2TknKKW1mUxN67JMEDk8Zow938
- jqfCVyJMUqklfEmAsizu4Y9xCGd5wGhhBYCW8LV0JsdE1DcZlAVs5vhkhYX/W281
- dmoNkcuRoIua7juEYIB4j3lt73+U12x7nNqBCOkm0lSUxpXS3GU9saGiTFKmuIYG
- RwidXYL38UON0Sna3lECAwEAAaOBozCBoDAdBgNVHQ4EFgQUplgZXO9FGWF0QS0Y
- mRnlYo+iX2AwcQYDVR0jBGowaIAUplgZXO9FGWF0QS0YmRnlYo+iX2ChRaRDMEEx
- HDAaBgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVz
- dC5vcGVuYXRoZW5zLm5ldIIJAIF6hHuafvj6MAwGA1UdEwQFMAMBAf8wDQYJKoZI
- hvcNAQEFBQADggEBAB7E38GQDT3TsUstX+fj7pbxn4mdttp31TquTa4t1tzN/InY
- /yNMCzLwtu4jK1lFJj47VzZt8aAc7p9T6g623PLqz+xDtK+TPN4a8mqqIvDmzZPP
- gcdA7Lj6OcnHqY14IBKytoserwXlZ2YdL7uRmzaAqwCi9CMGaMY95HzcyWCGVPgX
- 6N8bVcOOBA0SE+SUt3YercH/Hld/MZomRY4reZ2c6jnlSKcvwAYnodgLEYtvFEOJ
- LkNq6dHtQ2tqCxYPDiW/zNOwr6vpVYvmXDxZuRF0VwPJzC2N2mSQOH7GOnWclgA+
- GFyeNtcZ1d2CHmxNE+2pWsg9tOPp/m2Vtq7TRpg=
- </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>
- MIIDqTCCApGgAwIBAgIJAIF6hHuafvj6MA0GCSqGSIb3DQEBBQUAMEExHDAaBgNV
- BAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5vcGVu
- YXRoZW5zLm5ldDAeFw0xMTExMjUxMzI5MjZaFw0yMTExMjIxMzI5MjZaMEExHDAa
- BgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5v
- cGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0g
- 7T/RWjQt10WSM05mXnFuOdcMCOIaLb2CaJrcafZXDsEPyZwuliy9dbtQj+NtKaJk
- yHi4eXwZMCcHlIp1w9WK8qqkIMqZcQ1JS55e5f2JsvzD9IRkFXey8gHzMybeL/3E
- jvqlsNSYRPP+WVAJAgWFuZcKkx3PdmaP0j1qrj2TknKKW1mUxN67JMEDk8Zow938
- jqfCVyJMUqklfEmAsizu4Y9xCGd5wGhhBYCW8LV0JsdE1DcZlAVs5vhkhYX/W281
- dmoNkcuRoIua7juEYIB4j3lt73+U12x7nNqBCOkm0lSUxpXS3GU9saGiTFKmuIYG
- RwidXYL38UON0Sna3lECAwEAAaOBozCBoDAdBgNVHQ4EFgQUplgZXO9FGWF0QS0Y
- mRnlYo+iX2AwcQYDVR0jBGowaIAUplgZXO9FGWF0QS0YmRnlYo+iX2ChRaRDMEEx
- HDAaBgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVz
- dC5vcGVuYXRoZW5zLm5ldIIJAIF6hHuafvj6MAwGA1UdEwQFMAMBAf8wDQYJKoZI
- hvcNAQEFBQADggEBAB7E38GQDT3TsUstX+fj7pbxn4mdttp31TquTa4t1tzN/InY
- /yNMCzLwtu4jK1lFJj47VzZt8aAc7p9T6g623PLqz+xDtK+TPN4a8mqqIvDmzZPP
- gcdA7Lj6OcnHqY14IBKytoserwXlZ2YdL7uRmzaAqwCi9CMGaMY95HzcyWCGVPgX
- 6N8bVcOOBA0SE+SUt3YercH/Hld/MZomRY4reZ2c6jnlSKcvwAYnodgLEYtvFEOJ
- LkNq6dHtQ2tqCxYPDiW/zNOwr6vpVYvmXDxZuRF0VwPJzC2N2mSQOH7GOnWclgA+
- GFyeNtcZ1d2CHmxNE+2pWsg9tOPp/m2Vtq7TRpg=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp.test.openathens.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp.test.openathens.net/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv: Test C SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml
deleted file mode 100644
index bd49a069..00000000
--- a/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathenstest1.test.openathens.net/oa/metadata">
- <!--
- This is an OpenAthens Support Test SP for Eduserv.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T14:42:55Z"/>
- </Extensions>
- <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol 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>
- MIIDjTCCAnWgAwIBAgIJALTj9dSJGZ41MA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
- BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMTEsMCoGA1UE
- Awwjb3BlbmF0aGVuc3Rlc3QxLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
- MDkyNTU2WhcNMjMwNzMxMDkyNTU2WjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
- QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDExLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
- MS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAsSxzVK27FBg2REsAgVGGmMEW5RPrxkiLh5NWeIpxyFeSG7x5Okp8W+zP
- /555EqKqXgcDGLGsrdOEWEU/nZB0FvP90hBCNsbbpmj0vI6lYO0USh4JCfxB1RoW
- A9+t2nflhOeQxoLKm+RHxa2HPGDfKoiGco0TZjVgS1dXNoIl197JCvCe5MnoVo+m
- r5ziPm/QM9mj1zQf4Di4Pm0FuklnLRJoi/mAPB8Nz3r2/MeBCyLdTn64ZwxddvdD
- tyNwTWmL1Xm7Xq4j32iIWoMU5Mft7NodXOQDIotMIC4z+4DanXdyVi9ly2ZO5NLa
- zyf/Ejq+iZayUuwMOmmTsSUYDY3xNQIDAQABo1AwTjAdBgNVHQ4EFgQUMpM47pKS
- 2C+RkT90fWLYvsNZSJEwHwYDVR0jBBgwFoAUMpM47pKS2C+RkT90fWLYvsNZSJEw
- DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAT22VEuJbmNjFz1EnSRJF
- GJaQg5onQPfPT0GgJQwdgNzR4Wyyff0kXy8VYfEDrJrAypSrDm73xxyQH6IMruQ4
- mphdZbeO+48utZJcvg52PorqRI3UEP+CeScjsr7gsDAmleXmk7P6khxkibbjeNQJ
- Zl03IQYnAQU8z0sfuM6iy3wT6bLaVmpg4O88P4Sl51wnZFwiBfAD//zmwRn57E1n
- ZtdbHmRILcNxHFKmp7FmZ4pCd5ZcINRVGMA5XLO9aAzzTazT2YS/RSOiSoWcoGYG
- FJRHW+mtZ5VBgzIP0OnTOQQDoLrnju/M9wplIKP5LyVnQ/b+i3eTpvbRI0fYQAh9
- UQ==
- </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>
- MIIDjTCCAnWgAwIBAgIJALTj9dSJGZ41MA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
- BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMTEsMCoGA1UE
- Awwjb3BlbmF0aGVuc3Rlc3QxLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
- MDkyNTU2WhcNMjMwNzMxMDkyNTU2WjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
- QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDExLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
- MS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAsSxzVK27FBg2REsAgVGGmMEW5RPrxkiLh5NWeIpxyFeSG7x5Okp8W+zP
- /555EqKqXgcDGLGsrdOEWEU/nZB0FvP90hBCNsbbpmj0vI6lYO0USh4JCfxB1RoW
- A9+t2nflhOeQxoLKm+RHxa2HPGDfKoiGco0TZjVgS1dXNoIl197JCvCe5MnoVo+m
- r5ziPm/QM9mj1zQf4Di4Pm0FuklnLRJoi/mAPB8Nz3r2/MeBCyLdTn64ZwxddvdD
- tyNwTWmL1Xm7Xq4j32iIWoMU5Mft7NodXOQDIotMIC4z+4DanXdyVi9ly2ZO5NLa
- zyf/Ejq+iZayUuwMOmmTsSUYDY3xNQIDAQABo1AwTjAdBgNVHQ4EFgQUMpM47pKS
- 2C+RkT90fWLYvsNZSJEwHwYDVR0jBBgwFoAUMpM47pKS2C+RkT90fWLYvsNZSJEw
- DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAT22VEuJbmNjFz1EnSRJF
- GJaQg5onQPfPT0GgJQwdgNzR4Wyyff0kXy8VYfEDrJrAypSrDm73xxyQH6IMruQ4
- mphdZbeO+48utZJcvg52PorqRI3UEP+CeScjsr7gsDAmleXmk7P6khxkibbjeNQJ
- Zl03IQYnAQU8z0sfuM6iy3wT6bLaVmpg4O88P4Sl51wnZFwiBfAD//zmwRn57E1n
- ZtdbHmRILcNxHFKmp7FmZ4pCd5ZcINRVGMA5XLO9aAzzTazT2YS/RSOiSoWcoGYG
- FJRHW+mtZ5VBgzIP0OnTOQQDoLrnju/M9wplIKP5LyVnQ/b+i3eTpvbRI0fYQAh9
- UQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv Open Athens Support Test SP1</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/Identity-Access/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>James</GivenName>
- <SurName>Westhoff</SurName>
- <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>James</GivenName>
- <SurName>Westhoff</SurName>
- <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml
deleted file mode 100644
index e2f2bd8d..00000000
--- a/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathenstest2.test.openathens.net/oa/metadata">
- <!--
- This is an OpenAthens Support Test SP for Eduserv.
- -->
- <Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T14:50:35Z"/>
- </Extensions>
- <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol 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>
- MIIDjTCCAnWgAwIBAgIJAPpeUfXoPz3SMA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
- BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMjEsMCoGA1UE
- Awwjb3BlbmF0aGVuc3Rlc3QyLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
- MDkyNTMxWhcNMjMwNzMxMDkyNTMxWjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
- QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDIxLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
- Mi50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAwGzRtVjqQ/TSm4mrrT15rMui+ndGNsKg0xMYynVx1EvfBNLGEjMuujsG
- eDRac1cRJ1rNDCR9MMM3UGlj4OAwDo5scgdXhcCbOmaCKHg7yzoHNAKmrNPnGSGr
- ELONSoUw+92TqMjfoat2mHDOLIwQnUFsRE2BjLrfK8Nx+Vvnc6SlcTEWDT0Sk7Kb
- zL0ZohL6fEMf48CphVookAdwAeeP8/3YjVUQxwld8FhRyhVa93nuG5hr7X54xyeO
- tmo6orjd/EC8dkvj9zsMx/G6LiIn+pVEjy4OQFagIi6sC4u1OhreHHyBVe7GU15w
- HeKQ5DFHJ0MNudzJbxt8FAYqDzk8FwIDAQABo1AwTjAdBgNVHQ4EFgQUM3B4Mjiy
- V+nN1qlddtPfLMH+7I4wHwYDVR0jBBgwFoAUM3B4MjiyV+nN1qlddtPfLMH+7I4w
- DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYdrxZqo2dnOxGqIjpOWS
- EYUyVXPWSuI0z2B+qJmFNqvmui9XY6ENtm/1xS/YsXfgfAzUmSi4SjxSZOHO+5Ck
- dQ2GpyurAotAOYHNG6sDn2BJgNZwACbBZhuy3YaOuJi98P0UrrfJv25l6ozPO9kO
- FEofXzBgWbozFdiM6n+eVf/KNg5a+JuWRmSoCWe0YODn3gHws7eUs97uKVKo8BCU
- yrt2fpGoiLLnIbQcsxWn7wHsqBNguXCdOi4cxemzaXstcVxT03fwrOGmRTSuUkd/
- ikEWkSYQ6y6rO/PIhSfgjkyaGizGDtYrG1vpjrlnWaIzHB7+hwqCHu6amKOsqJvJ
- 6g==
- </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>
- MIIDjTCCAnWgAwIBAgIJAPpeUfXoPz3SMA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
- BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMjEsMCoGA1UE
- Awwjb3BlbmF0aGVuc3Rlc3QyLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
- MDkyNTMxWhcNMjMwNzMxMDkyNTMxWjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
- QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDIxLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
- Mi50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
- CgKCAQEAwGzRtVjqQ/TSm4mrrT15rMui+ndGNsKg0xMYynVx1EvfBNLGEjMuujsG
- eDRac1cRJ1rNDCR9MMM3UGlj4OAwDo5scgdXhcCbOmaCKHg7yzoHNAKmrNPnGSGr
- ELONSoUw+92TqMjfoat2mHDOLIwQnUFsRE2BjLrfK8Nx+Vvnc6SlcTEWDT0Sk7Kb
- zL0ZohL6fEMf48CphVookAdwAeeP8/3YjVUQxwld8FhRyhVa93nuG5hr7X54xyeO
- tmo6orjd/EC8dkvj9zsMx/G6LiIn+pVEjy4OQFagIi6sC4u1OhreHHyBVe7GU15w
- HeKQ5DFHJ0MNudzJbxt8FAYqDzk8FwIDAQABo1AwTjAdBgNVHQ4EFgQUM3B4Mjiy
- V+nN1qlddtPfLMH+7I4wHwYDVR0jBBgwFoAUM3B4MjiyV+nN1qlddtPfLMH+7I4w
- DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYdrxZqo2dnOxGqIjpOWS
- EYUyVXPWSuI0z2B+qJmFNqvmui9XY6ENtm/1xS/YsXfgfAzUmSi4SjxSZOHO+5Ck
- dQ2GpyurAotAOYHNG6sDn2BJgNZwACbBZhuy3YaOuJi98P0UrrfJv25l6ozPO9kO
- FEofXzBgWbozFdiM6n+eVf/KNg5a+JuWRmSoCWe0YODn3gHws7eUs97uKVKo8BCU
- yrt2fpGoiLLnIbQcsxWn7wHsqBNguXCdOi4cxemzaXstcVxT03fwrOGmRTSuUkd/
- ikEWkSYQ6y6rO/PIhSfgjkyaGizGDtYrG1vpjrlnWaIzHB7+hwqCHu6amKOsqJvJ
- 6g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/saml2/art" index="4"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv Open Athens Support Test SP2</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/Identity-Access/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>James</GivenName>
- <SurName>Westhoff</SurName>
- <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>James</GivenName>
- <SurName>Westhoff</SurName>
- <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml b/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
deleted file mode 100644
index 8e4b52e7..00000000
--- a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://owncloud.cesnet.cz/saml/sp">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-02-19T21:13:48Z">
- <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/sp-group/aa.cesnet.cz</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">OwnCloud</mdui:DisplayName>
- <mdui:DisplayName xml:lang="cs">OwnCloud</mdui:DisplayName>
- <mdui:Description xml:lang="en">CESNETs servis for sharing files.</mdui:Description>
- <mdui:Description xml:lang="cs">Cesnetí služba pro sdílení souborů.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://owncloud.cesnet.cz/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="cs">http://owncloud.cesnet.cz/</mdui:InformationURL>
- </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>MIIC8jCCAdoCCQDhANKgo6HWgzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owHhcNMTUwMTI1MTQxNzE4WhcNMzUwMTI1MTQxNzE4WjA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcQUxW1Zi6objf1qJixZpDJJxuprjnUXoKQlRbLj8XxFK9jIdQv1M+Sxto3RbH4opZWpxpiM0xfJqP8y5V0N/w6h7/81p9B4r/c302Zh3z8UV4IoPUGb/+IBMinufM3qtqk5+5/Fdz+mzCoIi7adGsLFPEwiuY48mOnCsHNjvirQcE/JVwZsJoBiTJiplYe3XsPiUAFOgcyZ5DCu2LEbttBqHgdpSESyweNlWTpHhDmkxSyRlxOb1jdEyvnKdMXgZEo7OfX7O5SPe9AlvV5T3PMMsrlP34rJmQ3+2wrLr7bbh6CEGuqGxW2rhEMV3XK7HHiZX+PHPPQmeaz8nIeKPfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJGaqabntG6EQW2wZJCCEB7nXmFJbMActIhJoTgWYlp75E781jSs+qhQ40NjO+kfJ3YIf+4JKMSo3EAAY0UFrZ/JFaK2dHehx9dn6Y697yKg7fPITMI9eo3ehXBe+gpoAvF0iPD2XfpgwQn6ASMHOQdKA3LC5qhwJ6wPYwF4THKqDrGveE5BF83FSLL6w4veMuyNzfhpQ7cBZEUkEShPkfAu7B88TNz0FWE5LBsnjBEn1bWeC4QTubRFJSSIt60klOvHcToniY0qRpQAVaIQtiNNNjanNv365lXICzlcTdN/lVWawZw1MGCdjqzlrMgL9wCKb+9nQFz+yW23eJDxptU=</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>MIIC8jCCAdoCCQDhANKgo6HWgzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owHhcNMTUwMTI1MTQxNzE4WhcNMzUwMTI1MTQxNzE4WjA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcQUxW1Zi6objf1qJixZpDJJxuprjnUXoKQlRbLj8XxFK9jIdQv1M+Sxto3RbH4opZWpxpiM0xfJqP8y5V0N/w6h7/81p9B4r/c302Zh3z8UV4IoPUGb/+IBMinufM3qtqk5+5/Fdz+mzCoIi7adGsLFPEwiuY48mOnCsHNjvirQcE/JVwZsJoBiTJiplYe3XsPiUAFOgcyZ5DCu2LEbttBqHgdpSESyweNlWTpHhDmkxSyRlxOb1jdEyvnKdMXgZEo7OfX7O5SPe9AlvV5T3PMMsrlP34rJmQ3+2wrLr7bbh6CEGuqGxW2rhEMV3XK7HHiZX+PHPPQmeaz8nIeKPfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJGaqabntG6EQW2wZJCCEB7nXmFJbMActIhJoTgWYlp75E781jSs+qhQ40NjO+kfJ3YIf+4JKMSo3EAAY0UFrZ/JFaK2dHehx9dn6Y697yKg7fPITMI9eo3ehXBe+gpoAvF0iPD2XfpgwQn6ASMHOQdKA3LC5qhwJ6wPYwF4THKqDrGveE5BF83FSLL6w4veMuyNzfhpQ7cBZEUkEShPkfAu7B88TNz0FWE5LBsnjBEn1bWeC4QTubRFJSSIt60klOvHcToniY0qRpQAVaIQtiNNNjanNv365lXICzlcTdN/lVWawZw1MGCdjqzlrMgL9wCKb+9nQFz+yW23eJDxptU=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud4elixir.cesnet.cz/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://owncloud.cesnet.cz/simplesamlphp/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://owncloud.cesnet.cz/simplesamlphp/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://owncloud.cesnet.cz/simplesamlphp/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://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="6"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="7"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="8"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="9"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="10"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="11"/>
- </md:SPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Lubos</md:GivenName>
- <md:SurName>Kopecky</md:SurName>
- <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml b/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml
new file mode 100644
index 00000000..ed8aa550
--- /dev/null
+++ b/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ppms.eu/manchester/shibboleth">
+ <!--
+ This is a "PPMS for the University of Manchester" Shibboleth SP for Stratocore.
+ -->
+ <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="2016-04-07T12:23: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://corefacilities.manchester.ac.uk/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:Logo height="59" width="143">https://ppms.eu/stratocore.png</mdui:Logo>
+ <mdui:DisplayName xml:lang="en">Stratocore PPMS for the University of Manchester</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Stratocore's PPMS core facility management solution for the University of Manchester</mdui:Description>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC8TCCAdmgAwIBAgIJAPz0WtwkZDRdMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+ BAMTDmV1MS1zdHJhdG9jb3JlMB4XDTEzMDIyMDAyMTc0M1oXDTIzMDIxODAyMTc0
+ M1owGTEXMBUGA1UEAxMOZXUxLXN0cmF0b2NvcmUwggEiMA0GCSqGSIb3DQEBAQUA
+ A4IBDwAwggEKAoIBAQDCYe74FvKADvVsBi9j+q8cpjOQBOu2IEbdgXBT+0UNiYFp
+ p9/gMt08fbGxcXDxzKBqZ9wvjnslhXgpFrZKbD3uY1I9sEiA1rqDYmplgMwZ4A8E
+ Ow+/qRqm5t4VQ0JOZzTYccgzelBQRyl5YMYqy0FauH5CEPMuQHFKSi3CO7LO4ucg
+ gIGZOEbjKl0BNhjKd8M6zQNsKk1KzYLxZ5YzU/1ETDs1J1cqIwqI/uq+dvfCVVeX
+ o+XrPad+t/8iwhmyTS5vio21kZK+biil/cOSwQaRhBTWclg3zHVVTtPap0ypZOeK
+ xiFrqWmmr9c1qOoaG6kFZtAFkCkepZb1ix+4eLzpAgMBAAGjPDA6MBkGA1UdEQQS
+ MBCCDmV1MS1zdHJhdG9jb3JlMB0GA1UdDgQWBBSEMJDeqFu+BPz5HcVjdtaJreHK
+ 3zANBgkqhkiG9w0BAQUFAAOCAQEAWnElDes0a9Fx5nP926lMbNUIhblAqziZPyvl
+ nyi1vh5zCQepefZGgFNM+8Pbi5x0059jyAnA6rfmwxNvkOtEK/qSLBLOyDpqwVbM
+ xQwQb6KUn5P28wdbbetRw1sxsYjNGmEs8RcisPyx4vK/cZnlLvGk/6b96LiCTeLV
+ C/wvGbXTcUyrTEniOO/54sVWnioRNxFz3lsa918j8CCFJbd+aM3q3fm7LPfbYIWW
+ q6YQKBzEpgV9ERLVaa1gEA1qYZaKrxjHp8G3T6wLpeKEiufCb59CPEbJkGOrXlWO
+ 7Qc3nJyR1cdsp5K2qqW6f14n97mp7yfKldJJX6NQJ7dUQ4TD/A==
+ </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://corefacilities.manchester.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Stratocore</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Stratocore PPMS for the University of Manchester</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://stratocore.com/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Stratocore Support</GivenName>
+ <EmailAddress>mailto:support@stratocore.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Mathieu</GivenName>
+ <SurName>Marchand</SurName>
+ <EmailAddress>mailto:hosting@stratocore.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml b/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
index 7ff0b164..d4ab16bd 100644
--- a/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
+++ b/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
@@ -38,8 +38,7 @@
<md:OrganizationURL xml:lang="en">http://www.deic.dk/</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:Company>University of Patras</md:Company>
+ <md:EmailAddress>stathopou@ceid.upatras.gr</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml b/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
index ed368ad4..cd0ba1bc 100644
--- a/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
+++ b/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
@@ -38,8 +38,7 @@
<md:OrganizationURL xml:lang="en">http://deic.dk</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:Company>PSNC</md:Company>
+ <md:EmailAddress>labedzki@man.poznan.pl</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.lynda.com.xml b/swamid-interfederations-2.0/saml.lynda.com.xml
new file mode 100644
index 00000000..0f61dbc1
--- /dev/null
+++ b/swamid-interfederations-2.0/saml.lynda.com.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://saml.lynda.com">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-06T14:42:49Z">
+ <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">lynda.com</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">lynda.com</mdui:DisplayName>
+ <mdui:Description xml:lang="de">lynda.com ist eines der führenden Online-Learning-Unternehmen, das Nutzer dabei unterstützt, persönliche Fähigkeiten im Bereich Business, Software, Technologie und Kreativität zu entwickeln und persönliche und berufliche Ziele besser zu erreichen. Durch Abonnements für Einzelpersonen, Unternehmen, akademische und staatliche Einrichtungen haben Mitglieder Zugang zur lynda.com Videothek mit ansprechenden und hochwertigen Kursen, die von anerkannten Industrie-Experten unterrichtet werden. Das Unternehmen bietet auch Inhalte auf Deutsch, Französisch und Spanisch unter dem Markennamen video2brain an.</mdui:Description>
+ <mdui:Description xml:lang="en">lynda.com is a leading online learning company that helps anyone learn business, software, technology and creative skills to achieve personal and professional goals. Through individual, corporate, academic and government subscriptions, members have access to the lynda.com video library of engaging, top-quality courses taught by recognized industry experts. The company also provides German, French and Spanish language content under the video2brain brand name.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://saml.lynda.com</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=https://saml.lynda.com</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAPS3fySJTyfaMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmh0dHBzOi8vc2FtbC5seW5kYS5jb20wHhcNMTUxMDA1MTcxNTA0WhcNMTgx
+MDA0MTcxNTA0WjAhMR8wHQYDVQQDExZodHRwczovL3NhbWwubHluZGEuY29tMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArljPwyk0t7fUrSYp7IcHBSI1
+29pQXs+eFnLUVvyXZ6X2ESoR1IC25P4ShlrmGHzkXrDY5RMDfZXxOlEQ3Z05gDHb
+LpDO+AxF1mzRZZjCP+XN1lgHeAue+14WRRQ4t55zsrnrwECBwj5A7PBat/8qVbqS
+eKJCfV21bKOeBD2g4nA9f1lJSMnoZ3tzOlysDg2oIbWbYqkX1NvalPO9smdtnsOk
+pb4RgGRx4f2iF5mg348n5s6napEid1578JI4QmEYdY+FMMpCK1xVwfconbKqP7BR
+WZh/JqpZjiem86Tv68LHReSIpySEnDQILDfvOi6n+OpiVwAnbnGrI4Q2OM3DpQID
+AQABo1wwWjA5BgNVHREEMjAwghZodHRwczovL3NhbWwubHluZGEuY29thhZodHRw
+czovL3NhbWwubHluZGEuY29tMB0GA1UdDgQWBBQuFJx7I6SR9oV6iuEqwJPd0mSE
+0jANBgkqhkiG9w0BAQUFAAOCAQEAq9XpSOuF67tPtTB+WKHegyYI0wZ3GoJxjYPz
+vEgv+LYSYutkDJG6M5HDkjtxn+SqIqBTr6AxGYdol8WPICgVAlj1LV36NHtE8TUi
+1gC7gzv/XxVPhLpEsyx2vcOgY/J5Nziu0epPg98GSvmplDG0Z6YuSa/zp7I1Z73r
+3Mu/W8FJJqoSZjil6BPnXv1dbjgOjg8Z7eQjqDwr2ki/td69pvvEyqIQ/0i/5C5w
+0k0LQi2tiJfdQN1LzTP/z7uglW9MXtsgWQgiY1fbMAU5PLdneI0GHwDUYbnizdk2
+YlDBz1PhAHejnP2Sx6tnjNQ36qgiwvybuEhFWs2/jSOM4SWhyg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.lynda.com/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.lynda.com/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.lynda.com/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml.lynda.com/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml.lynda.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://saml.lynda.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="de">lynda.com</md:ServiceName>
+ <md:ServiceName xml:lang="en">lynda.com</md:ServiceName>
+ <md:ServiceDescription xml:lang="de">lynda.com ist eines der führenden Online-Learning-Unternehmen, das Nutzer dabei unterstützt, persönliche Fähigkeiten im Bereich Business, Software, Technologie und Kreativität zu entwickeln und persönliche und berufliche Ziele besser zu erreichen. Durch Abonnements für Einzelpersonen, Unternehmen, akademische und staatliche Einrichtungen haben Mitglieder Zugang zur lynda.com Videothek mit ansprechenden und hochwertigen Kursen, die von anerkannten Industrie-Experten unterrichtet werden. Das Unternehmen bietet auch Inhalte auf Deutsch, Französisch und Spanisch unter dem Markennamen video2brain an.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">lynda.com is a leading online learning company that helps anyone learn business, software, technology and creative skills to achieve personal and professional goals. Through individual, corporate, academic and government subscriptions, members have access to the lynda.com video library of engaging, top-quality courses taught by recognized industry experts. The company also provides German, French and Spanish language content under the video2brain brand name.</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:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="de">e484</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">e484</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="de">lynda.com, Inc.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">lynda.com, Inc.</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="de">http://www.lynda.com</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.lynda.com</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Michael</md:GivenName>
+ <md:SurName>Flynn</md:SurName>
+ <md:EmailAddress>mailto:miflynn@linkedin.com</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Michael</md:GivenName>
+ <md:SurName>Flynn</md:SurName>
+ <md:EmailAddress>mailto:miflynn@linkedin.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
index 04390510..94fa2fae 100644
--- a/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
@@ -54,11 +54,11 @@ vcW4oD4N2OIPcMam+7V1yw==
<md:OrganizationURL xml:lang="en">http://stevenson.edu/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>Philip Desrosiers</md:GivenName>
- <md:EmailAddress>pdesrosiers@stevenson.edu</md:EmailAddress>
+ <md:GivenName>Shibboleth Admin</md:GivenName>
+ <md:EmailAddress>shibadmin@stevenson.edu</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="administrative">
- <md:GivenName>Philip Desrosiers</md:GivenName>
- <md:EmailAddress>pdesrosiers@stevenson.edu</md:EmailAddress>
+ <md:GivenName>Shibboleth Admin</md:GivenName>
+ <md:EmailAddress>shibadmin@stevenson.edu</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
index d0ba98db..cdca3217 100644
--- a/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
@@ -90,10 +90,6 @@ D0UPBA==
<md:OrganizationURL xml:lang="en">http://www.bucknell.edu/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>Keelan Cleary</md:GivenName>
- <md:EmailAddress>cleary@bucknell.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
<md:GivenName>Michael Dahlberg</md:GivenName>
<md:EmailAddress>dahlberg@bucknell.edu</md:EmailAddress>
</md:ContactPerson>
diff --git a/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml b/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
index 025f183d..c327f007 100644
--- a/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
@@ -31,32 +31,36 @@
<mdui:DisplayName xml:lang="en">Informit</mdui:DisplayName>
<mdui:Logo height="43" width="136">https://search.informit.com.au/images-v4/logo-informit.gif</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://shib.informit.com.au/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://shib.informit.com.au/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://shib.informit.com.au/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://shib.informit.com.au/Shibboleth.sso/DS" 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://shib.informit.com.au/Shibboleth.sso/DS" 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://shib.informit.com.au/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://shib.informit.com.au/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://shib.informit.com.au/Shibboleth.sso/UKfedWAYF"/>
+ <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://shib.informit.com.au/Shibboleth.sso/UKfedWAYF" index="3"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
- MIIDAzCCAeugAwIBAgIJALYvWF0HTg94MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
- BAMTFHNoaWIuaW5mb3JtaXQuY29tLmF1MB4XDTEzMDYwNjAxMzMzMFoXDTIzMDYw
- NDAxMzMzMFowHzEdMBsGA1UEAxMUc2hpYi5pbmZvcm1pdC5jb20uYXUwggEiMA0G
- CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQConFnj3K7sHy3Xa8iyPuW3NSYl9H8L
- 1yUYum0MvgrMtxSn+hhrRQZS9Ub1E+7BLjsdBfmnDVsL8i+nCmTtWuDhINSeCPhh
- RVF4pJ6zl6OFRc0k4X5JhTF7hfqKMmvALAUzMvRRb/Q6YmRFdsZq6cdyZxZaMKUN
- CWwjsFHD9Tg4bF6s+OVdnSqpTJE518wzl8LxklkSeo/xjWoBezA11t8/E5HKFqv3
- Djwvd5cF8Pt5Cyxp8wz8oacyzamQFhWcn2XQcaSUh8vodNCFtFxvPXl1mcZGY+kq
- iCyT91pSxSFasliWoJaY839DmqaqYZtPN92lYMmDLeNYEX0hBczBxztTAgMBAAGj
- QjBAMB8GA1UdEQQYMBaCFHNoaWIuaW5mb3JtaXQuY29tLmF1MB0GA1UdDgQWBBT2
- l+da01RVVegnzL4KMKKI9W79cTANBgkqhkiG9w0BAQUFAAOCAQEAKZyhvO7eDK57
- xQ2STBOYKOJC9yEpH2CmNhkshIgvTN3S2yYfz1jjtTAxCke/2FyO3BIJCGgDeXG/
- MdL9DTmblscFdhyAqvw/Y4IZMVPePrvOna8CmdsSXxV1V1B+YO6q8qlWQ/19Aqs8
- yfoTBDA3DSXYPqfYN2Q44J9B45tSdfr5Et3bcISdusu6aXnxwfpm2S9SZ9fkQCSM
- oT3Pa2/yXfxkvLyszNsiSjV7p30I6qpIOELLILYxN881SGs0Xi0GPhw9LtGJT6wY
- /HUOp21fktmi6T1RRosh/kjF69hpNeY1qnoobw4stsDRi36AybFABgv0wxFk/4PL
- t2UA+9z1qA==
+ MIIDEjCCAfqgAwIBAgIJAMJQ7W9dNntWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+ BAMTGXNoaWJwcmR3czAxLnJtaXQuaW50ZXJuYWwwHhcNMTYwMjE1MjMwNjM0WhcN
+ MjYwMjEyMjMwNjM0WjAkMSIwIAYDVQQDExlzaGlicHJkd3MwMS5ybWl0LmludGVy
+ bmFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsl8OCJqga3lb7Nw6
+ XgS5YrzMz7HOZKQ5FtuveFyESrQ2YkmJm4NVxXYQ74ahdYpKfjT/I7aSY5Fo0Zfs
+ RQ08ZhXLppQSaOBkPkfGzZJFAoGo5jZUzS29INjPo/vutRd787CfUwSVM/fG7CBH
+ y6LK5+yU4NaxfPu7cgXyLdT9id9vXCanktDf+8MwBcHAQDW1mDw1eqqhED6+50zS
+ p7HlZjcHlJ4O8CBmi/STrLNNIChFFYFWWhfq0dNBas4br5ro8bSmFNPXpkoK17t3
+ CM2IVKvQOnRpSy/xuun7w7uTpB3bVBiWYO5l8hZ06PDiLaGujiebV23jL35DrtGl
+ EAUvbQIDAQABo0cwRTAkBgNVHREEHTAbghlzaGlicHJkd3MwMS5ybWl0LmludGVy
+ bmFsMB0GA1UdDgQWBBT0PhB6XxNLt7dLIwr0nlxbJ9z72DANBgkqhkiG9w0BAQUF
+ AAOCAQEAdN5GfXlrkG1x4ygh1/ZwBtNgQPiaWCIBTNVSLBZCLZYU3FFPZoK26W3U
+ qj8db4lHSlm46ExSmYR4mPsFUfqmRAD6yQwVFLGll4J88Mt7iVu6M9kyBxhQJ7X/
+ UfJhnRxzYLyoDtLjp3ayynkE36f7KRnlVeukYminUnlURyW0+RR5FVgv2WBn3RRk
+ Nmi1/D0NwnlH72Pj+hfblBuhfF1eWlYWEAdC+t9LUCU32Ocox0GP8WNNDz5x41Yt
+ EKhu2M87LgaVdkNX7Byh25ha8ELXFBxMcv/uMmImAT53C9rd/4UTLaHQffFVDD1C
+ jMB14stpA71j1X9hdeFzaL/T/NYkww==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -75,10 +79,6 @@
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Redirect"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/POST"/>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/Artifact"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/POST" index="1"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/Artifact" index="3"/>
@@ -96,8 +96,13 @@
<EmailAddress>mailto:support@rmitpublishing.com.au</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
- <GivenName>Deepak</GivenName>
- <SurName>Vasa</SurName>
- <EmailAddress>mailto:deepak.vasa@rmit.edu.au</EmailAddress>
+ <GivenName>Dominic</GivenName>
+ <SurName>Crowther</SurName>
+ <EmailAddress>mailto:dominic.crowther@rmit.edu.au</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Loan</GivenName>
+ <SurName>Pham</SurName>
+ <EmailAddress>mailto:dominic.crowther@rmit.edu.au</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml
deleted file mode 100644
index f7d2019d..00000000
--- a/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?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.its.fsu.edu/idp/shibboleth">
- <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://id.incommon.org/category/registered-by-incommon</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">fsu.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Florida State University</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>
-MIIHHDCCBQSgAwIBAgIJAOyJ6VxozPsEMA0GCSqGSIb3DQEBBQUAMIIBFjELMAkG
-A1UEBhMCVVMxDjAMBgNVBBETBTMyMzA2MRAwDgYDVQQIEwdGbG9yaWRhMRQwEgYD
-VQQHEwtUYWxsYWhhc3NlZTEhMB8GA1UECRMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJz
-aXR5MSgwJgYDVQQJEx82MTAwQyBVbml2ZXJzaXR5IENlbnRlciBNUyAyNjIwMSEw
-HwYDVQQKExhGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxFzAVBgNVBAsTDklUUy1N
-aWRkbGV3YXJlMSswKQYJKoZIhvcNAQkBFhxJVFMtTWlkZGxld2FyZUBhZG1pbi5m
-c3UuZWR1MRkwFwYDVQQDExBzaGliLml0cy5mc3UuZWR1MCAXDTE0MDExNTE5MTM0
-NVoYDzIxMTIxMjIyMTkxMzQ1WjCCARYxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUz
-MjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UEBxMLVGFsbGFoYXNzZWUxITAf
-BgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0eTEoMCYGA1UECRMfNjEwMEMg
-VW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8GA1UEChMYRmxvcmlkYSBTdGF0
-ZSBVbml2ZXJzaXR5MRcwFQYDVQQLEw5JVFMtTWlkZGxld2FyZTErMCkGCSqGSIb3
-DQEJARYcSVRTLU1pZGRsZXdhcmVAYWRtaW4uZnN1LmVkdTEZMBcGA1UEAxMQc2hp
-Yi5pdHMuZnN1LmVkdTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN3A
-S8Ioxszl8uY33i/h84lkk5pVrqBaj5oWdZtC2hKwhbO9cUDl0Fy0oB/YEeyVerZV
-QG9dO9JZp+5ydO1yiUM67U/qYffN+6pzclt4r4RPnXQwMQEEiTcruGNN3rQy/u8y
-BPAY5nkOz7ybBg7FntYmzHJY+i9w187MGac7jGmAW9TaGM66eOUS9P+lXQjjlc0i
-gEj8vlXoPe5aNz4a5rW6PczOpdpf8qYhVFTJsAzhbrXO2WICWRKETOgX6J+nX9za
-rL9c5otDNySI79Gdz0xy9bpE5ivJsxWvyxyEun0mQsTonEn/fyqyTvuc5+6XAosH
-fcfD/x0aiUOMhpgRKccWpzkLitu2QpjLPb75d03owKjnovfMxVKYxAqDwpE5xuLd
-pjoafLC64nGtBT1s+9jtTx5eYeUZX+K6bBpzIPTgX9josG5+9El72d82MrDenV6L
-PK2PrtInGlIIP85jyg05iX3N4xVaV0/FzHaSmGmHdBm7ssYjF1i2a7RwU0q+EtOy
-hEBAvU+eyJiQ/cOlCEcAqZTGt/pPeJyLMGCbFguHnjDOXlUkIlr8GmiXnS9xth7W
-R3zRwhdQNgaR8SOQ1NcMxHvXTo7UYE03QUrYNNtCcXqGM9YEi5NP4/GVIhBLSntj
-T8Km5daR4G8aPyjsibFmIT6SJpeOn4Tkr1BVilatAgMBAAGjZzBlMEQGA1UdEQQ9
-MDuCEHNoaWIuaXRzLmZzdS5lZHWGJ2h0dHBzOi8vc2hpYi5pdHMuZnN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH7v4eLmZUMErxgbbwx6JlI2svoswDQYJ
-KoZIhvcNAQEFBQADggIBAM2ycz4FwhL/2vApURa/hpmlp0zGhsX2F60vm9HDxTFe
-MadcRHuPRNAeYT6sSXHZrKbgPBMxcYwFDZbNzJW2+WmDzr+NRMdHLKWc/gpns2l0
-O83fw9EihpatOCDaaWx2AQ+YANrC+hsTTKWUypGukV4iz2UfLofOgzzrqkVADImO
-o71xkmtGTdNi8LIZ5TAh0VdjgulLmhtO00fQVUX67pfatJqqymG5sZSWIF7TJ6Mg
-sH26ppdQm6KI2gk8fqVEon1db4JmHqKyWmFHJk71FsP9no0zzuQFnYO2rVYuYOUu
-58bsvp29wdHdyudRx04bCVh2EWEpgqhmAv95I2YC2mSTOQappUB/oBmdfmLJIYLI
-2kbl8Y2NRpBXdk9qMPYCclR6wOviatjMQo9sEy3qIejwyv+a01zEkiMnJSSNyX8M
-ttiOQplZe5GdXU/zC0nx5IOHMIkfjQqtFVn1EWgUuXqDheBSMdTlKpg6Vur7GnD2
-fTdPc7y0ZqurUa2Ux5VOnv+ZvdcsbCVrLPdROZZDcmXhmfb9sq6UzCskN0WRnHpf
-RLpLfE22HaiKomONZ9OhbEW7Wz+ht/oA9AGbJdmpYEqEXBPe5tipffXzGLzzQd5Z
-tkZaeBriA8z142lSzChElmO1LRQ4pSvdjX6yr0BMb3PFQR2w/n0SG9uStXJNobxg
- </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>
-MIIHMzCCBhugAwIBAgIRANeIvvgkRHOihdJ4fkShxBYwDQYJKoZIhvcNAQEFBQAw
-gZMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtl
-IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMY
-aHR0cDovL3d3dy51c2VydHJ1c3QuY29tMRswGQYDVQQDExJVVE4gLSBEQVRBQ29y
-cCBTR0MwHhcNMTEwMTMxMDAwMDAwWhcNMTMwMTMwMjM1OTU5WjCCASoxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQREwUzMjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UE
-BxMLVGFsbGFoYXNzZWUxITAfBgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0
-eTEoMCYGA1UECRMfNjEwMEMgVW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8G
-A1UEChMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxKzAp
-BgNVBAsTIkhvc3RlZCBieSBGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxIDAeBgNV
-BAsTF0NvbW9kbyBTR0MgU1NMIFdpbGRjYXJkMRYwFAYDVQQDFA0qLml0cy5mc3Uu
-ZWR1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3cBLwijGzOXy5jfe
-L+HziWSTmlWuoFqPmhZ1m0LaErCFs71xQOXQXLSgH9gR7JV6tlVAb1070lmn7nJ0
-7XKJQzrtT+ph9837qnNyW3ivhE+ddDAxAQSJNyu4Y03etDL+7zIE8BjmeQ7PvJsG
-DsWe1ibMclj6L3DXzswZpzuMaYBb1NoYzrp45RL0/6VdCOOVzSKASPy+Veg97lo3
-Phrmtbo9zM6l2l/ypiFUVMmwDOFutc7ZYgJZEoRM6Bfon6df3Nqsv1zmi0M3JIjv
-0Z3PTHL1ukTmK8mzFa/LHIS6fSZCxOicSf9/KrJO+5zn7pcCiwd9x8P/HRqJQ4yG
-mBEpxxanOQuK27ZCmMs9vvl3TejAqOei98zFUpjECoPCkTnG4t2mOhp8sLrica0F
-PWz72O1PHl5h5Rlf4rpsGnMg9OBf2Oiwbn70SXvZ3zYysN6dXos8rY+u0icaUgg/
-zmPKDTmJfc3jFVpXT8XMdpKYaYd0GbuyxiMXWLZrtHBTSr4S07KEQEC9T57ImJD9
-w6UIRwCplMa3+k94nIswYJsWC4eeMM5eVSQiWvwaaJedL3G2HtZHfNHCF1A2BpHx
-I5DU1wzEe9dOjtRgTTdBStg020JxeoYz1gSLk0/j8ZUiEEtKe2NPwqbl1pHgbxo/
-KOyJsWYhPpIml46fhOSvUFWKVq0CAwEAAaOCAeYwggHiMB8GA1UdIwQYMBaAFFMy
-0bPPf/rg8aBdhU6S0p5FHbRPMB0GA1UdDgQWBBQfu/h4uZlQwSvGBtvDHomUjay+
-izAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADA0BgNVHSUELTArBggrBgEF
-BQcDAQYIKwYBBQUHAwIGCisGAQQBgjcKAwMGCWCGSAGG+EIEATBGBgNVHSAEPzA9
-MDsGDCsGAQQBsjEBAgEDBDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5j
-b21vZG8uY29tL0NQUzBtBgNVHR8EZjBkMDGgL6AthitodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9VVE4tREFUQUNvcnBTR0MuY3JsMC+gLaArhilodHRwOi8vY3JsLmNv
-bW9kby5uZXQvVVROLURBVEFDb3JwU0dDLmNybDBuBggrBgEFBQcBAQRiMGAwOAYI
-KwYBBQUHMAKGLGh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL1VUTkFkZFRydXN0U0dD
-Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wJQYD
-VR0RBB4wHIINKi5pdHMuZnN1LmVkdYILaXRzLmZzdS5lZHUwDQYJKoZIhvcNAQEF
-BQADggEBAH0d8k4qW7pbDYGk3w9ydUuOMPZbiTzAZdtNlBTWegSIYz+XqKDLBUhc
-WAqNlEzP6EgMIqbotu6fDPslqjh+E302DSJIHAXMyY6LpacEszxBxQGTg+sv4W5z
-/b3AYJ1/U7wfNSHIucZUEaR5sFlVAylrFD5vvTXssmBaxjoAguR1UR9VETSVDiQf
-PwB3HhlDuzfGb2f38Lih4zMBOLTpfYmrk61R8EeZy0EfbihvNaXPCPwiEIHbO782
-Y48ocWiFA1v3w9AiVGRbgItfnaZ9I/tWZeRuegm4D0pcJdVnxoRDqDA54vEQlUt1
-2eRDf3zvQVY3IgWWsBv6VDWwwBhjYY4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.its.fsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.its.fsu.edu/idp/profile/SAML2/POST/SSO"/>
- </md:IDPSSODescriptor>
- <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">fsu.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIHHDCCBQSgAwIBAgIJAOyJ6VxozPsEMA0GCSqGSIb3DQEBBQUAMIIBFjELMAkG
-A1UEBhMCVVMxDjAMBgNVBBETBTMyMzA2MRAwDgYDVQQIEwdGbG9yaWRhMRQwEgYD
-VQQHEwtUYWxsYWhhc3NlZTEhMB8GA1UECRMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJz
-aXR5MSgwJgYDVQQJEx82MTAwQyBVbml2ZXJzaXR5IENlbnRlciBNUyAyNjIwMSEw
-HwYDVQQKExhGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxFzAVBgNVBAsTDklUUy1N
-aWRkbGV3YXJlMSswKQYJKoZIhvcNAQkBFhxJVFMtTWlkZGxld2FyZUBhZG1pbi5m
-c3UuZWR1MRkwFwYDVQQDExBzaGliLml0cy5mc3UuZWR1MCAXDTE0MDExNTE5MTM0
-NVoYDzIxMTIxMjIyMTkxMzQ1WjCCARYxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUz
-MjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UEBxMLVGFsbGFoYXNzZWUxITAf
-BgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0eTEoMCYGA1UECRMfNjEwMEMg
-VW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8GA1UEChMYRmxvcmlkYSBTdGF0
-ZSBVbml2ZXJzaXR5MRcwFQYDVQQLEw5JVFMtTWlkZGxld2FyZTErMCkGCSqGSIb3
-DQEJARYcSVRTLU1pZGRsZXdhcmVAYWRtaW4uZnN1LmVkdTEZMBcGA1UEAxMQc2hp
-Yi5pdHMuZnN1LmVkdTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN3A
-S8Ioxszl8uY33i/h84lkk5pVrqBaj5oWdZtC2hKwhbO9cUDl0Fy0oB/YEeyVerZV
-QG9dO9JZp+5ydO1yiUM67U/qYffN+6pzclt4r4RPnXQwMQEEiTcruGNN3rQy/u8y
-BPAY5nkOz7ybBg7FntYmzHJY+i9w187MGac7jGmAW9TaGM66eOUS9P+lXQjjlc0i
-gEj8vlXoPe5aNz4a5rW6PczOpdpf8qYhVFTJsAzhbrXO2WICWRKETOgX6J+nX9za
-rL9c5otDNySI79Gdz0xy9bpE5ivJsxWvyxyEun0mQsTonEn/fyqyTvuc5+6XAosH
-fcfD/x0aiUOMhpgRKccWpzkLitu2QpjLPb75d03owKjnovfMxVKYxAqDwpE5xuLd
-pjoafLC64nGtBT1s+9jtTx5eYeUZX+K6bBpzIPTgX9josG5+9El72d82MrDenV6L
-PK2PrtInGlIIP85jyg05iX3N4xVaV0/FzHaSmGmHdBm7ssYjF1i2a7RwU0q+EtOy
-hEBAvU+eyJiQ/cOlCEcAqZTGt/pPeJyLMGCbFguHnjDOXlUkIlr8GmiXnS9xth7W
-R3zRwhdQNgaR8SOQ1NcMxHvXTo7UYE03QUrYNNtCcXqGM9YEi5NP4/GVIhBLSntj
-T8Km5daR4G8aPyjsibFmIT6SJpeOn4Tkr1BVilatAgMBAAGjZzBlMEQGA1UdEQQ9
-MDuCEHNoaWIuaXRzLmZzdS5lZHWGJ2h0dHBzOi8vc2hpYi5pdHMuZnN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH7v4eLmZUMErxgbbwx6JlI2svoswDQYJ
-KoZIhvcNAQEFBQADggIBAM2ycz4FwhL/2vApURa/hpmlp0zGhsX2F60vm9HDxTFe
-MadcRHuPRNAeYT6sSXHZrKbgPBMxcYwFDZbNzJW2+WmDzr+NRMdHLKWc/gpns2l0
-O83fw9EihpatOCDaaWx2AQ+YANrC+hsTTKWUypGukV4iz2UfLofOgzzrqkVADImO
-o71xkmtGTdNi8LIZ5TAh0VdjgulLmhtO00fQVUX67pfatJqqymG5sZSWIF7TJ6Mg
-sH26ppdQm6KI2gk8fqVEon1db4JmHqKyWmFHJk71FsP9no0zzuQFnYO2rVYuYOUu
-58bsvp29wdHdyudRx04bCVh2EWEpgqhmAv95I2YC2mSTOQappUB/oBmdfmLJIYLI
-2kbl8Y2NRpBXdk9qMPYCclR6wOviatjMQo9sEy3qIejwyv+a01zEkiMnJSSNyX8M
-ttiOQplZe5GdXU/zC0nx5IOHMIkfjQqtFVn1EWgUuXqDheBSMdTlKpg6Vur7GnD2
-fTdPc7y0ZqurUa2Ux5VOnv+ZvdcsbCVrLPdROZZDcmXhmfb9sq6UzCskN0WRnHpf
-RLpLfE22HaiKomONZ9OhbEW7Wz+ht/oA9AGbJdmpYEqEXBPe5tipffXzGLzzQd5Z
-tkZaeBriA8z142lSzChElmO1LRQ4pSvdjX6yr0BMb3PFQR2w/n0SG9uStXJNobxg
- </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>
-MIIHMzCCBhugAwIBAgIRANeIvvgkRHOihdJ4fkShxBYwDQYJKoZIhvcNAQEFBQAw
-gZMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtl
-IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMY
-aHR0cDovL3d3dy51c2VydHJ1c3QuY29tMRswGQYDVQQDExJVVE4gLSBEQVRBQ29y
-cCBTR0MwHhcNMTEwMTMxMDAwMDAwWhcNMTMwMTMwMjM1OTU5WjCCASoxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQREwUzMjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UE
-BxMLVGFsbGFoYXNzZWUxITAfBgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0
-eTEoMCYGA1UECRMfNjEwMEMgVW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8G
-A1UEChMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxKzAp
-BgNVBAsTIkhvc3RlZCBieSBGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxIDAeBgNV
-BAsTF0NvbW9kbyBTR0MgU1NMIFdpbGRjYXJkMRYwFAYDVQQDFA0qLml0cy5mc3Uu
-ZWR1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3cBLwijGzOXy5jfe
-L+HziWSTmlWuoFqPmhZ1m0LaErCFs71xQOXQXLSgH9gR7JV6tlVAb1070lmn7nJ0
-7XKJQzrtT+ph9837qnNyW3ivhE+ddDAxAQSJNyu4Y03etDL+7zIE8BjmeQ7PvJsG
-DsWe1ibMclj6L3DXzswZpzuMaYBb1NoYzrp45RL0/6VdCOOVzSKASPy+Veg97lo3
-Phrmtbo9zM6l2l/ypiFUVMmwDOFutc7ZYgJZEoRM6Bfon6df3Nqsv1zmi0M3JIjv
-0Z3PTHL1ukTmK8mzFa/LHIS6fSZCxOicSf9/KrJO+5zn7pcCiwd9x8P/HRqJQ4yG
-mBEpxxanOQuK27ZCmMs9vvl3TejAqOei98zFUpjECoPCkTnG4t2mOhp8sLrica0F
-PWz72O1PHl5h5Rlf4rpsGnMg9OBf2Oiwbn70SXvZ3zYysN6dXos8rY+u0icaUgg/
-zmPKDTmJfc3jFVpXT8XMdpKYaYd0GbuyxiMXWLZrtHBTSr4S07KEQEC9T57ImJD9
-w6UIRwCplMa3+k94nIswYJsWC4eeMM5eVSQiWvwaaJedL3G2HtZHfNHCF1A2BpHx
-I5DU1wzEe9dOjtRgTTdBStg020JxeoYz1gSLk0/j8ZUiEEtKe2NPwqbl1pHgbxo/
-KOyJsWYhPpIml46fhOSvUFWKVq0CAwEAAaOCAeYwggHiMB8GA1UdIwQYMBaAFFMy
-0bPPf/rg8aBdhU6S0p5FHbRPMB0GA1UdDgQWBBQfu/h4uZlQwSvGBtvDHomUjay+
-izAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADA0BgNVHSUELTArBggrBgEF
-BQcDAQYIKwYBBQUHAwIGCisGAQQBgjcKAwMGCWCGSAGG+EIEATBGBgNVHSAEPzA9
-MDsGDCsGAQQBsjEBAgEDBDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5j
-b21vZG8uY29tL0NQUzBtBgNVHR8EZjBkMDGgL6AthitodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9VVE4tREFUQUNvcnBTR0MuY3JsMC+gLaArhilodHRwOi8vY3JsLmNv
-bW9kby5uZXQvVVROLURBVEFDb3JwU0dDLmNybDBuBggrBgEFBQcBAQRiMGAwOAYI
-KwYBBQUHMAKGLGh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL1VUTkFkZFRydXN0U0dD
-Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wJQYD
-VR0RBB4wHIINKi5pdHMuZnN1LmVkdYILaXRzLmZzdS5lZHUwDQYJKoZIhvcNAQEF
-BQADggEBAH0d8k4qW7pbDYGk3w9ydUuOMPZbiTzAZdtNlBTWegSIYz+XqKDLBUhc
-WAqNlEzP6EgMIqbotu6fDPslqjh+E302DSJIHAXMyY6LpacEszxBxQGTg+sv4W5z
-/b3AYJ1/U7wfNSHIucZUEaR5sFlVAylrFD5vvTXssmBaxjoAguR1UR9VETSVDiQf
-PwB3HhlDuzfGb2f38Lih4zMBOLTpfYmrk61R8EeZy0EfbihvNaXPCPwiEIHbO782
-Y48ocWiFA1v3w9AiVGRbgItfnaZ9I/tWZeRuegm4D0pcJdVnxoRDqDA54vEQlUt1
-2eRDf3zvQVY3IgWWsBv6VDWwwBhjYY4=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.its.fsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Florida State University</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Florida State University</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.fsu.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Chuck Kemeny</md:GivenName>
- <md:EmailAddress>ckemeny@admin.fsu.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Diane Higgins</md:GivenName>
- <md:EmailAddress>dhiggins@fsu.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="support">
- <md:GivenName>Jonathan Liedy</md:GivenName>
- <md:EmailAddress>jliedy@fsu.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml
deleted file mode 100644
index aff8ea0a..00000000
--- a/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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.lternet.edu/idp/shibboleth">
- <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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</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://id.incommon.org/category/registered-by-incommon</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">lternet.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">LTERN (Long Term Ecological Research Network)</mdui:DisplayName>
- <mdui:Description xml:lang="en">The U.S. LTER Network is an National Science Funded project that includes 26 research sites encompasing a wide range of ecosystem types spanning broad ranges of environmental conditions and human domination of the landscape. The geographic distribution of sites ranges from Alaska to Antarctica and from the Caribbean to French Polynesia and includes agricultural lands, alpine tundra, barrier islands, coastal lagoons, cold and hot deserts, coral reefs, estuaries, forests, freshwater wetlands, grasslands, kelp forests, lakes, open ocean, savannas, streams, and urban landscapes.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.lternet.edu</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>
-MIIDKzCCAhOgAwIBAgIUNQ0S3k+4XlqeFEPjY/nhbLcHvaAwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc2hpYi5sdGVybmV0LmVkdTAeFw0xMTA1MjYxNDUxMTRa
-Fw0zMTA1MjYxNDUxMTRaMBsxGTAXBgNVBAMTEHNoaWIubHRlcm5ldC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnFvUgQ4yMEsHe9AVhOfn+1oh6
-7AYPw+9XgL6FRJ12Gfxmvrb/irE0+50xUV5L+okUGhUuyoKTQHBSUOajmlszC4AR
-b8xpYvPQF8WO/wIySxHdHOHrhCYVG96vyosM2U3FgNQ168pdrjooqK4DO2MiBe3e
-ts8nc/ZI0QRrrcQ0ictiw1TAoWj5RX2gRiCgkoLc2sP5mKI4IrnGWaD4Pl+aGIm8
-ceOGIybtVGFXsrbz0pyHZarvIRguKDj3HePZBgCZ/ilixShuEkYaoxLLj0TjSBxc
-QupkXi4rgNKBiyjXu+mSVqi3Ugvvhrsf89MAuCWSox8dPhCxdtfL0LSIeH9LAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNoaWIubHRlcm5ldC5lZHWGJ2h0dHBzOi8vc2hp
-Yi5sdGVybmV0LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUO/dzbA/SAWfv
-qW5u9ojjlAes5z8wDQYJKoZIhvcNAQEFBQADggEBAG0ebyLXBHau5V06fjQZTD8O
-1oygZEeF1veVV7wnMiLm1hz9b4Wq9pVwXmxGTCtz3ugPm7WfgZNYUvYCm4d4dWQn
-OgPukcpyu57Bi7FWqcLo47rmPhImSQMxr/Z+f9K+wda28yBgxrTwOal6+yOEQTxj
-4qxmVQruRdw8ig+Nj+Ia5+78XpscxQ87uEhrnzSpa9s6g6a20bmbQboH9IWT6WTT
-TRpg/Tzxum6NIPdd4P4mJ2i4h8ivHl59Rl/X3A6H/YvGfMoJIsiuGU5/ydC4gbBL
-aBW874sHe5I9WUlV3L8bfagPwFbw54Htg+fgzSWtN/I0mBUOpm3CglPzd4SvQ5A=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lternet.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lternet.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.lternet.edu/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lternet.edu/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.lternet.edu/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">lternet.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUNQ0S3k+4XlqeFEPjY/nhbLcHvaAwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc2hpYi5sdGVybmV0LmVkdTAeFw0xMTA1MjYxNDUxMTRa
-Fw0zMTA1MjYxNDUxMTRaMBsxGTAXBgNVBAMTEHNoaWIubHRlcm5ldC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnFvUgQ4yMEsHe9AVhOfn+1oh6
-7AYPw+9XgL6FRJ12Gfxmvrb/irE0+50xUV5L+okUGhUuyoKTQHBSUOajmlszC4AR
-b8xpYvPQF8WO/wIySxHdHOHrhCYVG96vyosM2U3FgNQ168pdrjooqK4DO2MiBe3e
-ts8nc/ZI0QRrrcQ0ictiw1TAoWj5RX2gRiCgkoLc2sP5mKI4IrnGWaD4Pl+aGIm8
-ceOGIybtVGFXsrbz0pyHZarvIRguKDj3HePZBgCZ/ilixShuEkYaoxLLj0TjSBxc
-QupkXi4rgNKBiyjXu+mSVqi3Ugvvhrsf89MAuCWSox8dPhCxdtfL0LSIeH9LAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNoaWIubHRlcm5ldC5lZHWGJ2h0dHBzOi8vc2hp
-Yi5sdGVybmV0LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUO/dzbA/SAWfv
-qW5u9ojjlAes5z8wDQYJKoZIhvcNAQEFBQADggEBAG0ebyLXBHau5V06fjQZTD8O
-1oygZEeF1veVV7wnMiLm1hz9b4Wq9pVwXmxGTCtz3ugPm7WfgZNYUvYCm4d4dWQn
-OgPukcpyu57Bi7FWqcLo47rmPhImSQMxr/Z+f9K+wda28yBgxrTwOal6+yOEQTxj
-4qxmVQruRdw8ig+Nj+Ia5+78XpscxQ87uEhrnzSpa9s6g6a20bmbQboH9IWT6WTT
-TRpg/Tzxum6NIPdd4P4mJ2i4h8ivHl59Rl/X3A6H/YvGfMoJIsiuGU5/ydC4gbBL
-aBW874sHe5I9WUlV3L8bfagPwFbw54Htg+fgzSWtN/I0mBUOpm3CglPzd4SvQ5A=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lternet.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">LTERN (Long Term Ecological Research Network)</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">LTERN (Long Term Ecological Research Network)</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.lternet.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Mark Servilla</md:GivenName>
- <md:EmailAddress>servilla@lternet.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
index 453cf9aa..3a4d2b31 100644
--- a/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.oclc.org/shibboleth">
<!--
- This is a service provider for OCLC (UK) Limited.
- Uses 1.3 of the Shib SP, and a home-brew WAYF
- written in Java using Tomcat as a servlet container.
+ This is an "OCLC FirstSearch" Shibboleth SP for OCLC (UK) Limited.
-->
<Extensions>
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
diff --git a/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
index ecfec44d..f7a52a3d 100644
--- a/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
@@ -18,7 +18,7 @@
<mdui:DisplayName xml:lang="en">University of Nebraska-Lincoln</mdui:DisplayName>
<mdui:Description xml:lang="en">The University of Nebraska-Lincoln, chartered in 1869, is an educational institution of international stature. UNL is listed by the Carnegie Foundation within the "Research Universities (very high research activity)" category. UNL is a land-grant university and a member of the Association of Public and Land-grant Universities (APLU). The university is accredited by the Higher Learning Commission of the North Central Association of Colleges and Schools.</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.unl.edu/</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.unl.edu/is/about/UNLprivacy.pdf</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://its.unl.edu/unlprivacypolicy</mdui:PrivacyStatementURL>
<mdui:Logo height="67" width="66" xml:lang="en">https://idm.unl.edu/wdn/templates_3.0/images/logo.png</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
@@ -47,45 +47,11 @@ D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unl.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.unl.edu/idp/profile/Shibboleth/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unl.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unl.edu/idp/profile/SAML2/POST/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unl.edu/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">unl.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVALR4hUzlhDFUyPrCzbCR8aB8/okIMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTAeFw0xMDA5MTAyMTA4MjZaFw0z
-MDA5MTAyMTA4MjZaMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJhLs+N32LNQicvVL26oZcWyU46MixkhDOdG
-h5XmzO8vWckrIPs+4LUG5U9ozfIksiYVVJW4mTl21RID0RJ9l3svZeKvEKBGrxUR
-6mQb1nQQcUPVVxNlMIZ5rlWfyffWcP686kGYTdWMU14KyflrVyFW7Vq70izKe9oT
-nX+bEclWv6KjzFayWJcIYCE4+jX7GvxSMyQTh3TRenUGOh9iukzIHlApI9bfzh89
-OdHsHy3WPmvoZYRTLeeTtG+qvzNvD+IMBNCUM9f8bRYc6N790/vBHn7kU5XSiMIv
-5sXFMt5nwNPDq3+37vY7xpu+r74tcT3HpXF5OeOPmG2OC8FSIvMCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2hpYi51bmwuZWR1hiNodHRwczovL3NoaWIudW5sLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTEOLq42EOS0daP8iT0PJ1kc4rMUwDQYJ
-KoZIhvcNAQEFBQADggEBAIAZpYEcXhU317hPR08os2NC3TM2K6BaNrRm53fu+tIT
-zsdHv7cfQ7ONLUE5vC0Wis6g468wGOKi01ueSrIU7emQUgQaxRoCbinUsSu1R6a1
-NP/c0ZhOo88hweNRac8zpZccjUi9Oc3WssQ/uHbkumN2hM7BhvC/4NRg5NRMWLNs
-ko224ENGUqVqFkBiZJWH5ooxOM/8Gt4Ut1cTkNxyMSJvno7Gki95l0M45fNfSbWw
-voZFOzm0IBZx1K786PNxotISs/WY/R7yJA91L0FCzrXFMh+jK5L1nCg5ZfEL0YEM
-D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unl.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationDisplayName>
@@ -103,4 +69,8 @@ D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
<md:GivenName>Brett Bieber</md:GivenName>
<md:EmailAddress>bieber@unl.edu</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>UNL Security Team</md:GivenName>
+ <md:EmailAddress>security@unl.edu</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml
deleted file mode 100644
index af5ee162..00000000
--- a/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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://shib2.rowan.edu/idp/shibboleth">
- <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:IDPSSODescriptor errorURL="https://shib2.rowan.edu" 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">rowan.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Rowan University</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>
-MIIDJzCCAg+gAwIBAgIUV1h7BDn1TSOjSv/+LSq0IE3Oy+AwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MB4XDTEzMDkxMTE5MDAyMVoX
-DTMzMDkxMTE5MDAyMVowGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dC45ZVWTnEsm6ku5CSWBf/yKB6G
-LGYNi4aSG5sYvw88ODE0wAHDxeVUpUV93Mq3HpsNVD7ciBCynYyeGy9myDPd8GF+
-LgozcIMKEL9y3pys8EfOz+ZiewJZXXldwuI8ULYZ8tApAJofeO+rZYW5TleyNEE/
-l/sxuEU/GzYIFS5Adr0SpzL5UGIr0WR+unkgv3cdz1lJwJW8ZxqJLNOEnwPQniXt
-5t7im0X7Jb2mMeAqtkfi3t9UGiprYV5gltCSV+phWA7uw/eIBCf+T+MrLOA/bJeK
-f4tHpCGGGn9dWgHczBq3tJcmqrU9KZXMjP8F6EX+UhlI9M0kQcXtFaDfyQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliMi5yb3dhbi5lZHWGJmh0dHBzOi8vc2hpYjIu
-cm93YW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQD5L1958tIrqBF2l7b
-ItJU0uhJnzANBgkqhkiG9w0BAQUFAAOCAQEAF+xcIxBd1V8BtD5VKV5CPdBY9JXX
-JrsB9ETj+9Dtv12c7XdbwoumlkdORbDXsoAB156kF5VJSEhOU45QpRI5o6mwQzBR
-oKw1Zem0MLWTgrLDZvFeQzEO/lcnnKSa82sEJ+ooyk59Pjn8ZHNwV/76xGx4cIe0
-VYrgZQqBSiVJaCaEQUndNw3+9d4SNIfQ+KPfsFyJE/0RXzDO35RqT8gP6vqsTtyr
-mNCEYGye/xJOKXb8vnyf/r6sCDiaJCBxB6pwHiRS5TlxOXJOx/CPLQe3oLBHm6NV
-V4Hgw585iFPY3CHO+EezoWVCuDIVlvcnMAHlLYh/kZypvjuuIzizI2l28g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.rowan.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.rowan.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.rowan.edu/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.rowan.edu/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.rowan.edu/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">rowan.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUV1h7BDn1TSOjSv/+LSq0IE3Oy+AwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MB4XDTEzMDkxMTE5MDAyMVoX
-DTMzMDkxMTE5MDAyMVowGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dC45ZVWTnEsm6ku5CSWBf/yKB6G
-LGYNi4aSG5sYvw88ODE0wAHDxeVUpUV93Mq3HpsNVD7ciBCynYyeGy9myDPd8GF+
-LgozcIMKEL9y3pys8EfOz+ZiewJZXXldwuI8ULYZ8tApAJofeO+rZYW5TleyNEE/
-l/sxuEU/GzYIFS5Adr0SpzL5UGIr0WR+unkgv3cdz1lJwJW8ZxqJLNOEnwPQniXt
-5t7im0X7Jb2mMeAqtkfi3t9UGiprYV5gltCSV+phWA7uw/eIBCf+T+MrLOA/bJeK
-f4tHpCGGGn9dWgHczBq3tJcmqrU9KZXMjP8F6EX+UhlI9M0kQcXtFaDfyQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliMi5yb3dhbi5lZHWGJmh0dHBzOi8vc2hpYjIu
-cm93YW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQD5L1958tIrqBF2l7b
-ItJU0uhJnzANBgkqhkiG9w0BAQUFAAOCAQEAF+xcIxBd1V8BtD5VKV5CPdBY9JXX
-JrsB9ETj+9Dtv12c7XdbwoumlkdORbDXsoAB156kF5VJSEhOU45QpRI5o6mwQzBR
-oKw1Zem0MLWTgrLDZvFeQzEO/lcnnKSa82sEJ+ooyk59Pjn8ZHNwV/76xGx4cIe0
-VYrgZQqBSiVJaCaEQUndNw3+9d4SNIfQ+KPfsFyJE/0RXzDO35RqT8gP6vqsTtyr
-mNCEYGye/xJOKXb8vnyf/r6sCDiaJCBxB6pwHiRS5TlxOXJOx/CPLQe3oLBHm6NV
-V4Hgw585iFPY3CHO+EezoWVCuDIVlvcnMAHlLYh/kZypvjuuIzizI2l28g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.rowan.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Rowan University</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Rowan University</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.rowan.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Josh Grochowski</md:GivenName>
- <md:EmailAddress>grochowski@rowan.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
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
deleted file mode 100644
index c03e8446..00000000
--- a/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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://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>
- </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">ceris.cnr.it</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">CNR IRCrES</mdui:DisplayName>
- <mdui:DisplayName xml:lang="it">CNR IRCrES</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for CNR IRCrES users</mdui:Description>
- <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR IRCrES</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
- <mdui:InformationURL xml:lang="it">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="it">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
- <mdui:Logo height="60" width="80" xml:lang="en">https://intranet.ircres.cnr.it/IRCRES_80x60.png</mdui:Logo>
- <mdui:Logo height="60" width="80" xml:lang="it">https://intranet.ircres.cnr.it/IRCRES_80x60.png</mdui:Logo>
- <mdui:Logo height="16" width="16" xml:lang="en">https://intranet.ircres.cnr.it/IRCRES_16x16.png</mdui:Logo>
- <mdui:Logo height="16" width="16" xml:lang="it">https://intranet.ircres.cnr.it/IRCRES_16x16.png</mdui:Logo>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEkDCCA3igAwIBAgIQA7YHo7zjDDdKW4N5+ddItjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbDELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGDAWBgNVBAMTD3NoaWIyLnRvLmNu
-ci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMo4zqb/PU/AH2Vs
-d1oQAnJpAXHO6OEMutdBGxRRw4np3jjr32Lehd/NsAtUq4GOzbui08cWj/q6C0S9
-kX7soZti+/wggpZt9l5DaQIO9n0cfBo3qvsSZwHY8wfzi6mmkm+uBR1ro67BvHe5
-HoFTgdmmsB2kXPyZTzatC4+0ux0xGEa+3RdrFRe/nH21mVpc5NpRmHnSCDf8XEEJ
-VsbQAJ5IXEOIb7ZqmlhWdKYwJZt/C/tcWHDOl9T5uVQe1SKsNZRPqbbL6HH5LYm8
-e2umiaOk0HIDGlMyQR0U95s3SfAi2GyLulpxKWoE+1VaV/YQc3MB0htH9b6qvNfF
-EbkzNVcCAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBQJMBh7eDwsje9LkEEtlZu97Y4YvjAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAaBgNVHREEEzARgg9zaGliMi50by5jbnIuaXQwDQYJKoZIhvcNAQEFBQAD
-ggEBAANUFWLXwxPLIukJtShIOBuAFLKmCgRIoJHJEKJqj6SkMG/j3RalS312LPxk
-DGm6OsPSk34AvloSfpUJHeFtrNECpxlcC34jtpGG/uvjC7V1O78o/1KO1ON4966T
-6hbhZ1NWs9VFg+kKDnOni712akqaqNiHqP1C0PMKbOWWRRRgKHe6CpV3BLfJnZCy
-XQ0hJbyzxm5hOhXJdPBwl8V65TrVG+4FBN4iK077+leQWzjvwtyCXuKjoA8CbEUn
-75aNc43eKZdsPVAV7uXumhc4b3eAgh72H+p3SL8/4gU4+EqqdslhzhZqSqpqdl/o
-xLAyzTVSpamrag76ZF4Qye/ENGU=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.to.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://shib2.to.cnr.it/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.to.cnr.it/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.to.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.to.cnr.it/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">ceris.cnr.it</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIEkDCCA3igAwIBAgIQA7YHo7zjDDdKW4N5+ddItjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbDELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGDAWBgNVBAMTD3NoaWIyLnRvLmNu
-ci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMo4zqb/PU/AH2Vs
-d1oQAnJpAXHO6OEMutdBGxRRw4np3jjr32Lehd/NsAtUq4GOzbui08cWj/q6C0S9
-kX7soZti+/wggpZt9l5DaQIO9n0cfBo3qvsSZwHY8wfzi6mmkm+uBR1ro67BvHe5
-HoFTgdmmsB2kXPyZTzatC4+0ux0xGEa+3RdrFRe/nH21mVpc5NpRmHnSCDf8XEEJ
-VsbQAJ5IXEOIb7ZqmlhWdKYwJZt/C/tcWHDOl9T5uVQe1SKsNZRPqbbL6HH5LYm8
-e2umiaOk0HIDGlMyQR0U95s3SfAi2GyLulpxKWoE+1VaV/YQc3MB0htH9b6qvNfF
-EbkzNVcCAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBQJMBh7eDwsje9LkEEtlZu97Y4YvjAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAaBgNVHREEEzARgg9zaGliMi50by5jbnIuaXQwDQYJKoZIhvcNAQEFBQAD
-ggEBAANUFWLXwxPLIukJtShIOBuAFLKmCgRIoJHJEKJqj6SkMG/j3RalS312LPxk
-DGm6OsPSk34AvloSfpUJHeFtrNECpxlcC34jtpGG/uvjC7V1O78o/1KO1ON4966T
-6hbhZ1NWs9VFg+kKDnOni712akqaqNiHqP1C0PMKbOWWRRRgKHe6CpV3BLfJnZCy
-XQ0hJbyzxm5hOhXJdPBwl8V65TrVG+4FBN4iK077+leQWzjvwtyCXuKjoA8CbEUn
-75aNc43eKZdsPVAV7uXumhc4b3eAgh72H+p3SL8/4gU4+EqqdslhzhZqSqpqdl/o
-xLAyzTVSpamrag76ZF4Qye/ENGU=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.to.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 IRCrES</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CNR IRCrES</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="it">http://www.ircres.cnr.it/index.php/it/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.ircres.cnr.it/index.php/en/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Giancarlo Birello</md:SurName>
- <md:EmailAddress>mailto:giancarlo.birello@ircres.cnr.it</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>mailto:supporto@to.cnr.it</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
index 745cc7a6..159de9fd 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
@@ -64,6 +64,50 @@ yRrHi0bPUSEYjGLZ5Muj2HV6lkYUuuhQxYEy8YCM01kN3A==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>shibboleth-idp.uni-regensburg.de</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=shibboleth-idp.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
+ <ds:X509Certificate>MIIGfjCCBWagAwIBAgIHGywrIcyZwTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
+A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
+bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
+cmcuZGUwHhcNMTYwNDEyMDgxMDU4WhcNMTkwNzA5MjM1OTAwWjCBmDELMAkGA1UE
+BhMCREUxDzANBgNVBAgMBkJheWVybjETMBEGA1UEBwwKUmVnZW5zYnVyZzEgMB4G
+A1UECgwXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxFjAUBgNVBAsMDVJlY2hlbnpl
+bnRydW0xKTAnBgNVBAMMIHNoaWJib2xldGgtaWRwLnVuaS1yZWdlbnNidXJnLmRl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7i+RKUaVAruh38IbGPaR
+3bXZ5ATX8ITFmnyXb7jiGUSumDGFP6WB8KYG5DBOj7IJg8XTcjB+VoHk5OB4O5Rd
+/O/XO66FGWl46yufdzeI3GAVNLN2pqtgbzufOIuIFs/8Ggx7VZJOuuhchgNRCnnP
+o5G7Ba21+y7TRCdVZZ6/xAahJreEmJDn6BWXbDS0X2rkfqHCk8ah/dz7fCJtwNF4
+wrJMnJRKF4dEmaS+gP44B04SXO4vGlNQ/wuWaWXvDRAHqJewm0RRJgwhJIy/WnPA
+cvGhm1KZPyPOVy53ndH1AHdIGRxCMg7giDQhwRnvyvMKuDfNdiXOLdrO39fyo5J3
+BwIDAQABo4ICxDCCAsAwWQYDVR0gBFIwUDARBg8rBgEEAYGtIYIsAQEEAwQwEQYP
+KwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4w
+CAYGZ4EMAQICMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBSOOi2L5LoOzpQGSjEMHoYo2cfS/zAfBgNVHSME
+GDAWgBQH1915iF9BccwW4dTH852yeLHdSDCBgAYDVR0RBHkwd4Ikc2hpYmJvbGV0
+aC1pZHAuYWRzLnVuaS1yZWdlbnNidXJnLmRlghdzaGliYm9sZXRoLWlkcC51bmkt
+ci5kZYIgc2hpYmJvbGV0aC1pZHAudW5pLXJlZ2Vuc2J1cmcuZGWCFHNoaWJib2xl
+dGgtaWRwLnVyLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBj
+YS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+
+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
+L2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUFBzABhido
+dHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1yZWdlbnNidXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQsFAAOCAQEACrNp0LBp5RdEQ1kmAaxnY2ar+qhNbbD2b+qrSO47
+wgQJZzeKtO12SzMUNIJT/s2C4DN9Irc7YLrRX/pxneQ2Q4g8WhZb2qed3KdrQ5Om
+IJ3yaR8BMHUpeDQL5apE4jU18oKhlfFfaFcSajxad23L4HaFeQGbEtgpvAfhYeee
+m+fqaz3DlgdHL0vWjipIzOzODRo9R0t6OWnSFv5Yec6b4dZg3iSkf+pQavM7jGAi
+DX4hNvuSdqAQoshPOGkne5JWS+LZI7JffpNn+mWxdPb51iMUKTctcR/LGRPqQi5L
+p+8JChZ2pTZka2I2LRNae9c55NrpAChzn1jXzXtjCS8T5w==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-regensburg.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/shibboleth.cant-col.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..abef3425
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cant-col.ac.uk/idp/shibboleth">
+ <!--
+ This is a "test" Shibboleth IdP for Canterbury 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="2016-04-04T14:23:04Z">
+ <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>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:Logo height="274" width="88">https://shibboleth.cant-col.ac.uk/canterbury-college-logo.png</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://shibboleth.cant-col.ac.uk/canterbury-college-logo-icon.png</mdui:Logo>
+ <mdui:Logo height="80" width="60">https://shibboleth.cant-col.ac.uk/canterbury-college-logo-cds.png</mdui:Logo>
+ <mdui:DisplayName xml:lang="en">Canterbury College (test)</mdui:DisplayName>
+ </mdui:UIInfo>
+ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID3jCCAsYCCQD4z6zira6C7TANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+ VUsxDTALBgNVBAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoM
+ EkNhbnRlcmJ1cnkgQ29sbGVnZTEaMBgGA1UECwwRQ29tcHV0aW5nIFN1cHBvcnQx
+ IjAgBgNVBAMMGXNoaWJib2xldGguY2FudC1jb2wuYWMudWsxIDAeBgkqhkiG9w0B
+ CQEWEW5zQGNhbnQtY29sLmFjLnVrMB4XDTE2MDMyNDEwMDc0MloXDTIxMDMyMzEw
+ MDc0MlowgbAxCzAJBgNVBAYTAlVLMQ0wCwYDVQQIDARLZW50MRMwEQYDVQQHDApD
+ YW50ZXJidXJ5MRswGQYDVQQKDBJDYW50ZXJidXJ5IENvbGxlZ2UxGjAYBgNVBAsM
+ EUNvbXB1dGluZyBTdXBwb3J0MSIwIAYDVQQDDBlzaGliYm9sZXRoLmNhbnQtY29s
+ LmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFuc0BjYW50LWNvbC5hYy51azCCASIwDQYJ
+ KoZIhvcNAQEBBQADggEPADCCAQoCggEBANL1WfdbMgBzfEOxwHeSK+MDNURlQWyV
+ aNSsn1KqEd13v+Ja/YwUyM0htgC95qFrRD2X2J6Vx1I8qTHJgyTr8nCz9iImV1uG
+ emG/skA2IKmkMVyfCX5DxQcmmiShm1b+cNW1fuJSxexUpUlHysJDMUeZnKIHUpug
+ qCabMwY7KmSMmcvT4+tn86Hh2xi2fDK/9stbiNo+5CAC8LA7FDQeQDiQaQyBmF6o
+ A5cSOq7/WA2lb+r/7LTznxWf3E4wCEQW3oaShETf9wJjC/wd0gFoyWKRz101xqW5
+ MqC8PgS4zcOkQuEIFTGPyAwnNYxKr67pqxsJIo+Ynq5TOUm4JHQJ6LcCAwEAATAN
+ BgkqhkiG9w0BAQUFAAOCAQEALKs+qNF+Z35LBada4feOxHMLiGq3qBLh4ULKzPrt
+ D5u4Xp1+4PGHWGkq5umdasnHcDH77T0jzFRCg3dGp6ZLF67SJjtPBC2Fg6n3QtGM
+ AvKTJHXQ4YOljSjVyXFtJjCJ4BLLBvld1WPWnJcI6d+hOM2AoWTGGIcZULxZjkk3
+ Vnfieg8hEskAqp9Ausr7zqgibczT83qM/JPTJmE4HygbhlE7AC8G3plV1Xx4Zdmq
+ U2lDsbpM9CoKDz+VeQbwhx4sIgu04JezZDJrtLEVWaf8Yx/CS7HoMNHrpH3bh+/O
+ eOGSNd/fcIupfbOlmBneWAsTPWNhQqts16hoEnHbf5t+3A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cant-col.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://shibboleth.cant-col.ac.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cant-col.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">cant-col.ac.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID3jCCAsYCCQD4z6zira6C7TANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+ VUsxDTALBgNVBAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoM
+ EkNhbnRlcmJ1cnkgQ29sbGVnZTEaMBgGA1UECwwRQ29tcHV0aW5nIFN1cHBvcnQx
+ IjAgBgNVBAMMGXNoaWJib2xldGguY2FudC1jb2wuYWMudWsxIDAeBgkqhkiG9w0B
+ CQEWEW5zQGNhbnQtY29sLmFjLnVrMB4XDTE2MDMyNDEwMDc0MloXDTIxMDMyMzEw
+ MDc0MlowgbAxCzAJBgNVBAYTAlVLMQ0wCwYDVQQIDARLZW50MRMwEQYDVQQHDApD
+ YW50ZXJidXJ5MRswGQYDVQQKDBJDYW50ZXJidXJ5IENvbGxlZ2UxGjAYBgNVBAsM
+ EUNvbXB1dGluZyBTdXBwb3J0MSIwIAYDVQQDDBlzaGliYm9sZXRoLmNhbnQtY29s
+ LmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFuc0BjYW50LWNvbC5hYy51azCCASIwDQYJ
+ KoZIhvcNAQEBBQADggEPADCCAQoCggEBANL1WfdbMgBzfEOxwHeSK+MDNURlQWyV
+ aNSsn1KqEd13v+Ja/YwUyM0htgC95qFrRD2X2J6Vx1I8qTHJgyTr8nCz9iImV1uG
+ emG/skA2IKmkMVyfCX5DxQcmmiShm1b+cNW1fuJSxexUpUlHysJDMUeZnKIHUpug
+ qCabMwY7KmSMmcvT4+tn86Hh2xi2fDK/9stbiNo+5CAC8LA7FDQeQDiQaQyBmF6o
+ A5cSOq7/WA2lb+r/7LTznxWf3E4wCEQW3oaShETf9wJjC/wd0gFoyWKRz101xqW5
+ MqC8PgS4zcOkQuEIFTGPyAwnNYxKr67pqxsJIo+Ynq5TOUm4JHQJ6LcCAwEAATAN
+ BgkqhkiG9w0BAQUFAAOCAQEALKs+qNF+Z35LBada4feOxHMLiGq3qBLh4ULKzPrt
+ D5u4Xp1+4PGHWGkq5umdasnHcDH77T0jzFRCg3dGp6ZLF67SJjtPBC2Fg6n3QtGM
+ AvKTJHXQ4YOljSjVyXFtJjCJ4BLLBvld1WPWnJcI6d+hOM2AoWTGGIcZULxZjkk3
+ Vnfieg8hEskAqp9Ausr7zqgibczT83qM/JPTJmE4HygbhlE7AC8G3plV1Xx4Zdmq
+ U2lDsbpM9CoKDz+VeQbwhx4sIgu04JezZDJrtLEVWaf8Yx/CS7HoMNHrpH3bh+/O
+ eOGSNd/fcIupfbOlmBneWAsTPWNhQqts16hoEnHbf5t+3A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cant-col.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">Canterbury College</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Canterbury College (test)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.cant-col.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Nathan</GivenName>
+ <SurName>Friend</SurName>
+ <EmailAddress>mailto:n.friend@canterburycollege.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Nathan</GivenName>
+ <SurName>Friend</SurName>
+ <EmailAddress>mailto:n.friend@canterburycollege.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml
deleted file mode 100644
index fb25dc38..00000000
--- a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-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://shibboleth.crous-poitiers.fr/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-22T15:55:18Z">
- <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">crous-poitiers.fr</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">CROUS Poitiers - Etudiants</mdui:DisplayName>
- <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoyOSswMjowMOxH66YAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MjkrMDI6MDCdGlMaAAAAAElFTkSuQmCC</mdui:Logo>
- <mdui:InformationURL xml:lang="fr">http://www.ac-poitiers.fr</mdui:InformationURL>
- <mdui:DisplayName xml:lang="fr">CROUS Poitiers - Etudiants</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>
- MIIDWzCCAkOgAwIBAgIUMWKZ8/6tKA7kwdsn4f4/cqyDED0wDQYJKoZIhvcNAQEF
-BQAwJzElMCMGA1UEAxMcc2hpYmJvbGV0aC5jcm91cy1wb2l0aWVycy5mcjAeFw0x
-MDA2MTAxMzMyNTNaFw0zMDA2MTAxMzMyNTNaMCcxJTAjBgNVBAMTHHNoaWJib2xl
-dGguY3JvdXMtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCax6s86p49Xf1m/noYZtAqbN3LTSLj2rpuCe9jcMM9Gpf4X6p0btKZtWVq
-PMyJ+1oytarshKxBGV7m1U3MkZu88/Bn1OykynsaPPFYCraOWIawJRFJL2t45/By
-K7LVjmahS2JJj5qfVNuFNL4MsrfNieEZjZHdE/B9FZR4ME5sxwH44WvHEOnmumO7
-l6GY8pHrWp8e0HDXf8Y1gn3dj4u0tNs5GBDVygqXgPKsSRi8IHAHKxbNuWx+PDWZ
-m25S2ouiGO27vkIYYPWvFjyxNqe0KFVD6yVYVoWdHFM7rskYJqE+iinmLpgE+tZX
-Q2oMnhEZlFeUiSzKq21Pi07JAwfHAgMBAAGjfzB9MFwGA1UdEQRVMFOCHHNoaWJi
-b2xldGguY3JvdXMtcG9pdGllcnMuZnKGM2h0dHBzOi8vc2hpYmJvbGV0aC5jcm91
-cy1wb2l0aWVycy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhXma4CxtS0tm
-sfkbl1uusiIUhq8wDQYJKoZIhvcNAQEFBQADggEBAGzVwbgJ/j2DYjRc8NR7NnDG
-1FAueaBwSVOPe/zawt1M/nNhyHeIAXzsMaLLTptJmXSI1NYH8Zf0ZePlTj34W+iM
-MMYtACZXOqn9MROynG9sUKwh3qTe+yrskUoemApa/WndPY3mlEmoee5v7mJnD70Q
-asxkqS76pkUhyQAUBIZs2XwAdKamI/Fo3kfiOI/3GAFjQObwwnsg9fQLGq/jO8gK
-n44H8PXS4Vf4LLnN8kOUlNvmDD0us5c73Gli/rg/cKTptN1l+TbZ97qBqjTofxPa
-uPReZV8LGAFTW7W5OYm6HcXR3TA/vVBHjBqTmNFZ7/8t8dmgZ5uNGJNLsSgBhg8=
- </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://shibboleth.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
- </md:IDPSSODescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">CROUS Poitiers - Etudiants</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">CROUS Poitiers - Etudiants</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ac-poitiers.fr</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>crous.informatique@crous-poitiers.fr</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
index 276a2853..c755e49f 100644
--- a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
@@ -52,11 +52,6 @@ xFPbgi4ddFYuZxVpoGMVPYqWfmqX3PXTKVvkqyLns9Fs/wfXI7NBuxxnFPFZS1Y4
<md:OrganizationURL xml:lang="en">http://www.insa-cvl.fr</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Christophe DEROUET</md:SurName>
- <md:EmailAddress>christophe.derouet@insa-cvl.fr</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:SurName>Sylvain LESAGE</md:SurName>
- <md:EmailAddress>sylvain.lesage@insa-cvl.fr</md:EmailAddress>
+ <md:EmailAddress>service-info@listes.insa-cvl.fr</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
deleted file mode 100644
index 8c6de095..00000000
--- a/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.medvik.cz/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-16T11:08:52Z">
- <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: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="true">medvik.cz</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">National Medical Library, Prague - Medvik</mdui:DisplayName>
- <mdui:DisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for users of Medvik system.</mdui:Description>
- <mdui:Description xml:lang="cs">Identity Provider pro uživatele systému Medvik.</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.nlk.cz/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="cs">http://www.nlk.cz/</mdui:InformationURL>
- <mdui:Logo height="75" width="108">https://www.medvik.cz/images/medvik-logo.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>
-
-MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
-NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
-aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
-OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
-cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
-Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
-PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
-1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
-WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
-BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
-ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
-9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
-FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
-Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
-IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
-0WzVDPkawhmccTbRUyqTcQ==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/SLO"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.medvik.cz/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.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="true">medvik.cz</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-
-MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
-NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
-aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
-OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
-cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
-Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
-PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
-1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
-WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
-BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
-ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
-9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
-FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
-Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
-IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
-0WzVDPkawhmccTbRUyqTcQ==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/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">National Medical Library</md:OrganizationName>
- <md:OrganizationName xml:lang="cs">Národní lékařská knihovna</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">National Medical Library, Prague - Medvik</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.nlk.cz/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="cs">http://www.nlk.cz/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Filip</md:GivenName>
- <md:SurName>Kriz</md:SurName>
- <md:EmailAddress>medvik@nlk.cz</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
deleted file mode 100644
index ae4c9509..00000000
--- a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?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.reitoria.unesp.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">unesp.br</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">UNESP - Univ Estadual Paulista</mdui:DisplayName>
- <mdui:DisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</mdui:DisplayName>
- <mdui:Description xml:lang="en">UNESP - Univ Estadual Paulista</mdui:Description>
- <mdui:Description xml:lang="pt-br">UNESP - Univ Estadual Paulista</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.unesp.br/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="pt-br">http://www.unesp.br/</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQx
-MjAxMjAzOTQ3WhcNMTkxMTMwMjAzOTQ3WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2
-bIvFwo6pJnzMsR0+Pl3pZbuxGur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYU
-uPMnu8Kwn/DtUeNGvSLgQ+k3Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8de
-HpH7fsL/m9ONsUNtoVrmabHAAR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwp
-VpDg+yyCdoBfu/AANYqu2a6gahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjn
-E9/Wam33SID6yKXYA5EIoS9HkgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAKrx3a2Gx+/r3DpVp56AsqZx8lm92UVSSWBe2Hxfa
-jCEz9C1zxRQK2y1W9QC9t1XrCBG+6H18pqikLUWKGe+lHminNX2zZp6JNtMl4k6m
-WZTifmyvycjY/ZfeVcREIlonkRB2XAAnSdC3ZGCv/qarQEpn3tvsc9FthlDcpv/q
-bjo2re/YAP8PVnYBlLiTBGioRSaNN83HLM81sgrJnNM3rohFrgD1DWGzyj/M7u1Y
-/oUNFeEG1kFkbG2kXLPg+ylOKuUKOaa56gsXv8KFbcMQdIFkQ6od/YWPh2M+V8a7
-KFxMONImVUlFWJZRk3i46kBydqoZoCzP7nOBK6XCQ2WSPg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.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.reitoria.unesp.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.reitoria.unesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.reitoria.unesp.br/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.reitoria.unesp.br/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.reitoria.unesp.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">unesp.br</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-
-MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQx
-MjAxMjAzOTQ3WhcNMTkxMTMwMjAzOTQ3WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2
-bIvFwo6pJnzMsR0+Pl3pZbuxGur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYU
-uPMnu8Kwn/DtUeNGvSLgQ+k3Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8de
-HpH7fsL/m9ONsUNtoVrmabHAAR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwp
-VpDg+yyCdoBfu/AANYqu2a6gahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjn
-E9/Wam33SID6yKXYA5EIoS9HkgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAKrx3a2Gx+/r3DpVp56AsqZx8lm92UVSSWBe2Hxfa
-jCEz9C1zxRQK2y1W9QC9t1XrCBG+6H18pqikLUWKGe+lHminNX2zZp6JNtMl4k6m
-WZTifmyvycjY/ZfeVcREIlonkRB2XAAnSdC3ZGCv/qarQEpn3tvsc9FthlDcpv/q
-bjo2re/YAP8PVnYBlLiTBGioRSaNN83HLM81sgrJnNM3rohFrgD1DWGzyj/M7u1Y
-/oUNFeEG1kFkbG2kXLPg+ylOKuUKOaa56gsXv8KFbcMQdIFkQ6od/YWPh2M+V8a7
-KFxMONImVUlFWJZRk3i46kBydqoZoCzP7nOBK6XCQ2WSPg==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.reitoria.unesp.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">UNESP - Univ Estadual Paulista</md:OrganizationName>
- <md:OrganizationName xml:lang="pt-br">UNESP - Univ Estadual Paulista</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">UNESP - Univ Estadual Paulista</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.unesp.br/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="pt-br">http://www.unesp.br/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Carlos Coletti</md:SurName>
- <md:EmailAddress>grc@unesp.br</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
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
deleted file mode 100644
index cb97e1d8..00000000
--- a/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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://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>
- </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">ivv.cnr.it</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">CNR IPSP</mdui:DisplayName>
- <mdui:DisplayName xml:lang="it">CNR IPSP</mdui:DisplayName>
- <mdui:Description xml:lang="en">Identity Provider for CNR IPSP Turin users</mdui:Description>
- <mdui:Description xml:lang="it">Identity Provider per gli utenti di Torino del CNR IPSP</mdui:Description>
- <mdui:InformationURL xml:lang="en">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
- <mdui:InformationURL xml:lang="it">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="it">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIElDCCA3ygAwIBAgIQbmgQNrDfCy1Vf7XBczhplTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbjELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGjAYBgNVBAMTEXNoaWJpZHAudG8u
-Y25yLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVcNLT6xsJ8G
-dRHnHyBTfHOfe4OfgM4TylvG19un1euBULZEN5tDbbAZssX/on1N0LOhdcfhmi1x
-fVUQiyVf9Sbd8WicMuCHBfMRTylyPmyMS2Z398G8Vwy33o75Z8G3F6bXXKlLA0/J
-uLVFnNURX9lr4nfA8/309lRKoKVwAeSfHnMnrPbfChGN8mXxpCQygG/759ji+plk
-5DVvFhvPR/x1xVuYbrdAv/NbU1oBI4fVMzezwZkBxcZTBCewxgXVRR3/XZvQBPAL
-iICbJ6JHman13XLmUarrzmYzlK+eMHqkhksR4pU80IhuMd9ImFh9NAOvpl84BvcN
-/kTnRRvsSwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFFOg1tTJhlKw+kdxyVXznQztzUaSMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
-dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
-BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
-bmEub3JnMBwGA1UdEQQVMBOCEXNoaWJpZHAudG8uY25yLml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAn2QUgPIrMj5axwXQZ3DRdYICGToeZDt7OQTefoL38/lXx+msooHrH
-nCahg5fLkpxYx3eFLw/gfNcOoiXKe44oq6/lygg4ZoIKk81stcnxO0zm0w5P70ZN
-XEGKqcxD/uOM+VAVSFhHt4X2uZBBi5xeSQuOm4zG5rWzLz+KobBj9fcgrYn4AasW
-cITaZl/8c52MqyPOkBO1JSJce0RIGLVtQqgpCS5m+u1FtaxA/A5FxDBMW1HxodnP
-HvlG8PNgeM6dbExE/Kli1DjCbpmDaDpeRB/F3jemASDp0ZkFYf8HTU++WWB0tZdk
-MfjrxHcURjQu4WndL3iDdR1DMImDHyBu
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.to.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://shibidp.to.cnr.it/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.to.cnr.it/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.to.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.to.cnr.it/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">ivv.cnr.it</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIElDCCA3ygAwIBAgIQbmgQNrDfCy1Vf7XBczhplTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbjELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGjAYBgNVBAMTEXNoaWJpZHAudG8u
-Y25yLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVcNLT6xsJ8G
-dRHnHyBTfHOfe4OfgM4TylvG19un1euBULZEN5tDbbAZssX/on1N0LOhdcfhmi1x
-fVUQiyVf9Sbd8WicMuCHBfMRTylyPmyMS2Z398G8Vwy33o75Z8G3F6bXXKlLA0/J
-uLVFnNURX9lr4nfA8/309lRKoKVwAeSfHnMnrPbfChGN8mXxpCQygG/759ji+plk
-5DVvFhvPR/x1xVuYbrdAv/NbU1oBI4fVMzezwZkBxcZTBCewxgXVRR3/XZvQBPAL
-iICbJ6JHman13XLmUarrzmYzlK+eMHqkhksR4pU80IhuMd9ImFh9NAOvpl84BvcN
-/kTnRRvsSwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFFOg1tTJhlKw+kdxyVXznQztzUaSMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
-dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
-BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
-bmEub3JnMBwGA1UdEQQVMBOCEXNoaWJpZHAudG8uY25yLml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAn2QUgPIrMj5axwXQZ3DRdYICGToeZDt7OQTefoL38/lXx+msooHrH
-nCahg5fLkpxYx3eFLw/gfNcOoiXKe44oq6/lygg4ZoIKk81stcnxO0zm0w5P70ZN
-XEGKqcxD/uOM+VAVSFhHt4X2uZBBi5xeSQuOm4zG5rWzLz+KobBj9fcgrYn4AasW
-cITaZl/8c52MqyPOkBO1JSJce0RIGLVtQqgpCS5m+u1FtaxA/A5FxDBMW1HxodnP
-HvlG8PNgeM6dbExE/Kli1DjCbpmDaDpeRB/F3jemASDp0ZkFYf8HTU++WWB0tZdk
-MfjrxHcURjQu4WndL3iDdR1DMImDHyBu
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.to.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 IPSP</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">CNR IPSP</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="it">http://www.ipsp.cnr.it/</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.ipsp.cnr.it/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:SurName>Giancarlo Birello</md:SurName>
- <md:EmailAddress>mailto:giancarlo.birello@ircres.cnr.it</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:EmailAddress>mailto:supporto@to.cnr.it</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml b/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml
deleted file mode 100644
index fdfdc884..00000000
--- a/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibsp.test.openathens.net/shibboleth">
- <!--
- This is a Test Shibboleth SP for Eduserv.
- -->
- <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="2012-10-19T09:15:34Z"/>
- </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://shibsp.test.openathens.net/Shibboleth.sso/Login"/>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAIk7Iq11rRt9MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
- BAMTGnNoaWJzcC50ZXN0Lm9wZW5hdGhlbnMubmV0MB4XDTEyMTAxNzE0NDA0NFoX
- DTIyMTAxNTE0NDA0NFowJTEjMCEGA1UEAxMac2hpYnNwLnRlc3Qub3BlbmF0aGVu
- cy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWGWHhxgjISM46
- 9b3A8gkGUa2ylMd+Ubx/41jPo8a9F0edLOfcJRrJz3yXz4fyqkfO7kINyQzN3mv3
- CsLOu3SfYfS+oPlQV0UjRrwCJooGZgSYRCl1XzSesRUWUw6S42kc39z10KEKfC4o
- 8o3yvsef+OAMB6GpvY3JeiqzN8iSKZFRwr9hAA670YVs3PaGJtKcsGTIidX6PbXl
- s7P9z6mnysxOLMVaPOFmo0poCLgEAmAg/8nIYd19sHJbT4Zp0rhLG31Re4P9b8IU
- 3YEUsNFlSQ7/9n69rYlthriKBq+Lu8dPfG8oHrBKmqmeDYAdHla5J00lCEJX6pjP
- +F4a7x7rAgMBAAGjSDBGMCUGA1UdEQQeMByCGnNoaWJzcC50ZXN0Lm9wZW5hdGhl
- bnMubmV0MB0GA1UdDgQWBBSNL+bmIEoGpOitytkAJWqzqQVexzANBgkqhkiG9w0B
- AQUFAAOCAQEAh6YPN9WA+ie41e+xTwepOMsupMgdJAvO3Pj2GqTRV7ub8oYHsNPz
- e4hnUgy3PgWZUprg2Xu0dR80UaCt76RZktkywhE5Ese6gRzCnw5naeq+BohzZYhT
- 3aQqYN/3seBxz7q2ykidNM/FAuK0wzoS4kekkValdz58KNlqM5dFWyahc8nHN+3Q
- PbHhdrEP/5L39XmhM1jCI3DUOL0FupAeosuYPOSfA7eTha7pPKc4hbdPrBWDumBz
- 49zWCVrzQN0i1CSS9gy9YBiqjnns9/ziNp6qb1VX2BIJ9Po6llnGAYOR6DLLgcYQ
- 3+F3/x57N94upwLaCaoj+04/l3acLW3ylQ==
- </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://shibsp.test.openathens.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/Artifact"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML/Artifact" index="6"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv Test Shibboleth SP</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
index 92d123bb..19213382 100644
--- a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -7,9 +7,9 @@
</mdrpi:RegistrationInfo>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
<saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
<saml:AttributeValue>http://clarin.eu/category/clarin-member</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/sp.edina.ac.uk-shibboleth-agcensus.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
index 0b38d21e..ce2b2011 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Agcensus</mdui:DisplayName>
<mdui:Description xml:lang="en">Grid square agricultural census data for England, Scotland and Wales</mdui:Description>
- <mdui:Logo height="161" width="350">https://vsp2.edina.ac.uk/public/images/splogos/agcensus.png</mdui:Logo>
+ <mdui:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/agcensus.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
index 44731f18..ab3c7aaa 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
@@ -14,7 +14,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://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/UKDA"/>
<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://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/EDINASchools"/>
<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://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKFederation"/>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKall"/>
+ <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://auth.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKall"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Digimap for Colleges</mdui:DisplayName>
<mdui:Description xml:lang="en">EDINA Digimap for Colleges</mdui:Description>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
index 459cf0d0..cc8cd9e2 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
@@ -16,7 +16,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">EDINA M2M Authentication</mdui:DisplayName>
<mdui:Description xml:lang="en">EDINA M2M Authentication</mdui:Description>
- <mdui:Logo height="65" width="150">https://vsp2.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
+ <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
index 66955fb4..4143334b 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">JISC MediaHub</mdui:DisplayName>
<mdui:Description xml:lang="en">The definitive academic video, image &amp; audio resource</mdui:Description>
- <mdui:Logo height="84" width="350">https://vsp2.edina.ac.uk/public/images/splogos/mediahub.png</mdui:Logo>
+ <mdui:Logo height="84" width="350">https://auth.edina.ac.uk/public/images/splogos/mediahub.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
index 71a3c272..62d28ff8 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
@@ -16,7 +16,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">SafeNet</mdui:DisplayName>
<mdui:Description xml:lang="en">SafeNet</mdui:Description>
- <mdui:Logo height="65" width="150">https://vsp2.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
+ <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
index 8768ef58..8ad7ae10 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">UKBORDERS</mdui:DisplayName>
<mdui:Description xml:lang="en">Boundary datasets and geographic look up tables of the United Kingdom</mdui:Description>
- <mdui:Logo height="161" width="350">https://vsp2.edina.ac.uk/public/images/splogos/ukborders.png</mdui:Logo>
+ <mdui:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/ukborders.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
index 3547693a..f4069146 100644
--- a/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">GeoDoc</mdui:DisplayName>
<mdui:Description xml:lang="en">A metadata creation and management tool</mdui:Description>
- <mdui:Logo height="100" width="350">https://vsp2.edina.ac.uk/public/images/splogos/gogeo.png</mdui:Logo>
+ <mdui:Logo height="100" width="350">https://auth.edina.ac.uk/public/images/splogos/gogeo.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml b/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
index 85b7a5a0..8c70b7d5 100644
--- a/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
+++ b/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
@@ -4,6 +4,11 @@
<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
<mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
@@ -11,11 +16,11 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="fi">Kielipankki</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Kielipankki (The Language Bank of Finland)</mdui:DisplayName>
- <mdui:Description xml:lang="en">Web portal of the Language Bank of Finland</mdui:Description>
<mdui:Description xml:lang="fi">Kielipankin portaali</mdui:Description>
- <mdui:Logo height="80" width="170">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logo_RGB_2000dpi.png</mdui:Logo>
- <mdui:Keywords xml:lang="fi">Kielipankki, portaali, keskustelufoorumi</mdui:Keywords>
+ <mdui:Description xml:lang="en">Web portal of the Language Bank of Finland</mdui:Description>
+ <mdui:Logo height="58" width="300">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logotxt_SU_EN.png</mdui:Logo>
<mdui:Keywords xml:lang="en">Language Bank, Portal, discussion forum</mdui:Keywords>
+ <mdui:Keywords xml:lang="fi">Kielipankki, portaali, keskustelufoorumi</mdui:Keywords>
<mdui:PrivacyStatementURL xml:lang="en">https://www.kielipankki.fi/privacy-policy/</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="fi">https://www.kielipankki.fi/tietosuojaseloste/</mdui:PrivacyStatementURL>
</mdui:UIInfo>
@@ -68,11 +73,12 @@ ukUJvoKA4qzHcF2rQn4=</ds:X509Certificate>
<md:ServiceName xml:lang="en">Kielipankki (The Language Bank of Finland)</md:ServiceName>
<md:ServiceDescription xml:lang="fi">Kielipankin portaali</md:ServiceDescription>
<md:ServiceDescription xml:lang="en">Web portal of 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"/>
- <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"/>
- <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:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" 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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
diff --git a/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
index a50f04b9..3fb784c1 100644
--- a/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
@@ -56,38 +56,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEZzCCA0+gAwIBAgIQSm2nqIqiox26I11iklHlFzANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxNTAwMDAwMFoXDTE2MDQxNDIzNTk1OVowOzEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1zcDIua2NjLmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkTipNhRClDjUbpHw
- ZAdd9ZrG0E9GnQF5oL2CgZJceS2V7zv34sMVnCzkxwqlpVR5z0HxSutQK+Rxy9XY
- 7/6HXsZA6OdzVc492YYTUHpJt1CSK9xbUYdbGe5c6fnJHEiIVjwZPukWbUH0Yz7n
- VxLzq2GXvvwzwTQOjM+Y7eb5A1C6JURbo2EGgYO0LjA2QBwJV2EbTGYW7qE5iTo2
- ajiEGbDBqWBrgmCYyz2zNCaMeD6DQTswELji1HKMk19mwIJpH0JQzmrn5O2aTCU/
- 3Oe0b8fB/HWak5Vg51kJLA2qxYQQmaH7KzjGkqYXV6irw631wKsee07E7ic4gioA
- ox1CuwIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
- ue0wHQYDVR0OBBYEFM+h8xC5KMRvvlwFtYPzQvRPekYbMA4GA1UdDwEB/wQEAwIF
- oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
- BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
- LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
- BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
- YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
- Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1zcDIua2NjLmFjLnVrMA0GCSqGSIb3
- DQEBBQUAA4IBAQB/KYLbwlBTr9Y5wz+L9aTbVCAbpGaEut5pUcX1FFnn8ZWyomvJ
- Px4W55mC3W+XKjC6eH/tto15qaeRuJBstE+IqpFpJrgFRgjyAbdL6ytY03nA/ZnN
- 700/ZxxrYrAkRxNll3hsxupLg4mgPvi7VFFS15ogEKdlAdwzpxjFF5SzJ1s5NMbl
- WNXBd/U8BYJREwDCEu9uV1OQU0IHx/7OVLgI6yH0Y4wElPPFvOXA4bPzZDr/lVLA
- RZF/i3C90xcqJ/54WaYuFnU8EZDbYExPuqv6OvL53F215iCRecxWEfjYaz7D3amu
- zWWeRb5g3nssaRQeVqEG3zg0tUq0GYtUj82l
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -147,38 +115,6 @@
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEZzCCA0+gAwIBAgIQSm2nqIqiox26I11iklHlFzANBgkqhkiG9w0BAQUFADA2
- MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
- U1NMIENBMB4XDTEzMDQxNTAwMDAwMFoXDTE2MDQxNDIzNTk1OVowOzEhMB8GA1UE
- CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1zcDIua2NjLmFj
- LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkTipNhRClDjUbpHw
- ZAdd9ZrG0E9GnQF5oL2CgZJceS2V7zv34sMVnCzkxwqlpVR5z0HxSutQK+Rxy9XY
- 7/6HXsZA6OdzVc492YYTUHpJt1CSK9xbUYdbGe5c6fnJHEiIVjwZPukWbUH0Yz7n
- VxLzq2GXvvwzwTQOjM+Y7eb5A1C6JURbo2EGgYO0LjA2QBwJV2EbTGYW7qE5iTo2
- ajiEGbDBqWBrgmCYyz2zNCaMeD6DQTswELji1HKMk19mwIJpH0JQzmrn5O2aTCU/
- 3Oe0b8fB/HWak5Vg51kJLA2qxYQQmaH7KzjGkqYXV6irw631wKsee07E7ic4gioA
- ox1CuwIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
- ue0wHQYDVR0OBBYEFM+h8xC5KMRvvlwFtYPzQvRPekYbMA4GA1UdDwEB/wQEAwIF
- oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
- BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
- LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
- BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
- YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
- Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1zcDIua2NjLmFjLnVrMA0GCSqGSIb3
- DQEBBQUAA4IBAQB/KYLbwlBTr9Y5wz+L9aTbVCAbpGaEut5pUcX1FFnn8ZWyomvJ
- Px4W55mC3W+XKjC6eH/tto15qaeRuJBstE+IqpFpJrgFRgjyAbdL6ytY03nA/ZnN
- 700/ZxxrYrAkRxNll3hsxupLg4mgPvi7VFFS15ogEKdlAdwzpxjFF5SzJ1s5NMbl
- WNXBd/U8BYJREwDCEu9uV1OQU0IHx/7OVLgI6yH0Y4wElPPFvOXA4bPzZDr/lVLA
- RZF/i3C90xcqJ/54WaYuFnU8EZDbYExPuqv6OvL53F215iCRecxWEfjYaz7D3amu
- zWWeRb5g3nssaRQeVqEG3zg0tUq0GYtUj82l
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -190,9 +126,9 @@
<OrganizationURL xml:lang="en">http://www.kcc.ac.uk/</OrganizationURL>
</Organization>
<ContactPerson contactType="support">
- <GivenName>Leslie-Ann</GivenName>
- <SurName>Campbell</SurName>
- <EmailAddress>mailto:l.campbell@kcc.ac.uk</EmailAddress>
+ <GivenName>Tony</GivenName>
+ <SurName>Jack</SurName>
+ <EmailAddress>mailto:t.jack@kcc.ac.uk</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<GivenName>Richard</GivenName>
diff --git a/swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..c4531c53
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.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.bl.uk/idp/shibboleth">
+ <!--
+ This is a Shibboleth IdP for The British Library.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-08T10:16:08Z">
+ <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">bl.uk</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">British Library</mdui:DisplayName>
+ <mdui:Logo height="100" width="52">https://www.bl.uk/britishlibrary/resources/global/images/bl_logo_100.gif</mdui:Logo>
+ <mdui:Logo height="16" width="16">https://www.bl.uk/britishlibrary/resources/global/images/favicon.ico</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDEDCCAfigAwIBAgIVALBlb0xD9RVnJc/iRBgGkyuuv6vzMA0GCSqGSIb3DQEB
+ BQUAMBQxEjAQBgNVBAMMCXNzby5ibC51azAeFw0xNTExMjUxNjA4MDZaFw0zNTEx
+ MjUxNjA4MDZaMBQxEjAQBgNVBAMMCXNzby5ibC51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBALV1sBlNUZVsWVfQI38jlRlndRGuKVJkbKv0LAXkuCRW
+ 1yVfVzC481huMNTDX+3CYb1lkM9IpA3EQnK0PFB79ADvtlQuTAeLZnbHnSuNXtoO
+ Uw3klvdKWjUjB4QC6FI8XS9oYiBwnogW8IH8O40CAAJLgbFuyqeLkFGS4BBk5hKf
+ 3Q42eq2So0K4piamfZbMlhdwB1Eovd5YyAN8qISTiDKlEd+BL8ZnB2dvHliSf7BV
+ SP9nxptQ9ncooTErBJhycTQhIB7OlBXPPD9/emJqlVm8njxGHCqufYI6oHSQdg2Z
+ /+4lx2cRrpDKr7ROb/5W9gZBCXYDlUQhHYl2GOa7MRUCAwEAAaNZMFcwHQYDVR0O
+ BBYEFIHLjm+wCv758W1MN5NooNkCbsM3MDYGA1UdEQQvMC2CCXNzby5ibC51a4Yg
+ aHR0cHM6Ly9zc28uYmwudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQAD
+ ggEBAAdklLJrCnZ7a42MWalgiF3Jxch554vKu672us0vIbC4YHOFg3znXGFMQN6s
+ XgfQfwGZvvNvzf2SGvH8p20jjcn/WVKnTNtAUgRT/KQHnAktoASFoLHNY/x+HsWT
+ /wHJw9Sr+eEFPet9lYN9JJu0U8sSC1NKf+kjRcJG7K/6kABscqRVTOJ8fVZzKoz/
+ wUBZw8uhw9U8kad0nyga7JCTMMqX5RvveFIAtnkK77XpJ1vm95VE1Udh03uXUvtN
+ j4nMh5rBX6K6S1rOl7AkRyUW+Nv7ayWjWiU+ASMxnOeo7nfg1xHKLLTf4dUB23ot
+ onq0e4aCSYwqgr4fh8WX2L9+Ncc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bl.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bl.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bl.uk/idp/profile/SAML2/Redirect/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bl.uk/idp/profile/SAML2/POST/SLO"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bl.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://sso.bl.uk/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bl.uk/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.bl.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bl.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">bl.uk</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIDEDCCAfigAwIBAgIVALBlb0xD9RVnJc/iRBgGkyuuv6vzMA0GCSqGSIb3DQEB
+ BQUAMBQxEjAQBgNVBAMMCXNzby5ibC51azAeFw0xNTExMjUxNjA4MDZaFw0zNTEx
+ MjUxNjA4MDZaMBQxEjAQBgNVBAMMCXNzby5ibC51azCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBALV1sBlNUZVsWVfQI38jlRlndRGuKVJkbKv0LAXkuCRW
+ 1yVfVzC481huMNTDX+3CYb1lkM9IpA3EQnK0PFB79ADvtlQuTAeLZnbHnSuNXtoO
+ Uw3klvdKWjUjB4QC6FI8XS9oYiBwnogW8IH8O40CAAJLgbFuyqeLkFGS4BBk5hKf
+ 3Q42eq2So0K4piamfZbMlhdwB1Eovd5YyAN8qISTiDKlEd+BL8ZnB2dvHliSf7BV
+ SP9nxptQ9ncooTErBJhycTQhIB7OlBXPPD9/emJqlVm8njxGHCqufYI6oHSQdg2Z
+ /+4lx2cRrpDKr7ROb/5W9gZBCXYDlUQhHYl2GOa7MRUCAwEAAaNZMFcwHQYDVR0O
+ BBYEFIHLjm+wCv758W1MN5NooNkCbsM3MDYGA1UdEQQvMC2CCXNzby5ibC51a4Yg
+ aHR0cHM6Ly9zc28uYmwudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQAD
+ ggEBAAdklLJrCnZ7a42MWalgiF3Jxch554vKu672us0vIbC4YHOFg3znXGFMQN6s
+ XgfQfwGZvvNvzf2SGvH8p20jjcn/WVKnTNtAUgRT/KQHnAktoASFoLHNY/x+HsWT
+ /wHJw9Sr+eEFPet9lYN9JJu0U8sSC1NKf+kjRcJG7K/6kABscqRVTOJ8fVZzKoz/
+ wUBZw8uhw9U8kad0nyga7JCTMMqX5RvveFIAtnkK77XpJ1vm95VE1Udh03uXUvtN
+ j4nMh5rBX6K6S1rOl7AkRyUW+Nv7ayWjWiU+ASMxnOeo7nfg1xHKLLTf4dUB23ot
+ onq0e4aCSYwqgr4fh8WX2L9+Ncc=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bl.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bl.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">The British Library</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">British Library</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.bl.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Janice</GivenName>
+ <SurName>Mulholand</SurName>
+ <EmailAddress>mailto:janice.mulholland@bl.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>Guy</GivenName>
+ <SurName>Wicks</SurName>
+ <EmailAddress>mailto:Guy.Wicks@bl.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml
deleted file mode 100644
index 6de7f9ac..00000000
--- a/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.dshs-koeln.de/idp/shibboleth">
- <md:Extensions>
- <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-01T10:15:58Z">
- <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">dshs-koeln.de</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="de">Deutsche Sporthochschule Köln</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">German Sport University Cologne</mdui:DisplayName>
- <mdui:Description xml:lang="de">Die Deutsche Sporthochschule Köln, 1947 in Köln gegründet, vereint qualifizierte Lehre, internationale Forschung und Spitzensport auf höchstem Niveau. Sie ist Deutschlands einzige Universität, die sich ausschließlich dem Themenfeld Sport und Bewegung widmet. Während an anderen Universitäten die Sportwissenschaft neben vielen weiteren Fachgebieten besteht, findet man in Köln eine außergewöhnliche Situation vor: An 21 Instituten, vier An-Instituten und neun wissenschaftlichen Zentren wird das vielfältige und spannende Gebiet der Sportwissenschaft in allen seinen Facetten detailliert unter die Lupe genommen.</mdui:Description>
- <mdui:Description xml:lang="en">The University is recognized internationally for its research: the Faculty of Biochemistry’s renowned testing laboratory has been a part of the international fight against doping, experiments conducted at the Faculty of Physiology and Anatomy have soared with the astronauts into space, and the Research Centre for Performance Sport has brought together the combined efforts of multiple departments to coach and supervise elite athletes. The 21 faculties at the German Sport University Cologne – from education and humanities to social sciences and biomedicine – offer a diverse array of teaching and research opportunities to the university’s some 5,300 students from more than 60 countries. The campus, located directly across from the Muengersdorf Sport Park, provides students and staff alike a first-class environment for learning, working, and living.</mdui:Description>
- <mdui:Logo height="16" width="16">https://sso.dshs-koeln.de/logo_dshs_kl.png</mdui:Logo>
- <mdui:Logo height="66" width="65">https://sso.dshs-koeln.de/logo_dshs_gr.png</mdui:Logo>
- <mdui:InformationURL xml:lang="de">http://www.dshs-koeln.de/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">http://www.dshs-koeln.de/english/</mdui:InformationURL>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
-MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
-b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
-b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
-NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
-A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
-BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
-ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
-z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
-bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
-hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
-js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
-pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
-ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
-AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
-JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
-cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
-YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
-cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
-ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
-vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
-fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
-rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
-IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
-G6UwcO6gyha4+bma6xJXYLqJqPE=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/Redirect/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SLO"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML2/SOAP/SLO"/>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
- <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.dshs-koeln.de/idp/profile/Shibboleth/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-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">dshs-koeln.de</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
-MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
-b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
-b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
-NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
-A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
-BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
-ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
-z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
-bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
-hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
-js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
-pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
-ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
-AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
-JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
-cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
-YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
-cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
-ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
-vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
-fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
-rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
-IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
-G6UwcO6gyha4+bma6xJXYLqJqPE=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="de">e421</md:OrganizationName>
- <md:OrganizationName xml:lang="en">e421</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="de">Deutsche Sporthochschule Köln</md:OrganizationDisplayName>
- <md:OrganizationDisplayName xml:lang="en">German Sport University Cologne</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="de">http://www.dshs-koeln.de</md:OrganizationURL>
- <md:OrganizationURL xml:lang="en">http://www.dshs-koeln.de/english/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="support">
- <md:GivenName>Helpdesk</md:GivenName>
- <md:SurName>DSHS</md:SurName>
- <md:EmailAddress>mailto:support@dshs-koeln.de</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Silke</md:GivenName>
- <md:SurName>Knorr</md:SurName>
- <md:EmailAddress>mailto:s.knorr@dshs-koeln.de</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
index 99a527cd..97724e30 100644
--- a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
@@ -15,8 +15,8 @@
<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utu.fi</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
index d54176c5..82b85619 100644
--- a/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
@@ -48,8 +48,6 @@
<md:OrganizationURL xml:lang="en">http://www.dtu.dk/english</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:EmailAddress>tato@dtu.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml b/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml
new file mode 100644
index 00000000..060731c3
--- /dev/null
+++ b/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sts.windows.net/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-20T10:07:00Z">
+ <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">montpellier-bs.com</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Montpellier Business School</mdui:DisplayName>
+ <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABQklEQVQoz+2NS07CYBhF7/+opUBboISHAiZKQlyAiQtw7shVuAQX4TZ0D04cuQITElAMUB+8SmnLo6X9nOjQBOee4ck9uUw7v85qqTjacinmC3+7WgFMSe9dXV4UTTOO45gQJ+AMCUFwyNNmIaXI4cQXnNUK+Wbl0J563c/IMvQwisKYWRnsm/TusrKejH0m61ZG2xMlQw2CTbmYPakVnvpj4nHLipxgM/HIEOgOI0tXVkvSJROonx1XjJc39+gg1xk6r2Pv9r7dapQaluoH/nTu9T4W1ZxoD2Z6Ch3bleW8OXCTIJG9SWiP19VKvl7OZdLq47MDAMDICWbLJTGxsZP+aMFu7h70tOqvNkRQpFAVORg5pbwuOOccAFuuQyJoqgRYGG0ZEQEggGEnZJIQGECgH0Ug9nv+/bA7/E/r/2BHvgBoo5Hqom3djQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMFq3xdUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzArMDI6MDAr6n1pAAAAAElFTkSuQmCC</mdui:Logo>
+ <mdui:InformationURL xml:lang="fr">http://www.montpellier-bs.com/</mdui:InformationURL>
+ <mdui:Description xml:lang="en">Montpellier Business School - IDP - Production</mdui:Description>
+ <mdui:DisplayName xml:lang="fr">Montpellier Business School</mdui:DisplayName>
+ <mdui:Description xml:lang="fr">Montpellier Business School - IDP - Production</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>
+ MIIC4jCCAcqgAwIBAgIQQNXrmzhLN4VGlUXDYCRT3zANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MB4XDTE0MTAyODAwMDAwMFoXDTE2MTAyNzAwMDAwMFowLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyKs/uPhEf7zVizjfcr/ISGFe9+yUOqwpel38zgutvLHmFD39E2hpPdQhcXn4c4dt1fU5KvkbcDdVbP8+e4TvNpJMy/nEB2V92zCQ/hhBjilwhF1ETe1TMmVjALs0KFvbxW9ZN3EdUVvxFvz/gvG29nQhl4QWKj3x8opr89lmq14Z7T0mzOV8kub+cgsOU/1bsKqrIqN1fMKKFhjKaetctdjYTfGzVQ0AJAzzbtg0/Q1wdYNAnhSDafygEv6kNiquk0r0RyasUUevEXs2LY3vSgKsKseI8ZZlQEMtE9/k/iAG7JNcEbVg53YTurNTrPnXJOU88mf3TToX14HpYsS1ECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAfolx45w0i8CdAUjjeAaYdhG9+NDHxop0UvNOqlGqYJexqPLuvX8iyUaYxNGzZxFgGI3GpKfmQP2JQWQ1E5JtY/n8iNLOKRMwqkuxSCKJxZJq4Sl/m/Yv7TS1P5LNgAj8QLCypxsWrTAmq2HSpkeSk4JBtsYxX6uhbGM/K1sEktKybVTHu22/7TmRqWTmOUy9wQvMjJb2IXdMGLG3hVntN/WWcs5w8vbt1i8Kk6o19W2MjZ95JaECKjBDYRlhG1KmSBtrsKsCBQoBzwH/rXfksTO9JoUYLXiW0IppB7DhNH4PJ5hZI91R8rR0H3/bKkLSuDaKLWSqMhozdhXsIIKvJQ==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+ <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://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Montpellier Business School</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Montpellier Business School</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.montpellier-bs.com/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:EmailAddress>admin.infra.dsi@montpellier-bs.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..a1579bbe
--- /dev/null
+++ b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.abertay.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "Test Unidesk - Abertay" TOPdesk SP for University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:27:51Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID7TCCAtWgAwIBAgIJAPUeIQj7lZ7QMA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+ BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+ ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI0
+ WhcNMjYwMzMwMTIzNTI0WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+ ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+ BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0jHonD5R
+ ppuiFhtJsgXq/4z/rPdkJItKFdE9PlTjTHHBtpPolHTgVRRspCneX6CTdFVtGG8z
+ 25gdnmfs2ykUxyk1nzSzFJLV4tBKM1mOgYeZXYrcAXrppfkZARFybooj3zZn6XNi
+ 77vPuWiKWQBUAMAeTNxt1+CGWQXYA0c/quHwIyiWnAyzKM8FiN5JOQrJ4cFszE3U
+ uhGannOO0RDv5bI2YWxEAx7IYFSGVm68Kwl/C6lQ1fcUoTqsGS/3YQEQGDdCG9cU
+ 4yALCA5f7Mj/PmFtnK3e0Y6MCVnNtWH/7958eMAVv4RgrqmQuPRbiCox+HeaK1aK
+ iiWq9DuF3QS4BQIDAQABo4G7MIG4MB0GA1UdDgQWBBT7z4eRV9C/3pmldtooNQTp
+ yu2oVzCBiAYDVR0jBIGAMH6AFPvPh5FX0L/emaV22ig1BOnK7ahXoVukWTBXMSMw
+ IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+ dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkA9R4hCPuVntAw
+ DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVqr3p35sr70RxxlCdqKl
+ 1/qZJHd5G+I4TUJBXLZVXS9z8yXZoGQeHiRkrIm2++sVen2iBXG87CKfHvuFfqH2
+ DtxuSSxw0EOPAzY9uYBMkzbtuos4LxflATngm5B943+++DYQoLTbs98sWLhFjgOC
+ cNXXa//18LXVQ/Y21QuRQctu4UbdGrP5qWtKsjCmmv/XVH8/J52tf0xf/uygp0Ip
+ kPOD+P7yHonb3slyoqg2k45mvpCFVkKreWvd20Hi4kqPhEKFYs4X6QCsMRlH7KMN
+ 1mSmbpr5sfg/lzDP6EYvvDdUPL4Nu5rkd3wYN+3s82k8xYFDgG+fKO2x9EUwmtQ7
+ JA==
+ </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>
+ MIID7TCCAtWgAwIBAgIJAPUeIQj7lZ7QMA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+ BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+ ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI0
+ WhcNMjYwMzMwMTIzNTI0WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+ ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+ BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0jHonD5R
+ ppuiFhtJsgXq/4z/rPdkJItKFdE9PlTjTHHBtpPolHTgVRRspCneX6CTdFVtGG8z
+ 25gdnmfs2ykUxyk1nzSzFJLV4tBKM1mOgYeZXYrcAXrppfkZARFybooj3zZn6XNi
+ 77vPuWiKWQBUAMAeTNxt1+CGWQXYA0c/quHwIyiWnAyzKM8FiN5JOQrJ4cFszE3U
+ uhGannOO0RDv5bI2YWxEAx7IYFSGVm68Kwl/C6lQ1fcUoTqsGS/3YQEQGDdCG9cU
+ 4yALCA5f7Mj/PmFtnK3e0Y6MCVnNtWH/7958eMAVv4RgrqmQuPRbiCox+HeaK1aK
+ iiWq9DuF3QS4BQIDAQABo4G7MIG4MB0GA1UdDgQWBBT7z4eRV9C/3pmldtooNQTp
+ yu2oVzCBiAYDVR0jBIGAMH6AFPvPh5FX0L/emaV22ig1BOnK7ahXoVukWTBXMSMw
+ IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+ dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkA9R4hCPuVntAw
+ DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVqr3p35sr70RxxlCdqKl
+ 1/qZJHd5G+I4TUJBXLZVXS9z8yXZoGQeHiRkrIm2++sVen2iBXG87CKfHvuFfqH2
+ DtxuSSxw0EOPAzY9uYBMkzbtuos4LxflATngm5B943+++DYQoLTbs98sWLhFjgOC
+ cNXXa//18LXVQ/Y21QuRQctu4UbdGrP5qWtKsjCmmv/XVH8/J52tf0xf/uygp0Ip
+ kPOD+P7yHonb3slyoqg2k45mvpCFVkKreWvd20Hi4kqPhEKFYs4X6QCsMRlH7KMN
+ 1mSmbpr5sfg/lzDP6EYvvDdUPL4Nu5rkd3wYN+3s82k8xYFDgG+fKO2x9EUwmtQ7
+ JA==
+ </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://test.abertay.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Abertay</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..bbf0e4b3
--- /dev/null
+++ b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.abertay.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "Test Unidesk - Abertay" TOPdesk SP for University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:27:30Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID7TCCAtWgAwIBAgIJAKb90q3jCoX6MA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+ BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+ ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI2
+ WhcNMjYwMzMwMTIzNTI2WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+ ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+ BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx/g97614
+ +AFKYGTwsyWijqMFEU0kqLrP/UsTpCDeJh8quiaBTr38UrLBrovxlItPpkqbIaxP
+ lhTxwZHDg13MPqiRNdIKT9woaegI7fwjgKkd497b7nlqvYPkSaVqguz6f5SCBMUn
+ YKgyFmCpBq9NEO8vCPOM4rpcYRIkvUeR5MT3pTe3GJvbwiomIlkK/E+ad8h153UD
+ qnF+bmmtriP4s5mxDF/2uVP+Rvf43NU7XnNUyWXHusyAH9ENHp6j42kkqGN3uRdE
+ 6R0Sc0vVvlMT1OIfaJBDa1aoFo/oDyX0nh+346GoShCg01iygTz5C1GC8TPzK7Oo
+ FAS3BIQWTLWyqQIDAQABo4G7MIG4MB0GA1UdDgQWBBRXr6CxoOyUDhr0A2Zc91Ee
+ HLXkvjCBiAYDVR0jBIGAMH6AFFevoLGg7JQOGvQDZlz3UR4cteS+oVukWTBXMSMw
+ IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+ dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkApv3SreMKhfow
+ DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAlHFolMwX31uyP+qbQFoC
+ 55phkzHYo5JF6Zamk+v7sqi4mP9JkkbJGhKGz6rNxf2/COFgryc0V+iV0vfggrzO
+ rOqWOg/hXGVwqF2kLHs520Uk0ZH3U0K1+NvJZHsyqslkgjIQkpzLn7kfVGYp1i6I
+ w7Nr6ST2g6ilGlB2D8Jk4JCIxIwuU6cV5XV3Fy4OuWck0oPfOK3zDCCcxSW8wOmw
+ /rBBSrt3FfAHM+4WO/YZVIpnKMQikmHRc4wxW8obHYu+Ut4DXWoPoqNBumdBVv/g
+ sSw+9Fu2Zto/cMH17ZPL6F/LSnVBWRhfNuGP9+JhGbRqFUtn5AedGAdzwyc9ngfn
+ dQ==
+ </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>
+ MIID7TCCAtWgAwIBAgIJAKb90q3jCoX6MA0GCSqGSIb3DQEBCwUAMFcxIzAhBgNV
+ BAMTGnRlc3QuYWJlcnRheS51bmlkZXNrLmFjLnVrMSMwIQYDVQQKExp0ZXN0LmFi
+ ZXJ0YXkudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNTI2
+ WhcNMjYwMzMwMTIzNTI2WjBXMSMwIQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVz
+ ay5hYy51azEjMCEGA1UEChMadGVzdC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJ
+ BgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx/g97614
+ +AFKYGTwsyWijqMFEU0kqLrP/UsTpCDeJh8quiaBTr38UrLBrovxlItPpkqbIaxP
+ lhTxwZHDg13MPqiRNdIKT9woaegI7fwjgKkd497b7nlqvYPkSaVqguz6f5SCBMUn
+ YKgyFmCpBq9NEO8vCPOM4rpcYRIkvUeR5MT3pTe3GJvbwiomIlkK/E+ad8h153UD
+ qnF+bmmtriP4s5mxDF/2uVP+Rvf43NU7XnNUyWXHusyAH9ENHp6j42kkqGN3uRdE
+ 6R0Sc0vVvlMT1OIfaJBDa1aoFo/oDyX0nh+346GoShCg01iygTz5C1GC8TPzK7Oo
+ FAS3BIQWTLWyqQIDAQABo4G7MIG4MB0GA1UdDgQWBBRXr6CxoOyUDhr0A2Zc91Ee
+ HLXkvjCBiAYDVR0jBIGAMH6AFFevoLGg7JQOGvQDZlz3UR4cteS+oVukWTBXMSMw
+ IQYDVQQDExp0ZXN0LmFiZXJ0YXkudW5pZGVzay5hYy51azEjMCEGA1UEChMadGVz
+ dC5hYmVydGF5LnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLggkApv3SreMKhfow
+ DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAlHFolMwX31uyP+qbQFoC
+ 55phkzHYo5JF6Zamk+v7sqi4mP9JkkbJGhKGz6rNxf2/COFgryc0V+iV0vfggrzO
+ rOqWOg/hXGVwqF2kLHs520Uk0ZH3U0K1+NvJZHsyqslkgjIQkpzLn7kfVGYp1i6I
+ w7Nr6ST2g6ilGlB2D8Jk4JCIxIwuU6cV5XV3Fy4OuWck0oPfOK3zDCCcxSW8wOmw
+ /rBBSrt3FfAHM+4WO/YZVIpnKMQikmHRc4wxW8obHYu+Ut4DXWoPoqNBumdBVv/g
+ sSw+9Fu2Zto/cMH17ZPL6F/LSnVBWRhfNuGP9+JhGbRqFUtn5AedGAdzwyc9ngfn
+ dQ==
+ </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://test.abertay.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Abertay</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..3766d11d
--- /dev/null
+++ b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.napier.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "public" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T09:17:46Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJAKmmxe2VazNBMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+ aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNVoX
+ DTI2MDMyMzE0NDUyNVowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC155YdrjNo8XNz
+ HvpvZVos38MRNXfRErCpRzvJRUi8HGJqFWRTLOA1MMpxjL/P2Nw/n4W9PcN3OLW6
+ 5WOeXVtB+wI/V1ptG9T+7NSnfdg4a+zLnS612tx7zYs4ylup1m0px7RgADgmvnnp
+ SSD/LO9ZlVuV1llrYM1EMt0xJCXFnlYqaMgqTpJ9bQdRhn+UakEchNS31lYWvnGY
+ xj+uUYO0ukYhf1RJMJqCCXwpMaUBloimwkF/COs6InnrjMO7yQSLHSDw6C1+0jla
+ Q7tjYfGfgWfMzWIDvAZiWXOxq54NgHI4xBstLTM5ynaRa7glGZ46rXNmtadkpFUu
+ tEN9XFfJAgMBAAGjgbgwgbUwHQYDVR0OBBYEFIOsVsQYekIKAIZkcAQ1JgQd9GaJ
+ MIGFBgNVHSMEfjB8gBSDrFbEGHpCCgCGZHAENSYEHfRmiaFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCppsXtlWszQTAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCcOV5eUITv5zxMeUZYFRWh7Vb1eEOK
+ TMao1dR5BrrTzmzindDU8z1WYGeGhbz7IOt6qx4lx2bCu5/lcCqN6j2TJ/Zc60Q0
+ 0RPDa+ozlyu8EOwD6YuQhIoa813RUBPcV3ILyxsn8/H03HuSk+rDSziDrp0dL17q
+ qRAZ7DDiNXxVjsOOAKfwATlpBbK7WLP2VG0iMynU4W8YxDNyhQr1hD8aQug14bKI
+ FkzIoHsq1aZYLTSSbRmEm4SOd0nhG0N+DRElzuwzE4NJIYAH3wZEg8V6CvLPjLPm
+ yaZCgX4d+/NdqDiRw8ysu9XHE+tUXPC9XpWhRKbUV4qCmYsvtMzFYrrs
+ </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>
+ MIID5jCCAs6gAwIBAgIJAKmmxe2VazNBMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+ aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNVoX
+ DTI2MDMyMzE0NDUyNVowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC155YdrjNo8XNz
+ HvpvZVos38MRNXfRErCpRzvJRUi8HGJqFWRTLOA1MMpxjL/P2Nw/n4W9PcN3OLW6
+ 5WOeXVtB+wI/V1ptG9T+7NSnfdg4a+zLnS612tx7zYs4ylup1m0px7RgADgmvnnp
+ SSD/LO9ZlVuV1llrYM1EMt0xJCXFnlYqaMgqTpJ9bQdRhn+UakEchNS31lYWvnGY
+ xj+uUYO0ukYhf1RJMJqCCXwpMaUBloimwkF/COs6InnrjMO7yQSLHSDw6C1+0jla
+ Q7tjYfGfgWfMzWIDvAZiWXOxq54NgHI4xBstLTM5ynaRa7glGZ46rXNmtadkpFUu
+ tEN9XFfJAgMBAAGjgbgwgbUwHQYDVR0OBBYEFIOsVsQYekIKAIZkcAQ1JgQd9GaJ
+ MIGFBgNVHSMEfjB8gBSDrFbEGHpCCgCGZHAENSYEHfRmiaFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCppsXtlWszQTAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCcOV5eUITv5zxMeUZYFRWh7Vb1eEOK
+ TMao1dR5BrrTzmzindDU8z1WYGeGhbz7IOt6qx4lx2bCu5/lcCqN6j2TJ/Zc60Q0
+ 0RPDa+ozlyu8EOwD6YuQhIoa813RUBPcV3ILyxsn8/H03HuSk+rDSziDrp0dL17q
+ qRAZ7DDiNXxVjsOOAKfwATlpBbK7WLP2VG0iMynU4W8YxDNyhQr1hD8aQug14bKI
+ FkzIoHsq1aZYLTSSbRmEm4SOd0nhG0N+DRElzuwzE4NJIYAH3wZEg8V6CvLPjLPm
+ yaZCgX4d+/NdqDiRw8ysu9XHE+tUXPC9XpWhRKbUV4qCmYsvtMzFYrrs
+ </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://test.napier.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Napier</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..02304867
--- /dev/null
+++ b/swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.napier.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "secure" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T09:19:47Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJALDwEI9HqzwmMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+ aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNloX
+ DTI2MDMyMzE0NDUyNlowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9CZdoVgdpI5GH
+ tLbxPGK7YsiaciujrnLSwBIDoiBiC9Ktg0v4aqUmXUO3qUpXRiQZ27zkPLBqWN2t
+ nI91lBMKB8pcsHVTAE9CGyZqDxrcA8qjVtSVogAaN9OAhZ246Rf9vcD6bD23kZ8b
+ p5VU+DKO4c630i7WpjYlTjiT1lBjMPaK8eIJa/cHdOGyV0ZsIE9mkXjOGz77nzQQ
+ b/XgSQBURFscEszUMvsDR6aiJD8tGhC1B04bfnZBTGlfod5P7LHb66DOYGHbobxZ
+ 6ySBktMpBwAR5GjfxfZesKSfRYSJ7HH9AxeCfsMcl5IoxEHRm1rBRaZipGlrMjnE
+ a+fwHI/pAgMBAAGjgbgwgbUwHQYDVR0OBBYEFFRjbf5Cssg5VmJSaMbtUcecnSOo
+ MIGFBgNVHSMEfjB8gBRUY23+QrLIOVZiUmjG7VHHnJ0jqKFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCw8BCPR6s8JjAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBlYjCA1NO5uEvVIKnZ9Pp8fgtrlvCR
+ mWmTRJiB6UIwCxvulHPMSk3Yf8YInG0Uu85xImYF40pjI77t/Vxp0w9Dnr5AccO4
+ pOoB0aloZqW+iyNICvNhI4IEzoDbttPbRvb2HRcpahbySUQTrwVSni8cE9flBpBg
+ 7LI1pZcPt5mnO3/9Pkod2/wCUE27hPLJG8IvzAZ8mHsFYSPWijiKkvmM4BoEDRJk
+ 1YdtL5xTLOLE8C8NnNHOwyHC0S7NGnYiV+L6JPkP6DzZAILb3DYLEgXNGzjCnpNn
+ OEXG4w6V9oQj82r4pWPQ4RS99T86clSzjEPzlrUJO6cPMntuH3yuLHKA
+ </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>
+ MIID5jCCAs6gAwIBAgIJALDwEI9HqzwmMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QubmFwaWVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QubmFw
+ aWVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDMyNTE0NDUyNloX
+ DTI2MDMyMzE0NDUyNlowVTEiMCAGA1UEAxMZdGVzdC5uYXBpZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9CZdoVgdpI5GH
+ tLbxPGK7YsiaciujrnLSwBIDoiBiC9Ktg0v4aqUmXUO3qUpXRiQZ27zkPLBqWN2t
+ nI91lBMKB8pcsHVTAE9CGyZqDxrcA8qjVtSVogAaN9OAhZ246Rf9vcD6bD23kZ8b
+ p5VU+DKO4c630i7WpjYlTjiT1lBjMPaK8eIJa/cHdOGyV0ZsIE9mkXjOGz77nzQQ
+ b/XgSQBURFscEszUMvsDR6aiJD8tGhC1B04bfnZBTGlfod5P7LHb66DOYGHbobxZ
+ 6ySBktMpBwAR5GjfxfZesKSfRYSJ7HH9AxeCfsMcl5IoxEHRm1rBRaZipGlrMjnE
+ a+fwHI/pAgMBAAGjgbgwgbUwHQYDVR0OBBYEFFRjbf5Cssg5VmJSaMbtUcecnSOo
+ MIGFBgNVHSMEfjB8gBRUY23+QrLIOVZiUmjG7VHHnJ0jqKFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC5uYXBpZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC5uYXBp
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQCw8BCPR6s8JjAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBlYjCA1NO5uEvVIKnZ9Pp8fgtrlvCR
+ mWmTRJiB6UIwCxvulHPMSk3Yf8YInG0Uu85xImYF40pjI77t/Vxp0w9Dnr5AccO4
+ pOoB0aloZqW+iyNICvNhI4IEzoDbttPbRvb2HRcpahbySUQTrwVSni8cE9flBpBg
+ 7LI1pZcPt5mnO3/9Pkod2/wCUE27hPLJG8IvzAZ8mHsFYSPWijiKkvmM4BoEDRJk
+ 1YdtL5xTLOLE8C8NnNHOwyHC0S7NGnYiV+L6JPkP6DzZAILb3DYLEgXNGzjCnpNn
+ OEXG4w6V9oQj82r4pWPQ4RS99T86clSzjEPzlrUJO6cPMntuH3yuLHKA
+ </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://test.napier.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Napier</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml b/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml
deleted file mode 100644
index fcd30142..00000000
--- a/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.openathens.net/oala/metadata">
- <!--
- This is an OpenAthens LA Test IdP for Eduserv.
- -->
- <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="2012-02-21T14:53:36Z"/>
- </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">test.openathens.net</shibmd:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDQjCCAiqgAwIBAgIIZvpg5YE3/HUwDQYJKoZIhvcNAQEFBQAwODEQMA4GA1UE
- CgwHRWR1c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0
- MB4XDTEyMTAxNTE0NDkwNloXDTIyMTAxNTE0NDkwNlowODEQMA4GA1UECgwHRWR1
- c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjAN
- BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmxojj/t4L6T+Ckuu+G30Ces7IbT
- 5YnxmR9BePF3I3f5hEBMQp/ERea6AVZPlawdgilHV64giVRnE22zIQQtnjkJX84Z
- 7L9J4ODUbF+0YVwDzqgEdxjHfa96850YMf8MPoe4oJKJ7J4yCzfbwiVXGGWtqKQ4
- idh+lBQK8MGwB7yOy8QwlnxeEoSMkX01I6spOiv7r+KrACopZkYc6WGCAg30/hv8
- 7SPQcxPNAbQDZVjpF2tnHwsY5nz9fLtZCBEmsF0zlEZ+RuxnfOLzk0pXDEwhkA5k
- QPS6cYKH6IQeNZBX4bzUpxhrZ53Y4ZhDOgXiT7nSxsEOZlxv1Stu5c6FXQIDAQAB
- o1AwTjAdBgNVHQ4EFgQUhiBEqrb5Qs7q+Rit3aIR+NJuI0swHwYDVR0jBBgwFoAU
- hiBEqrb5Qs7q+Rit3aIR+NJuI0swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
- AAOCAQEAEWtFo02LGecwaaFhx5rLS8q5+Cn06DDYFDuW6L2xpMV2EUBbyFY9sq+/
- nssFZg1j9s4sm2NHNLkgns+bmAxhW1YSRKPy/D58dUBuGMKdftS1uVvMEeLh+y/5
- g8e23YE2Rfy6PdQ+YytUyG1VhhEo5hU6LZWqAUR0OdsGAs/qWXhth+dgLkpumSqy
- 4zWQHLrUlweaQx3pDw73Xc8PeCPtMU+AbXL2vvRXQSizD4NtZJ/g/hYemC3ZISM+
- Mjky/csk+C1ZALs8RSY2uzX8B3YfZSjDN1bUOd4O22o7EFyq7JNSP/xajHEBhCev
- HclfHywYgqaVXnbHLCBK3GbvPxnZxQ==
- </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>
- MIIDQjCCAiqgAwIBAgIIZvpg5YE3/HUwDQYJKoZIhvcNAQEFBQAwODEQMA4GA1UE
- CgwHRWR1c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0
- MB4XDTEyMTAxNTE0NDkwNloXDTIyMTAxNTE0NDkwNlowODEQMA4GA1UECgwHRWR1
- c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjAN
- BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmxojj/t4L6T+Ckuu+G30Ces7IbT
- 5YnxmR9BePF3I3f5hEBMQp/ERea6AVZPlawdgilHV64giVRnE22zIQQtnjkJX84Z
- 7L9J4ODUbF+0YVwDzqgEdxjHfa96850YMf8MPoe4oJKJ7J4yCzfbwiVXGGWtqKQ4
- idh+lBQK8MGwB7yOy8QwlnxeEoSMkX01I6spOiv7r+KrACopZkYc6WGCAg30/hv8
- 7SPQcxPNAbQDZVjpF2tnHwsY5nz9fLtZCBEmsF0zlEZ+RuxnfOLzk0pXDEwhkA5k
- QPS6cYKH6IQeNZBX4bzUpxhrZ53Y4ZhDOgXiT7nSxsEOZlxv1Stu5c6FXQIDAQAB
- o1AwTjAdBgNVHQ4EFgQUhiBEqrb5Qs7q+Rit3aIR+NJuI0swHwYDVR0jBBgwFoAU
- hiBEqrb5Qs7q+Rit3aIR+NJuI0swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
- AAOCAQEAEWtFo02LGecwaaFhx5rLS8q5+Cn06DDYFDuW6L2xpMV2EUBbyFY9sq+/
- nssFZg1j9s4sm2NHNLkgns+bmAxhW1YSRKPy/D58dUBuGMKdftS1uVvMEeLh+y/5
- g8e23YE2Rfy6PdQ+YytUyG1VhhEo5hU6LZWqAUR0OdsGAs/qWXhth+dgLkpumSqy
- 4zWQHLrUlweaQx3pDw73Xc8PeCPtMU+AbXL2vvRXQSizD4NtZJ/g/hYemC3ZISM+
- Mjky/csk+C1ZALs8RSY2uzX8B3YfZSjDN1bUOd4O22o7EFyq7JNSP/xajHEBhCev
- HclfHywYgqaVXnbHLCBK3GbvPxnZxQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://runtime.test.openathens.net/oala/sso"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://runtime.test.openathens.net/oala/sso"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Eduserv</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Eduserv</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Andy</GivenName>
- <SurName>Anderson</SurName>
- <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..8e4f718d
--- /dev/null
+++ b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.shu.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "public Sheffield Hallam" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:20:50Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID0zCCArugAwIBAgIJAIZxYEaEw5lGMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+ BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+ aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOFoXDTI2MDMz
+ MDEyMzYxOFowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+ A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+ CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJJlXnctUpVTPqInQC60gcrfsD4m5m
+ GTWAWSXlYhKDfq6F7JZe0Nrph06Mx/SYqzwmSJWr9LeyA7gZaR/5lGR9rxAUn26/
+ Zvz14VxsTQlP2YnEePcAwyi698wulMGELyPN4zgo+oEBBpuRDXGqYH7OjqCI+Ktc
+ GJ77yE6XM6TNTLMFFB93QdooI1QXcyOYjhYBq7PpRY4jkyozAW28GJMu6lBdpLua
+ FoGw2N/Qy3aUFQ6WxK2If4URZqjj+W56vZj9COsAGonUO9RxiEFIyp3e+qBW0ua8
+ xps4G4tvV8PT23SGu5caTsAMkx/xdByTso4F5IAO6YLA9SXCDHkfwiX1AgMBAAGj
+ gbEwga4wHQYDVR0OBBYEFDb5sE6vS/3tZXp/gPQKykHPSLV+MH8GA1UdIwR4MHaA
+ FDb5sE6vS/3tZXp/gPQKykHPSLV+oVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+ bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+ CQYDVQQGEwJVS4IJAIZxYEaEw5lGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+ BQADggEBAFBE8uejSEiTBVTy3ehydf78gUIz2mfDjtFFnoTK4Atok6I2ABqeXAlB
+ p2LQ1dwM6nS3Or8dctOtx8aRmcvf8DTXWCcC3dSSLeU8lzl/GnBeGMKEoYAKmWVz
+ p0O1/0XtuRc1m1j0OzCUnuDAI0Vn31fby2Q0oGYdwTGeCd+DjoEbCVLUPGGerb9T
+ seyS9bm/fmyGdlKw6Y44M7Cj9crf7faGZkDbdXxIf+mCyQBNBS0X90LMHFcR/gr/
+ V6IR7SHk+cpzw5ENh4+25GYzL0/qYDhp8YSYqU5ioWRqTLOZf11dLSWUQZUHmFE+
+ siyQlKd1yPLqIHp5HYHIQLLIZN+HLlM=
+ </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>
+ MIID0zCCArugAwIBAgIJAIZxYEaEw5lGMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+ BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+ aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOFoXDTI2MDMz
+ MDEyMzYxOFowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+ A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+ CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJJlXnctUpVTPqInQC60gcrfsD4m5m
+ GTWAWSXlYhKDfq6F7JZe0Nrph06Mx/SYqzwmSJWr9LeyA7gZaR/5lGR9rxAUn26/
+ Zvz14VxsTQlP2YnEePcAwyi698wulMGELyPN4zgo+oEBBpuRDXGqYH7OjqCI+Ktc
+ GJ77yE6XM6TNTLMFFB93QdooI1QXcyOYjhYBq7PpRY4jkyozAW28GJMu6lBdpLua
+ FoGw2N/Qy3aUFQ6WxK2If4URZqjj+W56vZj9COsAGonUO9RxiEFIyp3e+qBW0ua8
+ xps4G4tvV8PT23SGu5caTsAMkx/xdByTso4F5IAO6YLA9SXCDHkfwiX1AgMBAAGj
+ gbEwga4wHQYDVR0OBBYEFDb5sE6vS/3tZXp/gPQKykHPSLV+MH8GA1UdIwR4MHaA
+ FDb5sE6vS/3tZXp/gPQKykHPSLV+oVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+ bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+ CQYDVQQGEwJVS4IJAIZxYEaEw5lGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+ BQADggEBAFBE8uejSEiTBVTy3ehydf78gUIz2mfDjtFFnoTK4Atok6I2ABqeXAlB
+ p2LQ1dwM6nS3Or8dctOtx8aRmcvf8DTXWCcC3dSSLeU8lzl/GnBeGMKEoYAKmWVz
+ p0O1/0XtuRc1m1j0OzCUnuDAI0Vn31fby2Q0oGYdwTGeCd+DjoEbCVLUPGGerb9T
+ seyS9bm/fmyGdlKw6Y44M7Cj9crf7faGZkDbdXxIf+mCyQBNBS0X90LMHFcR/gr/
+ V6IR7SHk+cpzw5ENh4+25GYzL0/qYDhp8YSYqU5ioWRqTLOZf11dLSWUQZUHmFE+
+ siyQlKd1yPLqIHp5HYHIQLLIZN+HLlM=
+ </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://test.shu.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Sheffiield Hallam</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..e4039b6b
--- /dev/null
+++ b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.shu.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "secure Sheffield Hallam" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:24:34Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID0zCCArugAwIBAgIJALBHKHpsKjfyMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+ BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+ aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOVoXDTI2MDMz
+ MDEyMzYxOVowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+ A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+ CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6BE+AHvxhh5q88U3GlX556bzJjhZu
+ limEOPyhKIEuZMmygWR01GO/1zZGLSIdnF/7StnZyJwn4Z1CLzaCzHGTMq4lVoiI
+ JYsydP/J+E8yO5fpITM3/zq+3yApmcexJKGhJq6E/uvzKWo6DofPvHz6sgAFKIH7
+ XPk/KR2vUOb3Vu1CkhxsN1YGzGuN7+FAWnoxDtGSUvu/3j4YuWZ8t/+OblntSH4W
+ hVL+/UV9QKf9Kgqd/wIzehQuMqAQdtxGCkKQO2m1Bc5bH++jfvBL3rPY7QMNl2hE
+ WkxW6P2FYoDqaXYXj5trNPxf1Fi3gMFvr7Po+hzTLlNH+Tqf990US6kvAgMBAAGj
+ gbEwga4wHQYDVR0OBBYEFMc2jbMrxfUP/MwpLJn7GnBWwN5GMH8GA1UdIwR4MHaA
+ FMc2jbMrxfUP/MwpLJn7GnBWwN5GoVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+ bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+ CQYDVQQGEwJVS4IJALBHKHpsKjfyMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+ BQADggEBAGCe0HFNZpIWDAGeADGdJHOmp/Z8qaTVLxpBbo1a4R6PxZ94vAQ+h5/Q
+ IzbXfCxSlMhRJXgsD95039M4mSdQf3HoF9N+q7HAp/uR6H7uyMUwXANnoEdCpIqx
+ E8c64IxOPPL/1lCXjf45Dw9SheVAa88crlQPCgZLM8jdZEcuV1MSyTbwqy61LW2a
+ wjSfU2D+uDKdXg3SSbBd3ZXM4S1ca2FM59Jbn+WEvyZfdm8Mq7Sgo2BYPDAJN8u5
+ pGSWHqxUKYeFTFZfnKMVJt3nQWdYezNeBSSaBDVjE8MpOevfSTINlrNs63yVBTDe
+ TyVSTqgYbbTOk1MtZWZr4+LMXyo66QI=
+ </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>
+ MIID0zCCArugAwIBAgIJALBHKHpsKjfyMA0GCSqGSIb3DQEBCwUAME8xHzAdBgNV
+ BAMTFnRlc3Quc2h1LnVuaWRlc2suYWMudWsxHzAdBgNVBAoTFnRlc3Quc2h1LnVu
+ aWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzYxOVoXDTI2MDMz
+ MDEyMzYxOVowTzEfMB0GA1UEAxMWdGVzdC5zaHUudW5pZGVzay5hYy51azEfMB0G
+ A1UEChMWdGVzdC5zaHUudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswggEiMA0G
+ CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6BE+AHvxhh5q88U3GlX556bzJjhZu
+ limEOPyhKIEuZMmygWR01GO/1zZGLSIdnF/7StnZyJwn4Z1CLzaCzHGTMq4lVoiI
+ JYsydP/J+E8yO5fpITM3/zq+3yApmcexJKGhJq6E/uvzKWo6DofPvHz6sgAFKIH7
+ XPk/KR2vUOb3Vu1CkhxsN1YGzGuN7+FAWnoxDtGSUvu/3j4YuWZ8t/+OblntSH4W
+ hVL+/UV9QKf9Kgqd/wIzehQuMqAQdtxGCkKQO2m1Bc5bH++jfvBL3rPY7QMNl2hE
+ WkxW6P2FYoDqaXYXj5trNPxf1Fi3gMFvr7Po+hzTLlNH+Tqf990US6kvAgMBAAGj
+ gbEwga4wHQYDVR0OBBYEFMc2jbMrxfUP/MwpLJn7GnBWwN5GMH8GA1UdIwR4MHaA
+ FMc2jbMrxfUP/MwpLJn7GnBWwN5GoVOkUTBPMR8wHQYDVQQDExZ0ZXN0LnNodS51
+ bmlkZXNrLmFjLnVrMR8wHQYDVQQKExZ0ZXN0LnNodS51bmlkZXNrLmFjLnVrMQsw
+ CQYDVQQGEwJVS4IJALBHKHpsKjfyMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+ BQADggEBAGCe0HFNZpIWDAGeADGdJHOmp/Z8qaTVLxpBbo1a4R6PxZ94vAQ+h5/Q
+ IzbXfCxSlMhRJXgsD95039M4mSdQf3HoF9N+q7HAp/uR6H7uyMUwXANnoEdCpIqx
+ E8c64IxOPPL/1lCXjf45Dw9SheVAa88crlQPCgZLM8jdZEcuV1MSyTbwqy61LW2a
+ wjSfU2D+uDKdXg3SSbBd3ZXM4S1ca2FM59Jbn+WEvyZfdm8Mq7Sgo2BYPDAJN8u5
+ pGSWHqxUKYeFTFZfnKMVJt3nQWdYezNeBSSaBDVjE8MpOevfSTINlrNs63yVBTDe
+ TyVSTqgYbbTOk1MtZWZr4+LMXyo66QI=
+ </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://test.shu.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Sheffield Hallam</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..c2dd3a45
--- /dev/null
+++ b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.st-andrews.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "public St Andrews" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:31:26Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEADCCAuigAwIBAgIJAIhMwPcgL4J5MA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+ BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+ LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+ MTIzNjUwWhcNMjYwMzMwMTIzNjUwWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+ d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+ c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAvBcmVk31O/rqO8dyHPtQO+zFANQpbcQo+roH+vJ4QZ/f5JV/BSEzdRY8
+ mqaEV3YFg6a45kwYLum/hBBHsgCiu6qzByANuqjvqF2q+O4oJ2dIPlUW4g9BF/UY
+ otVDcMySPQ7siPagE1arNivCZ+aAwcmxHiuZsJOIzg+kHgYFPfGeD11VVTZyPED3
+ aU5y/lrmU5X5rnQWRNnBoXZX6WXmaNY9wMJbjSWzPlC47qlmXgdQC8cbtdVFuPkx
+ bC7lGLcwnQRrLDD3gRrX1RiQ88nL9HWQNdydjkMoFR7lwvhSUbdyeatMwbHZOcU5
+ VzIR/XIpaHYXuNMfJqHcFHBOR2jD3QIDAQABo4HCMIG/MB0GA1UdDgQWBBTLoPSB
+ 7fSfWEPknMfVn8Iy20sngDCBjwYDVR0jBIGHMIGEgBTLoPSB7fSfWEPknMfVn8Iy
+ 20sngKFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+ dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+ VQQGEwJVS4IJAIhMwPcgL4J5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ ggEBAB+o2KHNBwJgL1fP5DEBPTxO6s3t2NIf2YNNF400XOFCNXgtf2OxcT0YpiVc
+ kK+oVYXdGXUsLXYVALL4SdV3rzr4f0CFfJAhkys5W1aXWn/2TFfWNLyMwsupIqsJ
+ t89ibeUf4T/hQfWBIML05G9+IuN/nZNyoL8Gf+iyTOL89TeEPxRzzfKG8aNODiXk
+ pugdN/9rBMZjbrbeMbrA9XGbz7OBi8ugeSE9rH6XzhTQu6uiZP0zKyPta6XzO5H1
+ 0QyClOifYBk4hUb9/SykFPKtpM1VVDgQ9IMND6WaT1L/JjAumGcnnuRRySj+63/i
+ QaeR6JDD8INXBiQ9NMNkI33uQZY=
+ </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>
+ MIIEADCCAuigAwIBAgIJAIhMwPcgL4J5MA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+ BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+ LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+ MTIzNjUwWhcNMjYwMzMwMTIzNjUwWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+ d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+ c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAvBcmVk31O/rqO8dyHPtQO+zFANQpbcQo+roH+vJ4QZ/f5JV/BSEzdRY8
+ mqaEV3YFg6a45kwYLum/hBBHsgCiu6qzByANuqjvqF2q+O4oJ2dIPlUW4g9BF/UY
+ otVDcMySPQ7siPagE1arNivCZ+aAwcmxHiuZsJOIzg+kHgYFPfGeD11VVTZyPED3
+ aU5y/lrmU5X5rnQWRNnBoXZX6WXmaNY9wMJbjSWzPlC47qlmXgdQC8cbtdVFuPkx
+ bC7lGLcwnQRrLDD3gRrX1RiQ88nL9HWQNdydjkMoFR7lwvhSUbdyeatMwbHZOcU5
+ VzIR/XIpaHYXuNMfJqHcFHBOR2jD3QIDAQABo4HCMIG/MB0GA1UdDgQWBBTLoPSB
+ 7fSfWEPknMfVn8Iy20sngDCBjwYDVR0jBIGHMIGEgBTLoPSB7fSfWEPknMfVn8Iy
+ 20sngKFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+ dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+ VQQGEwJVS4IJAIhMwPcgL4J5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ ggEBAB+o2KHNBwJgL1fP5DEBPTxO6s3t2NIf2YNNF400XOFCNXgtf2OxcT0YpiVc
+ kK+oVYXdGXUsLXYVALL4SdV3rzr4f0CFfJAhkys5W1aXWn/2TFfWNLyMwsupIqsJ
+ t89ibeUf4T/hQfWBIML05G9+IuN/nZNyoL8Gf+iyTOL89TeEPxRzzfKG8aNODiXk
+ pugdN/9rBMZjbrbeMbrA9XGbz7OBi8ugeSE9rH6XzhTQu6uiZP0zKyPta6XzO5H1
+ 0QyClOifYBk4hUb9/SykFPKtpM1VVDgQ9IMND6WaT1L/JjAumGcnnuRRySj+63/i
+ QaeR6JDD8INXBiQ9NMNkI33uQZY=
+ </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://test.st-andrews.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - St Andrews</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..dc066cb5
--- /dev/null
+++ b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.st-andrews.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "secure St Andrews" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:34:13Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIEADCCAuigAwIBAgIJAL3Y8PpzyOKTMA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+ BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+ LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+ MTIzNjUxWhcNMjYwMzMwMTIzNjUxWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+ d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+ c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAzAL+qWB1ilhsj9Up9IOTrKbobvYAAuBvy5ea9KePlZNaxZ9D2/fye1WL
+ zAtzBVBUZxofWYbkmQ31Av0OT4QPXcR3Koqs6HkjBJatjRJ5jdlyG98j0EEEXfb/
+ sT5MQ/U4YauOf2H7c8M/JP8+PL97r/3eAaiMnya/CRZZDkqE2Ib1mQVvGX5Jl++G
+ tVumwW0v2GRLIFWgNByF62vNIPNDfM7+EPiZSE2vxIJ1uIB/Zbc4CTgU9Ah4W2cc
+ xAMeEm/7TL75HCs3ZfKXbjZSNB7QpdCgQCpREHjKPVg6xAazsbXXQ66byCt10fic
+ X9OeztcDJdj0tIgTl7tU9oZ8BGCbBwIDAQABo4HCMIG/MB0GA1UdDgQWBBQiT0Yu
+ SG+CekTXxr0u1lengc4v5TCBjwYDVR0jBIGHMIGEgBQiT0YuSG+CekTXxr0u1len
+ gc4v5aFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+ dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+ VQQGEwJVS4IJAL3Y8PpzyOKTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ ggEBAEWMQiWOK6hKtuggI21WHZ2WSXc+LqchHtjbqcipHhPsR7tH2kzIxaqawRRB
+ jaiZZ22nyDurQ4um2rVG25dxFFA1EM+OjuKKEiwDmWMNkypRa19O4vq3WhdF2CKq
+ DVC+wFRVRIvA+CFYnQt3v1Lj/ZFWmUgfH1DhBg9D2ff7hKsCO/6pvl1XLIkM+rvO
+ 6F4ojfCzs8ZE4ZEXe9Tvddmv0bsVdMk5Px81i8vPd+z4vgfHnnzYS4ZLrxifKAhW
+ WufvINMxu4brjSiVcSFmZqwo2rD/tzI7d7Ax+n/ziLxULAEBTg1AT2t3aAELPj/m
+ HoIyjVh4zNDQNVRgra00piqEoZU=
+ </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>
+ MIIEADCCAuigAwIBAgIJAL3Y8PpzyOKTMA0GCSqGSIb3DQEBCwUAMF0xJjAkBgNV
+ BAMTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMSYwJAYDVQQKEx10ZXN0
+ LnN0LWFuZHJld3MudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAx
+ MTIzNjUxWhcNMjYwMzMwMTIzNjUxWjBdMSYwJAYDVQQDEx10ZXN0LnN0LWFuZHJl
+ d3MudW5pZGVzay5hYy51azEmMCQGA1UEChMddGVzdC5zdC1hbmRyZXdzLnVuaWRl
+ c2suYWMudWsxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+ CgKCAQEAzAL+qWB1ilhsj9Up9IOTrKbobvYAAuBvy5ea9KePlZNaxZ9D2/fye1WL
+ zAtzBVBUZxofWYbkmQ31Av0OT4QPXcR3Koqs6HkjBJatjRJ5jdlyG98j0EEEXfb/
+ sT5MQ/U4YauOf2H7c8M/JP8+PL97r/3eAaiMnya/CRZZDkqE2Ib1mQVvGX5Jl++G
+ tVumwW0v2GRLIFWgNByF62vNIPNDfM7+EPiZSE2vxIJ1uIB/Zbc4CTgU9Ah4W2cc
+ xAMeEm/7TL75HCs3ZfKXbjZSNB7QpdCgQCpREHjKPVg6xAazsbXXQ66byCt10fic
+ X9OeztcDJdj0tIgTl7tU9oZ8BGCbBwIDAQABo4HCMIG/MB0GA1UdDgQWBBQiT0Yu
+ SG+CekTXxr0u1lengc4v5TCBjwYDVR0jBIGHMIGEgBQiT0YuSG+CekTXxr0u1len
+ gc4v5aFhpF8wXTEmMCQGA1UEAxMddGVzdC5zdC1hbmRyZXdzLnVuaWRlc2suYWMu
+ dWsxJjAkBgNVBAoTHXRlc3Quc3QtYW5kcmV3cy51bmlkZXNrLmFjLnVrMQswCQYD
+ VQQGEwJVS4IJAL3Y8PpzyOKTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ ggEBAEWMQiWOK6hKtuggI21WHZ2WSXc+LqchHtjbqcipHhPsR7tH2kzIxaqawRRB
+ jaiZZ22nyDurQ4um2rVG25dxFFA1EM+OjuKKEiwDmWMNkypRa19O4vq3WhdF2CKq
+ DVC+wFRVRIvA+CFYnQt3v1Lj/ZFWmUgfH1DhBg9D2ff7hKsCO/6pvl1XLIkM+rvO
+ 6F4ojfCzs8ZE4ZEXe9Tvddmv0bsVdMk5Px81i8vPd+z4vgfHnnzYS4ZLrxifKAhW
+ WufvINMxu4brjSiVcSFmZqwo2rD/tzI7d7Ax+n/ziLxULAEBTg1AT2t3aAELPj/m
+ HoIyjVh4zNDQNVRgra00piqEoZU=
+ </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://test.st-andrews.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - St Andrews</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..609183a7
--- /dev/null
+++ b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.stir.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "public Stirling" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:47:56Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID2jCCAsKgAwIBAgIJANyOrK6P4z4IMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+ BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+ dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE4WhcNMjYw
+ MzMwMTIzNzE4WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+ MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0/TrlARELCO2seaUN5x9qwXm
+ oMpDksEGPHgRa40wqvHnF/1ebwuJ/a0L2XW7OLt1Lg4J5N1B/VxJ76qt4c9rqY0k
+ fKAcbwLjUDXLG4R61/ixw1U5g8TkxGWs/b1QZzYN1mXGqYZXQEehau4jrsLlj5u+
+ 2llO5Io0AkRSOYjZCjd1lWaqj4nVYJD8EVIugxnzJZ6Er3sys+izkhwUXueJSieJ
+ TOPurN9fHt/qiwg8OY+v8rUfHM6c6tGQHrYEThad+fzhfS8mATMs0Ghw85vGYiqn
+ VBece+oe4iTxmZyFXr3Syd+Nwb8WBlH0DDrj9SVC2HLttXsHTRexKOAeXjTzNwID
+ AQABo4G0MIGxMB0GA1UdDgQWBBQ5yaFQUQPTK5YABLJFqvVyQyTx/DCBgQYDVR0j
+ BHoweIAUOcmhUFED0yuWAASyRar1ckMk8fyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+ c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUuCCQDcjqyuj+M+CDAMBgNVHRMEBTADAQH/MA0GCSqG
+ SIb3DQEBCwUAA4IBAQBGPthismR3ASkL4uXomIVPyWLvAEwfuOInJXcAWFTUzuXM
+ NsnEqPjIY+oq9sC9ALo0Ne7X0MhXaBie+P/+tZMRq6EoYT0moDMIsFC/MZaEiRUa
+ 6mhwksA4PVEwhYEqL2C0HtpkIB5eJ7cqnQCQIlsSxQYUVP/J01rW/WX5CDnaVG+l
+ sINoMQr42MaRYjduErB1j0WvpN+p+g98NS9vSPCcFTFTK28syLDlgDPwlPYTAfV7
+ /z1ISaVQYVdUyh+sUrWuY2lHH3u9OtoE7FZrA2YUkD+fV3MzlIrRX/Ku8/iq+bqe
+ lRHGvV+PFtz4Y8zu1o61fq5+Fm2S0oHYtgDRVudH
+ </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>
+ MIID2jCCAsKgAwIBAgIJANyOrK6P4z4IMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+ BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+ dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE4WhcNMjYw
+ MzMwMTIzNzE4WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+ MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0/TrlARELCO2seaUN5x9qwXm
+ oMpDksEGPHgRa40wqvHnF/1ebwuJ/a0L2XW7OLt1Lg4J5N1B/VxJ76qt4c9rqY0k
+ fKAcbwLjUDXLG4R61/ixw1U5g8TkxGWs/b1QZzYN1mXGqYZXQEehau4jrsLlj5u+
+ 2llO5Io0AkRSOYjZCjd1lWaqj4nVYJD8EVIugxnzJZ6Er3sys+izkhwUXueJSieJ
+ TOPurN9fHt/qiwg8OY+v8rUfHM6c6tGQHrYEThad+fzhfS8mATMs0Ghw85vGYiqn
+ VBece+oe4iTxmZyFXr3Syd+Nwb8WBlH0DDrj9SVC2HLttXsHTRexKOAeXjTzNwID
+ AQABo4G0MIGxMB0GA1UdDgQWBBQ5yaFQUQPTK5YABLJFqvVyQyTx/DCBgQYDVR0j
+ BHoweIAUOcmhUFED0yuWAASyRar1ckMk8fyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+ c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUuCCQDcjqyuj+M+CDAMBgNVHRMEBTADAQH/MA0GCSqG
+ SIb3DQEBCwUAA4IBAQBGPthismR3ASkL4uXomIVPyWLvAEwfuOInJXcAWFTUzuXM
+ NsnEqPjIY+oq9sC9ALo0Ne7X0MhXaBie+P/+tZMRq6EoYT0moDMIsFC/MZaEiRUa
+ 6mhwksA4PVEwhYEqL2C0HtpkIB5eJ7cqnQCQIlsSxQYUVP/J01rW/WX5CDnaVG+l
+ sINoMQr42MaRYjduErB1j0WvpN+p+g98NS9vSPCcFTFTK28syLDlgDPwlPYTAfV7
+ /z1ISaVQYVdUyh+sUrWuY2lHH3u9OtoE7FZrA2YUkD+fV3MzlIrRX/Ku8/iq+bqe
+ lRHGvV+PFtz4Y8zu1o61fq5+Fm2S0oHYtgDRVudH
+ </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://test.stir.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Stirling</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..a646ebb4
--- /dev/null
+++ b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.stir.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "secure Stirling" TOPDesk SP for the University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:49:49Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID2jCCAsKgAwIBAgIJALr8CP8PS5BEMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+ BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+ dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE5WhcNMjYw
+ MzMwMTIzNzE5WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+ MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApgFf2q8W/UjaWOZdNqr9EmOa
+ WG0l2hEosA+IAHcKkdBNdMhNGzED45WLadguUY1F+Irnft2DF/52/rukG/XuFkM1
+ SybLxZdme3ozG91w+TB86/BPTNOl16P2Q3QQ90FdkqZY/rWPMwIRVA5mjKuf6+1T
+ 5PL9/XpQC9JFwXmUXNsNsLJryDgm+13wugMPymrgWmFGZN2HYlSv5TF5mIxVQOYC
+ SjsGZhu88GmRjMxHN1T6OAn7a4HA7/wlEfnl8SQ5TIWPRjQukN9hg/CpYC2zI17G
+ /606x/P4lkJ37/NErZ/u4ueA4ymhyWSbLFX8MsFDymiTghJu/7N1Z9nY/ePklQID
+ AQABo4G0MIGxMB0GA1UdDgQWBBRa1jo5LhT5i8tbKUA76iynFS7CnDCBgQYDVR0j
+ BHoweIAUWtY6OS4U+YvLWylAO+ospxUuwpyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+ c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUuCCQC6/Aj/D0uQRDAMBgNVHRMEBTADAQH/MA0GCSqG
+ SIb3DQEBCwUAA4IBAQAx2Xfd1pfAlPepfSX4KUPbhJaq+Z2695FVOW+KqBC/L6db
+ jyUYQtoi1X9yge4FaVNt1GMMUv9XVcvH6O7UTLdXBiSXXW/BbhLzRgnf09Mtta0y
+ skCRNaStwWbIrDFRegIk0rFUya3n2oR5B5ZW0ah7C93sxYbVbSMZmVfUpf/oZY79
+ UZhImwhWAzMfvKgzPySFAXOmoShseo6hrOTyeWJgVxT4EKtifhyhdTZDkT8XykbX
+ CA34rv87jODyi+dYGhbegFiuJoDo/9/weL0BH5N48yW18sSjRkURF5VXGbPMUx96
+ 8Knhux1hK+cTlx1vIfHtJa81w/f3BtS7gweYmKp4
+ </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>
+ MIID2jCCAsKgAwIBAgIJALr8CP8PS5BEMA0GCSqGSIb3DQEBCwUAMFExIDAeBgNV
+ BAMTF3Rlc3Quc3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIu
+ dW5pZGVzay5hYy51azELMAkGA1UEBhMCVUswHhcNMTYwNDAxMTIzNzE5WhcNMjYw
+ MzMwMTIzNzE5WjBRMSAwHgYDVQQDExd0ZXN0LnN0aXIudW5pZGVzay5hYy51azEg
+ MB4GA1UEChMXdGVzdC5zdGlyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApgFf2q8W/UjaWOZdNqr9EmOa
+ WG0l2hEosA+IAHcKkdBNdMhNGzED45WLadguUY1F+Irnft2DF/52/rukG/XuFkM1
+ SybLxZdme3ozG91w+TB86/BPTNOl16P2Q3QQ90FdkqZY/rWPMwIRVA5mjKuf6+1T
+ 5PL9/XpQC9JFwXmUXNsNsLJryDgm+13wugMPymrgWmFGZN2HYlSv5TF5mIxVQOYC
+ SjsGZhu88GmRjMxHN1T6OAn7a4HA7/wlEfnl8SQ5TIWPRjQukN9hg/CpYC2zI17G
+ /606x/P4lkJ37/NErZ/u4ueA4ymhyWSbLFX8MsFDymiTghJu/7N1Z9nY/ePklQID
+ AQABo4G0MIGxMB0GA1UdDgQWBBRa1jo5LhT5i8tbKUA76iynFS7CnDCBgQYDVR0j
+ BHoweIAUWtY6OS4U+YvLWylAO+ospxUuwpyhVaRTMFExIDAeBgNVBAMTF3Rlc3Qu
+ c3Rpci51bmlkZXNrLmFjLnVrMSAwHgYDVQQKExd0ZXN0LnN0aXIudW5pZGVzay5h
+ Yy51azELMAkGA1UEBhMCVUuCCQC6/Aj/D0uQRDAMBgNVHRMEBTADAQH/MA0GCSqG
+ SIb3DQEBCwUAA4IBAQAx2Xfd1pfAlPepfSX4KUPbhJaq+Z2695FVOW+KqBC/L6db
+ jyUYQtoi1X9yge4FaVNt1GMMUv9XVcvH6O7UTLdXBiSXXW/BbhLzRgnf09Mtta0y
+ skCRNaStwWbIrDFRegIk0rFUya3n2oR5B5ZW0ah7C93sxYbVbSMZmVfUpf/oZY79
+ UZhImwhWAzMfvKgzPySFAXOmoShseo6hrOTyeWJgVxT4EKtifhyhdTZDkT8XykbX
+ CA34rv87jODyi+dYGhbegFiuJoDo/9/weL0BH5N48yW18sSjRkURF5VXGbPMUx96
+ 8Knhux1hK+cTlx1vIfHtJa81w/f3BtS7gweYmKp4
+ </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://test.stir.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Stirling</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml
new file mode 100644
index 00000000..2147a82b
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ulster.unidesk.ac.uk/tas/public/login/verify">
+ <!--
+ This is a "Test Unidesk - Ulster" TOPdesk SP for University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:26:12Z">
+ <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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJALiPkubf7TWHMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+ dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1M1oX
+ DTI2MDMzMDEyMzc1M1owVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCq3M/LdSd+6HtG
+ rsrULUV6WFiGMUdJqrto2MjG/MwjQGIDBr+5RLXKcD8CvgMbzTylSvuMZKwJLmUr
+ 7ycjkbj42BmzNneWv08cFc8OilqVfKv1V5DwKnnwLyc9xCEQiTxFIanaxSQQlSz3
+ +BBUQz8vFztolXTYh/mswJkwBAfUSuJi01YO5AgT1Nz1UxevVWj5e9v3zvgrdTg0
+ 9Jr+Dj1LvlHsplD8jRy9vjLKtpshATioNebMuhUbprWEC2PLy/+Bq9HJjZgulo3r
+ s9mX7BY/5FwFL1wD3zR/3XDZrqXl72KMa/9OvNIpucwWx7H8rvIs9UriR4T62t3x
+ NXDfMNszAgMBAAGjgbgwgbUwHQYDVR0OBBYEFBKtj0q4+ZplekDXtrmSsxPwKECF
+ MIGFBgNVHSMEfjB8gBQSrY9KuPmaZXpA17a5krMT8ChAhaFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQC4j5Lm3+01hzAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCGBbK+Ku25waBIn66a/9TYxow/v3sQ
+ DAtY3tqqZz1vlrf0ymHv8brMxZiaCwq3HNuQJEQpE/rgY9/w97pDVkoFq7TgSIRn
+ LmiHIztnW8RtnK80etS7tPJSV+Fes7sR/iIxXFtRY1iWXJ9CNFr6V5CUkudpvrIY
+ rYlU/r0ghRYAh6z9BeCiX1Ujx3vI3tOdG85LiaxDFBeUGq+EGZPFilMDdzCWVm92
+ y1GE4I0lT1fVZ0QQxNMz0ensIzIeh4JTgd6lbXm/l2G/NqaN3KXQ81jaahhC6omh
+ /8B1yAFVgKaK/PrHQuSpm4+zA+Qe3iFHtQ/TY3Nn2Sp3f8b/kzN4z6QI
+ </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>
+ MIID5jCCAs6gAwIBAgIJALiPkubf7TWHMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+ dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1M1oX
+ DTI2MDMzMDEyMzc1M1owVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCq3M/LdSd+6HtG
+ rsrULUV6WFiGMUdJqrto2MjG/MwjQGIDBr+5RLXKcD8CvgMbzTylSvuMZKwJLmUr
+ 7ycjkbj42BmzNneWv08cFc8OilqVfKv1V5DwKnnwLyc9xCEQiTxFIanaxSQQlSz3
+ +BBUQz8vFztolXTYh/mswJkwBAfUSuJi01YO5AgT1Nz1UxevVWj5e9v3zvgrdTg0
+ 9Jr+Dj1LvlHsplD8jRy9vjLKtpshATioNebMuhUbprWEC2PLy/+Bq9HJjZgulo3r
+ s9mX7BY/5FwFL1wD3zR/3XDZrqXl72KMa/9OvNIpucwWx7H8rvIs9UriR4T62t3x
+ NXDfMNszAgMBAAGjgbgwgbUwHQYDVR0OBBYEFBKtj0q4+ZplekDXtrmSsxPwKECF
+ MIGFBgNVHSMEfjB8gBQSrY9KuPmaZXpA17a5krMT8ChAhaFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQC4j5Lm3+01hzAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCGBbK+Ku25waBIn66a/9TYxow/v3sQ
+ DAtY3tqqZz1vlrf0ymHv8brMxZiaCwq3HNuQJEQpE/rgY9/w97pDVkoFq7TgSIRn
+ LmiHIztnW8RtnK80etS7tPJSV+Fes7sR/iIxXFtRY1iWXJ9CNFr6V5CUkudpvrIY
+ rYlU/r0ghRYAh6z9BeCiX1Ujx3vI3tOdG85LiaxDFBeUGq+EGZPFilMDdzCWVm92
+ y1GE4I0lT1fVZ0QQxNMz0ensIzIeh4JTgd6lbXm/l2G/NqaN3KXQ81jaahhC6omh
+ /8B1yAFVgKaK/PrHQuSpm4+zA+Qe3iFHtQ/TY3Nn2Sp3f8b/kzN4z6QI
+ </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://test.ulster.unidesk.ac.uk/tas/public/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Ulster</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml
new file mode 100644
index 00000000..b1151546
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ulster.unidesk.ac.uk/tas/secure/login/verify">
+ <!--
+ This is a "Test Unidesk - Ulster" TOPdesk SP for University of Edinburgh.
+ -->
+ <Extensions>
+ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-05T13:25: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">
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIID5jCCAs6gAwIBAgIJANq1yLjymVOIMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+ dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1NFoX
+ DTI2MDMzMDEyMzc1NFowVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJI/GFDxsFAW+6
+ Ou5nagpAq1Qk5Fin2rFY9BB7RS6KLhJoSgMX7ssGNXP8HYzcISCVPNXzqbfoKvcv
+ 7grqXAA4iuhDWgAvIgxehnByEuj1TsxPb33b1ajNYDolxjJEmU51klO7NnaPRwR6
+ JJvhvzd2FzDlF9JrycTM8XbPjsTfTPXwgKfUeuxdCqlpsOb8MFyM3izEzIZkx+6N
+ bpIE+KLQZgOSchYFSaHhLqu/9TBza/J95VShgaPwQTK/yOtwTO3gX8oyOCOHzypy
+ KK8FylnsXQCp4EO6pNuN4b4VSp6OsrKdGKRU9oUamnR7qPzj4v8M+B6XU4mzMR3e
+ Z+ZbXFxPAgMBAAGjgbgwgbUwHQYDVR0OBBYEFEe6QHlpPV401yTQq07DeOkTcAw2
+ MIGFBgNVHSMEfjB8gBRHukB5aT1eNNck0KtOw3jpE3AMNqFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQDatci48plTiDAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCG0pO2+nYPsZIECStWimLJK0InGvkE
+ 0AM+t6qX2+6A+eRyL6Uv6weUtM3XHXC/evNV7oy7/B8fBGHxBPpHohawBS+3EH9N
+ +TbyynfcetgpdVQJbfi5NEigG8kcakpjAKRykwjul1UdfRATEKxdwlvcrSTUZvt9
+ u21ITIDtIC6E/oRS+2PWP5XHwoebHcFvh1uAoWUscez4FFA2PK3rUpjDR7GhIQ80
+ +aFxEUr85lO9e25/1WlMNlQQCkzOHRSBKR2GXeqrfTUqeI3Ez5kumWYrmxiyXCDU
+ 76p9XQ/DN7/gOwewXYHVMmZTvRGfEeicsqCUwVFEV705uNkc9jvhifo3
+ </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>
+ MIID5jCCAs6gAwIBAgIJANq1yLjymVOIMA0GCSqGSIb3DQEBCwUAMFUxIjAgBgNV
+ BAMTGXRlc3QudWxzdGVyLnVuaWRlc2suYWMudWsxIjAgBgNVBAoTGXRlc3QudWxz
+ dGVyLnVuaWRlc2suYWMudWsxCzAJBgNVBAYTAlVLMB4XDTE2MDQwMTEyMzc1NFoX
+ DTI2MDMzMDEyMzc1NFowVTEiMCAGA1UEAxMZdGVzdC51bHN0ZXIudW5pZGVzay5h
+ Yy51azEiMCAGA1UEChMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azELMAkGA1UE
+ BhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJI/GFDxsFAW+6
+ Ou5nagpAq1Qk5Fin2rFY9BB7RS6KLhJoSgMX7ssGNXP8HYzcISCVPNXzqbfoKvcv
+ 7grqXAA4iuhDWgAvIgxehnByEuj1TsxPb33b1ajNYDolxjJEmU51klO7NnaPRwR6
+ JJvhvzd2FzDlF9JrycTM8XbPjsTfTPXwgKfUeuxdCqlpsOb8MFyM3izEzIZkx+6N
+ bpIE+KLQZgOSchYFSaHhLqu/9TBza/J95VShgaPwQTK/yOtwTO3gX8oyOCOHzypy
+ KK8FylnsXQCp4EO6pNuN4b4VSp6OsrKdGKRU9oUamnR7qPzj4v8M+B6XU4mzMR3e
+ Z+ZbXFxPAgMBAAGjgbgwgbUwHQYDVR0OBBYEFEe6QHlpPV401yTQq07DeOkTcAw2
+ MIGFBgNVHSMEfjB8gBRHukB5aT1eNNck0KtOw3jpE3AMNqFZpFcwVTEiMCAGA1UE
+ AxMZdGVzdC51bHN0ZXIudW5pZGVzay5hYy51azEiMCAGA1UEChMZdGVzdC51bHN0
+ ZXIudW5pZGVzay5hYy51azELMAkGA1UEBhMCVUuCCQDatci48plTiDAMBgNVHRME
+ BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCG0pO2+nYPsZIECStWimLJK0InGvkE
+ 0AM+t6qX2+6A+eRyL6Uv6weUtM3XHXC/evNV7oy7/B8fBGHxBPpHohawBS+3EH9N
+ +TbyynfcetgpdVQJbfi5NEigG8kcakpjAKRykwjul1UdfRATEKxdwlvcrSTUZvt9
+ u21ITIDtIC6E/oRS+2PWP5XHwoebHcFvh1uAoWUscez4FFA2PK3rUpjDR7GhIQ80
+ +aFxEUr85lO9e25/1WlMNlQQCkzOHRSBKR2GXeqrfTUqeI3Ez5kumWYrmxiyXCDU
+ 76p9XQ/DN7/gOwewXYHVMmZTvRGfEeicsqCUwVFEV705uNkc9jvhifo3
+ </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://test.ulster.unidesk.ac.uk/tas/secure/login/verify" index="0"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Test Unidesk - Ulster</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>IS Helpline</GivenName>
+ <EmailAddress>mailto:is.helpline@ed.ac.uk</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>IS Apps Technology Management</GivenName>
+ <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
index 2bac5ee5..d58e3e78 100644
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
+++ b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
@@ -11,7 +11,7 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="en">Statistical Accounts of Scotland</mdui:DisplayName>
<mdui:Description xml:lang="en">Essential sources of the study of Scottish life in the 18th and 19th centuries</mdui:Description>
- <mdui:Logo height="119" width="350">https://vsp2.edina.ac.uk/public/images/splogos/statacc.png</mdui:Logo>
+ <mdui:Logo height="119" width="350">https://auth.edina.ac.uk/public/images/splogos/statacc.png</mdui:Logo>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
index 9e334976..45ff75f2 100644
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
+++ b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
@@ -9,7 +9,7 @@
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:Logo height="65" width="150">https://vsp2.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
+ <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
<mdui:DisplayName xml:lang="en">EDINA services</mdui:DisplayName>
<mdui:Description xml:lang="en">EDINA services for research and education</mdui:Description>
</mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml
deleted file mode 100644
index 82d8fe9b..00000000
--- a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:eduserv.org.uk:athens:provider:tvu.ac.uk">
- <!--
- This is a Shibboleth IdP for The University of West London.
- -->
- <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">
- <Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tvu.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEeDCCA2CgAwIBAgIRAJsjppl09pdBOodDFDJIICEwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MTUwMDAwMDBaFw0xNjA0MTQyMzU5NTlaMEMxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
- aDIudHZ1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsrIB
- oRzm965a3jJw5ZtnlwkDPOsdRsqpINAO0wK1l7dgCNkCyXHE83GA71wqtKa3n3/5
- BVfPXd8uhWop/THWmUu/29VyMEJdo94ahl9KJ1IxkSFW/nDIsHTrQddZr/sjYNtw
- jOohG/iDZve6LLhrdPxuiCgOcVCq32kg01/erwvpFJBgu4hsdFL0jrhn0mHPqc9N
- RMXnRP7duAvWKPH6cTUKeCkCYhanYZemZoEhsFPUP+ahQOraZnSHVa0zeUjIUPBC
- VisVzGQjzG1nS5WRcIMaWhjsCeF/rVGhhbuV/rVIPbYfM7YlmJiIyL+zzzlQcORR
- ZgrGz3ijeyCQZsY92wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
- SWsrN1dH6pDjue0wHQYDVR0OBBYEFMZZ7NSWwqtYB0te0FBz956PHQYmMA4GA1Ud
- DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
- BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
- HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
- TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
- dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
- Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoMi50
- dnUuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYWCw70ie/vQUIFBceDxr6c5Pm9
- 5hTQStS6scyEX9j65f81CnzAzXhuwNqyYn8QbWMm4WV/j7RJhqE5sNNgEIoyAWWt
- LG+XOuDCTuHEcwMgsoMq6ESPDBkuVSxxrX4YeyI3ssGKAOkpMqhsxrfLDkIwE4/r
- VxxkimAI4E7GnN7RJDykAo4pczr1VqyMxVACEW561CFxcp2PNFs9m0fM16tkla4f
- fytNoHcf/mcJWXaAAOkoDmCob0F8bJauUx9Ul4Nhsp8SyXpMQoKlxuxInHNU3nkJ
- s4XBFY3CGcP1NizUMMo6uWkiqC68iprykMcar3qMC/h4aPCdWDmeS1BZPgo=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.tvu.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://shibboleth2.tvu.ac.uk/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.tvu.ac.uk/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.tvu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.tvu.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">tvu.ac.uk</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEeDCCA2CgAwIBAgIRAJsjppl09pdBOodDFDJIICEwDQYJKoZIhvcNAQEFBQAw
- NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
- IFNTTCBDQTAeFw0xMzA0MTUwMDAwMDBaFw0xNjA0MTQyMzU5NTlaMEMxITAfBgNV
- BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
- aDIudHZ1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsrIB
- oRzm965a3jJw5ZtnlwkDPOsdRsqpINAO0wK1l7dgCNkCyXHE83GA71wqtKa3n3/5
- BVfPXd8uhWop/THWmUu/29VyMEJdo94ahl9KJ1IxkSFW/nDIsHTrQddZr/sjYNtw
- jOohG/iDZve6LLhrdPxuiCgOcVCq32kg01/erwvpFJBgu4hsdFL0jrhn0mHPqc9N
- RMXnRP7duAvWKPH6cTUKeCkCYhanYZemZoEhsFPUP+ahQOraZnSHVa0zeUjIUPBC
- VisVzGQjzG1nS5WRcIMaWhjsCeF/rVGhhbuV/rVIPbYfM7YlmJiIyL+zzzlQcORR
- ZgrGz3ijeyCQZsY92wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
- SWsrN1dH6pDjue0wHQYDVR0OBBYEFMZZ7NSWwqtYB0te0FBz956PHQYmMA4GA1Ud
- DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
- BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
- HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
- TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
- dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
- Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoMi50
- dnUuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYWCw70ie/vQUIFBceDxr6c5Pm9
- 5hTQStS6scyEX9j65f81CnzAzXhuwNqyYn8QbWMm4WV/j7RJhqE5sNNgEIoyAWWt
- LG+XOuDCTuHEcwMgsoMq6ESPDBkuVSxxrX4YeyI3ssGKAOkpMqhsxrfLDkIwE4/r
- VxxkimAI4E7GnN7RJDykAo4pczr1VqyMxVACEW561CFxcp2PNFs9m0fM16tkla4f
- fytNoHcf/mcJWXaAAOkoDmCob0F8bJauUx9Ul4Nhsp8SyXpMQoKlxuxInHNU3nkJ
- s4XBFY3CGcP1NizUMMo6uWkiqC68iprykMcar3qMC/h4aPCdWDmeS1BZPgo=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.tvu.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">The University of West London</OrganizationName>
- <OrganizationDisplayName xml:lang="en">University of West London (Old)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.tvu.ac.uk/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>IT Service Helpdesk</GivenName>
- <EmailAddress>mailto:itservicedesk@uwl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Amanda</GivenName>
- <SurName>Burns</SurName>
- <EmailAddress>mailto:amanda.burns@uwl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Vani</GivenName>
- <SurName>Aul</SurName>
- <EmailAddress>mailto:Vani.Aul@uwl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>IT Network Services</GivenName>
- <EmailAddress>mailto:networkservices@uwl.ac.uk</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Richard</GivenName>
- <SurName>Rumun</SurName>
- <EmailAddress>mailto:richard.rumun@uwl.ac.uk</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml
deleted file mode 100644
index c30ae8cb..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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="urn:mace:incommon:musc.edu">
- <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://id.incommon.org/category/registered-by-incommon</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">musc.edu</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">Medical University of South Carolina</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>
-MIIDPjCCAiagAwIBAgIJAOhQxRwlMGgIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgubXVzYy5lZHUwHhcNMTMwMTA0MDE1MTAwWhcNMjMwMTAy
-MDE1MTAwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm11c2MuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoW2hT67QlW+YDCrhhjCyIrRpwksNqBvJ
-tKgwDrnQwOyMmThDoQBhcgJUTiavZ6ZP7cC0HAE9+8ComDaUVIewyYWKsgZTp79Q
-9BbEMW/op/kqYVzlHzoC8LfjfyPuttTChXeVvA8zx3eat4LJZEgX2m0D9Tfh0Rco
-VekYx+3hp+xs7DW/jAvHkCeamhR2jLEWGvtMte4cnJclq+yaejytFN6rvXiMI2QA
-sG2+/+I+hvCP22/SS1b30yhszOV8zU80gV8Cq/uSp57PWJVDQ4Rje2Vw99MWvSvA
-os4A+iwRFH9AIfEtCgGmgpMKc1J7KzM9lN9f0Qvql+RSqvrxD9/CXwIDAQABo38w
-fTAdBgNVHQ4EFgQUOyBE+oZl6so/wzN6C1RDnonqZm0wTgYDVR0jBEcwRYAUOyBE
-+oZl6so/wzN6C1RDnonqZm2hIqQgMB4xHDAaBgNVBAMTE3NoaWJib2xldGgubXVz
-Yy5lZHWCCQDoUMUcJTBoCDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBmpjbrRMp6XiFyr2+HnD20IKQ7u2A2C2eJAPdAcFZMKGPnEX88TTMxjAO+5+hS
-zLgCUsFvXOMKZF7ncadnocozN6+affODvWU0J1+aSw1xvyemH/QuGSpW77+gBOGl
-uHg/UNKWyAjCpgt2avXkBhjsGLiN8AWj7mGcw8HKHrK7+4BU8L9TWM9ddzfHySn/
-/PXn/XBpzUialyLgS28nAuDF+qgtEhzMaB5T3PkbAacEqzCelRyVocfqjuYinusk
-nlH50wO+ogWqYa7JYPF86r1Lz1FS/qCaWzDtQdf+ZYXvPrcIT5bcY9vQx8gkR1VG
-DxVIAjeM+koyHkSro/jWAJae
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
- <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/Shibboleth/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">musc.edu</shibmd:Scope>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDPjCCAiagAwIBAgIJAOhQxRwlMGgIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgubXVzYy5lZHUwHhcNMTMwMTA0MDE1MTAwWhcNMjMwMTAy
-MDE1MTAwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm11c2MuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoW2hT67QlW+YDCrhhjCyIrRpwksNqBvJ
-tKgwDrnQwOyMmThDoQBhcgJUTiavZ6ZP7cC0HAE9+8ComDaUVIewyYWKsgZTp79Q
-9BbEMW/op/kqYVzlHzoC8LfjfyPuttTChXeVvA8zx3eat4LJZEgX2m0D9Tfh0Rco
-VekYx+3hp+xs7DW/jAvHkCeamhR2jLEWGvtMte4cnJclq+yaejytFN6rvXiMI2QA
-sG2+/+I+hvCP22/SS1b30yhszOV8zU80gV8Cq/uSp57PWJVDQ4Rje2Vw99MWvSvA
-os4A+iwRFH9AIfEtCgGmgpMKc1J7KzM9lN9f0Qvql+RSqvrxD9/CXwIDAQABo38w
-fTAdBgNVHQ4EFgQUOyBE+oZl6so/wzN6C1RDnonqZm0wTgYDVR0jBEcwRYAUOyBE
-+oZl6so/wzN6C1RDnonqZm2hIqQgMB4xHDAaBgNVBAMTE3NoaWJib2xldGgubXVz
-Yy5lZHWCCQDoUMUcJTBoCDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBmpjbrRMp6XiFyr2+HnD20IKQ7u2A2C2eJAPdAcFZMKGPnEX88TTMxjAO+5+hS
-zLgCUsFvXOMKZF7ncadnocozN6+affODvWU0J1+aSw1xvyemH/QuGSpW77+gBOGl
-uHg/UNKWyAjCpgt2avXkBhjsGLiN8AWj7mGcw8HKHrK7+4BU8L9TWM9ddzfHySn/
-/PXn/XBpzUialyLgS28nAuDF+qgtEhzMaB5T3PkbAacEqzCelRyVocfqjuYinusk
-nlH50wO+ogWqYa7JYPF86r1Lz1FS/qCaWzDtQdf+ZYXvPrcIT5bcY9vQx8gkR1VG
-DxVIAjeM+koyHkSro/jWAJae
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
- </md:AttributeAuthorityDescriptor>
- <md:Organization>
- <md:OrganizationName xml:lang="en">Medical University of South Carolina</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Medical University of South Carolina</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.musc.edu/</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Richard Gadsden</md:GivenName>
- <md:EmailAddress>gadsden@musc.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Joshua Staples</md:GivenName>
- <md:EmailAddress>staplesj@musc.edu</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="administrative">
- <md:GivenName>Shibboleth IDP Group</md:GivenName>
- <md:EmailAddress>shibidp@musc.edu</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
index 2263d916..5b72139d 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
@@ -19,7 +19,7 @@
<mdui:Description xml:lang="en">The University of Maryland, College Park is a public research university, the flagship campus of the University System of Maryland, and the original 1862 land-grant institution in the State.</mdui:Description>
<mdui:InformationURL xml:lang="en">http://www.umd.edu</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="en">http://www.nethics.umd.edu/aup/</mdui:PrivacyStatementURL>
- <mdui:Logo height="61" width="61" xml:lang="en">https://www.urhome.umd.edu/trademarks/marks/gr/webglobesm.gif</mdui:Logo>
+ <mdui:Logo height="115" width="115" xml:lang="en">https://www.urhome.umd.edu/trademarks/marks/gr/webglobelg.gif</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml b/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
index a99465c7..48a5bdcd 100644
--- a/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
@@ -46,28 +46,28 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vho.aaf.edu.au/idp/profile/SAML2/Redirect/SSO"/>
<md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vho.aaf.edu.au/idp/profile/Shibboleth/SSO"/>
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au/idp/profile/SAML2/SOAP/ECP"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
- <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" FriendlyName="homeOrganizationType"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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" FriendlyName="eduPersonAssurance"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+ <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" FriendlyName="homeOrganizationType"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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="homeOrganization"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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" FriendlyName="eduPersonAssurance"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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="homeOrganization"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
</md:IDPSSODescriptor>
<md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
@@ -101,28 +101,28 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au: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>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
- <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" FriendlyName="homeOrganizationType"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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" FriendlyName="eduPersonAssurance"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+ <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" FriendlyName="homeOrganizationType"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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="homeOrganization"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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"/>
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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" FriendlyName="eduPersonAssurance"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
- <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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="homeOrganization"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
</md:AttributeAuthorityDescriptor>
<md:Organization>
<md:OrganizationName xml:lang="en">vho.aaf.edu.au</md:OrganizationName>
@@ -131,9 +131,9 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
</md:Organization>
<md:ContactPerson contactType="support">
<md:Company>Australian Access Federation</md:Company>
- <md:GivenName>Bradley</md:GivenName>
- <md:SurName>Beddoes</md:SurName>
- <md:EmailAddress>mailto:b.beddoes@aaf.edu.au</md:EmailAddress>
+ <md:GivenName>AAF</md:GivenName>
+ <md:SurName>Support</md:SurName>
+ <md:EmailAddress>mailto:support@aaf.edu.au</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Australian Access Federation</md:Company>
@@ -144,8 +144,8 @@ LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Australian Access Federation</md:Company>
- <md:GivenName>AAF</md:GivenName>
- <md:SurName>Support</md:SurName>
- <md:EmailAddress>mailto:support@aaf.edu.au</md:EmailAddress>
+ <md:GivenName>Bradley</md:GivenName>
+ <md:SurName>Beddoes</md:SurName>
+ <md:EmailAddress>mailto:b.beddoes@aaf.edu.au</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
index 04d49304..8d315ef1 100644
--- a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
@@ -34,8 +34,8 @@
</md:KeyDescriptor>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.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://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
<md:AttributeConsumingService index="1" isDefault="true">
<md:ServiceName xml:lang="hu">NIIF kollaborációs portál</md:ServiceName>
<md:ServiceName xml:lang="en">NIIF Voice Video Collaboration Service</md:ServiceName>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 3f50ab60..dbb325d6 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -122,6 +122,6 @@
<md:ContactPerson contactType="technical">
<md:GivenName>WAYF</md:GivenName>
<md:SurName>Operations</md:SurName>
- <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+ <md:EmailAddress>operations@wayf.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml b/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
index 706c8efc..c8fba982 100644
--- a/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
@@ -31,6 +31,32 @@
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>
+ MIIDSDCCAjCgAwIBAgIJAI9De290KMmjMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+ BAMTG3d3dy5hdWRpb25ldHdvcmsubmVuLmdvdi51azAeFw0xNjA0MDQxMjA0NDla
+ Fw0yNjA0MDIxMjA0NDlaMCYxJDAiBgNVBAMTG3d3dy5hdWRpb25ldHdvcmsubmVu
+ Lmdvdi51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALs1Xvl+YUxg
+ 6qrTPBEvjP6U+Xj56/NxYlBQ0MzjGNDYKOb5wybkgaZF/pcQxLlEzYGvJnYVCazq
+ puniTJlyRAvDHjWzvXb5sdahZCCvfp9Y+xHYa8UuqLxP/oWod7L2ChpL+y0vzLkn
+ yYi20IIPOQQRAr2Dq7lXG0ChHjEwNWWJl35iLVvGSLIKrkEOwHNYBstONR7t+SqW
+ YD0F5la2s7Or1F0UpQSUSXy79FzhJwkyS163ZDZoa/tvBGPrNXjMFROuGJN9lS3L
+ d95KKUP8LHSQK5oZMZw935F3ix2ngI7W/GAlt6Ti3cKDMON03cdnqDc8iyIj4Ik+
+ 1BiA6QdXoXECAwEAAaN5MHcwVgYDVR0RBE8wTYIbd3d3LmF1ZGlvbmV0d29yay5u
+ ZW4uZ292LnVrhi5odHRwczovL3d3dy5hdWRpb25ldHdvcmsubmVuLmdvdi51ay9z
+ aGliYm9sZXRoMB0GA1UdDgQWBBTDPBGJEh/Z6ywq5BZ8z7RJmk1oozANBgkqhkiG
+ 9w0BAQUFAAOCAQEAeVpk8i9TSBMdQAK6VkXePV/FP3oZYisazSdX0UmizwLsCOyO
+ HXJeSjSwyZ1jnQmyF2L7uf72oBNx6FaqjoekRPFxIBnvs0wKJuLHwIH2NbgMiq+V
+ 9rLOfGYZfdn+tJAYtJGuj7LkN14u+/JlP6ym2yZOvY+N6bVg2RFFgeD71p3xTUDv
+ fGsyAXTqQEYU2CngSFCw9d6pq1BN6YwWvDE0QpX3Ls7h6kThEHtFfkDwbWyGEU4/
+ qJWu76dirfXs/94KyGifoqEnn/x6anu70lEhOelauKILot8oovzk9NgQW3r4T9rL
+ ucr/IH/AZ5ql3zVht/DYm/eSHqFItcWR9pgj3w==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
MIIEfjCCA2agAwIBAgIRAPknBmCnCjGeotNVf6CLdX8wDQYJKoZIhvcNAQEFBQAw
NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
IFNTTCBDQTAeFw0xMzA0MTkwMDAwMDBaFw0xNjA0MTgyMzU5NTlaMEYxITAfBgNV
diff --git a/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml b/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
deleted file mode 100644
index 738d5f47..00000000
--- a/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.chinaclubhq.com/entity">
- <!--
- This is a Joomla idemauth 1.5.4 (based on SimpleSAMLPHP) SP for World Club HQ Ltd.
- -->
- <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">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDSDCCAjACCQDTBID4Eqw+IzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
- QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxFDASBgNVBAoT
- C0NoaW5hQ2x1YkhRMRwwGgYDVQQDExN3d3cuY2hpbmFjbHViaHEuY29tMB4XDTEw
- MDQyMjE5MTUzNloXDTIwMDQxOTE5MTUzNlowZjELMAkGA1UEBhMCR0IxETAPBgNV
- BAgTCFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MRQwEgYDVQQKEwtDaGluYUNs
- dWJIUTEcMBoGA1UEAxMTd3d3LmNoaW5hY2x1YmhxLmNvbTCCASIwDQYJKoZIhvcN
- AQEBBQADggEPADCCAQoCggEBANdpg+XIGnOtjrFhtXN/rird61Wa27r+U248wWyU
- Ug/2Ky8Lr72eC0L20ORbwcsRVsXRaac1cQCV+lr8o8PM8sHhMv9Q7KCbn2HsHMwd
- gdk+BjmH5ZyYEAZxgjEgqfpMpVdEVzlxzntwlLjyqziXFhFXxBirtFHgsi6Kto3c
- /SwS56jT3Yt01kqwiLi+jaXlAJ+2zHsWc/HG0jWR8eRXcGvGtvPpNCHHA5Yv93wH
- OyIG6vd9uJaL1dk6cWzWQrV4JhB6qorWzY01NboRaafTQFnh1LbWkoJN9zQWQJA+
- 0H4iOs/lwEaktc1x9VGlEgV94gZ0cty0OGUB1CjXEO8FWYECAwEAATANBgkqhkiG
- 9w0BAQUFAAOCAQEAiKNnZFMygZp36olHU6mebTi2CTFXSNR2RsnvLYjwM0JxxS7o
- z2/fAq19V7BNrDHuJ26neeJ7Js8Pjl7dDPqBPaTlW1lph/QlLk7jbnmt+cPXHTk5
- 0Mh9F2YvufWb3DQs4ZvWOPWzW2kZ5AOYLxD37gwlnFjpyRLBMPqVxoDlXJ0GWuPI
- O2bM3y5fBwbYlK6St9lwVBhTIzbfnnXitpg9Qmimlmj+jTsjqbzBk9n15zteIxz7
- pg8iwBXfG3LGb7WrogiKUlwhhLC3VxvgJoot65ZmSL7xmxPC+Av9zCA5NxmiYvaW
- Bwu7XKdd6JJuG9RviWxFRAH/3lllp8XqjrcTqg==
- </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>
- MIIDSDCCAjACCQDTBID4Eqw+IzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
- QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxFDASBgNVBAoT
- C0NoaW5hQ2x1YkhRMRwwGgYDVQQDExN3d3cuY2hpbmFjbHViaHEuY29tMB4XDTEw
- MDQyMjE5MTUzNloXDTIwMDQxOTE5MTUzNlowZjELMAkGA1UEBhMCR0IxETAPBgNV
- BAgTCFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MRQwEgYDVQQKEwtDaGluYUNs
- dWJIUTEcMBoGA1UEAxMTd3d3LmNoaW5hY2x1YmhxLmNvbTCCASIwDQYJKoZIhvcN
- AQEBBQADggEPADCCAQoCggEBANdpg+XIGnOtjrFhtXN/rird61Wa27r+U248wWyU
- Ug/2Ky8Lr72eC0L20ORbwcsRVsXRaac1cQCV+lr8o8PM8sHhMv9Q7KCbn2HsHMwd
- gdk+BjmH5ZyYEAZxgjEgqfpMpVdEVzlxzntwlLjyqziXFhFXxBirtFHgsi6Kto3c
- /SwS56jT3Yt01kqwiLi+jaXlAJ+2zHsWc/HG0jWR8eRXcGvGtvPpNCHHA5Yv93wH
- OyIG6vd9uJaL1dk6cWzWQrV4JhB6qorWzY01NboRaafTQFnh1LbWkoJN9zQWQJA+
- 0H4iOs/lwEaktc1x9VGlEgV94gZ0cty0OGUB1CjXEO8FWYECAwEAATANBgkqhkiG
- 9w0BAQUFAAOCAQEAiKNnZFMygZp36olHU6mebTi2CTFXSNR2RsnvLYjwM0JxxS7o
- z2/fAq19V7BNrDHuJ26neeJ7Js8Pjl7dDPqBPaTlW1lph/QlLk7jbnmt+cPXHTk5
- 0Mh9F2YvufWb3DQs4ZvWOPWzW2kZ5AOYLxD37gwlnFjpyRLBMPqVxoDlXJ0GWuPI
- O2bM3y5fBwbYlK6St9lwVBhTIzbfnnXitpg9Qmimlmj+jTsjqbzBk9n15zteIxz7
- pg8iwBXfG3LGb7WrogiKUlwhhLC3VxvgJoot65ZmSL7xmxPC+Av9zCA5NxmiYvaW
- Bwu7XKdd6JJuG9RviWxFRAH/3lllp8XqjrcTqg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/SingleLogoutService.php"/>
- <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://www.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/AssertionConsumerService.php" index="0"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">World Club HQ Ltd</OrganizationName>
- <OrganizationDisplayName xml:lang="en">World Club HQ</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.ukclubhq.com/</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>Colin</GivenName>
- <SurName>Maclean</SurName>
- <EmailAddress>mailto:colin@chinaclubhq.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>Colin</GivenName>
- <SurName>Maclean</SurName>
- <EmailAddress>mailto:colin@chinaclubhq.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml b/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
index 186501f6..785a6948 100644
--- a/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
@@ -22,7 +22,9 @@
<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.dawsonera.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://dawsonera.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.dawsonera.com/Shibboleth.sso/Login" index="1"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dawsonera.com/Shibboleth.sso/Login" index="2"/>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -73,6 +75,12 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dawsonera.com/Shibboleth.sso/SAML2/POST" index="7"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dawsonera.com/Shibboleth.sso/SAML2/ECP" index="10"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dawsonera.com/Shibboleth.sso/SAML/POST" index="11"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dawsonera.com/Shibboleth.sso/SAML/Artifact" index="12"/>
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">Dawson Books Limited</OrganizationName>
diff --git a/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml b/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml
index 47ec5750..1752cdae 100644
--- a/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml
+++ b/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeus.grnet.gr/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>
+ </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>